WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

拆分条款-导入弹框提示修改

Browse Source
This commit is contained in:
liyawei
2022-04-08 18:39:14 +08:00
parent 23815e837a
commit dc53036167
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+15 -9
View File
@@ -1328,7 +1328,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
return Result.OK( msg, null);
} catch (Exception e) {
log.error(e.getMessage(),e);
return Result.error("导入失败");
return Result.error(1,"导入失败");
}
}
@@ -1426,23 +1426,23 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
}else{
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
return Result.error("没有可导入的数据,请检查!");
return Result.error(1, "没有可导入的数据,请检查!");
}
} catch (NoSuchElementException e){
FileUnZip.deleteDir(saveDirectory);
return Result.error("没有可导入的数据,请检查!");
return Result.error(1, "没有可导入的数据,请检查!");
} catch (JeroBootException e){
FileUnZip.deleteDir(saveDirectory);
return Result.error(e.getMessage());
return Result.error(1, e.getMessage());
} catch (Exception e) {
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
return Result.error( "读取失败，请严格按照模板文件导入数据");
return Result.error( 1, "读取失败，请严格按照模板文件导入数据");
}
} catch (Exception e) {
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
return Result.error("读取失败，请严格按照模板文件导入数据");
return Result.error(1, "读取失败，请严格按照模板文件导入数据");
}
}
@@ -1451,6 +1451,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
OSSFile ossFile = ossFileService.getById(splitFileId);
String url = ossFile.getUrl();
MultipartFile mFile = createMfileByPath(url);
// 新增拆分记录
Date now = new Date();
String infoId = UUID.randomUUID().toString().replace("-", "");
@@ -1458,7 +1459,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
sarFileSplitInfoEO.setSplitResult("成功");
sarFileSplitInfoEO.setCreateTime(now);
sarFileSplitInfoEO.setUpdateTime(now);
sarFileSplitInfoService.save(sarFileSplitInfoEO);
// 添加条款总目录
SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO();
String menuId = UUID.randomUUID().toString().replace("-", "");
@@ -1469,9 +1470,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
sarFileSplitMenuEO.setValidFlag(0);
sarFileSplitMenuEO.setCreationTime(new Date());
sarFileSplitMenuEO.setModifyTime(new Date());
sarFileSplitMenuEOMapper.insertSelective(sarFileSplitMenuEO);
// 导入文件
return importSplitItems(mFile, cut, menuId, infoId);
Result<?> result = importSplitItems(mFile, cut, menuId, infoId);
if(result.isSuccess()){
sarFileSplitInfoService.save(sarFileSplitInfoEO);
sarFileSplitMenuEOMapper.insertSelective(sarFileSplitMenuEO);
}
return result;
}
private MultipartFile createMfileByPath(String path) {