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

虚拟清单log+发布信息内容修改

Browse Source
This commit is contained in:
xiejunyu
2022-06-14 18:03:16 +08:00
parent ea70909c18
commit a74f3493d6
1 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+49 -49
View File
@@ -100,7 +100,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
Page<DummyInventoryInfoEO> page = new Page<DummyInventoryInfoEO>(dummyInventoryInfoEO.getPageNo(), dummyInventoryInfoEO.getPageSize()); Page<DummyInventoryInfoEO> page = new Page<DummyInventoryInfoEO>(dummyInventoryInfoEO.getPageNo(), dummyInventoryInfoEO.getPageSize());
IPage<DummyInventoryInfoEO> pageInfo = this.page(page, queryWrapper); IPage<DummyInventoryInfoEO> pageInfo = this.page(page, queryWrapper);
//技术领域处理 //技术领域处理
// treeDict(dummyInventoryInfoEO, pageInfo); // treeDict(dummyInventoryInfoEO, pageInfo);
return pageInfo; return pageInfo;
} }
@@ -210,7 +210,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
List<DummyInventoryInfoEO> dataList = list(queryWrapper.eq("id", dummyInventoryInfoEO.getId())); List<DummyInventoryInfoEO> dataList = list(queryWrapper.eq("id", dummyInventoryInfoEO.getId()));
List<DummyInventoryInfoEO> dataListCopy = DeepCopyListUtil.depCopy(dataList); List<DummyInventoryInfoEO> dataListCopy = DeepCopyListUtil.depCopy(dataList);
// saveOrUpdate(dummyInventoryInfoEO); // saveOrUpdate(dummyInventoryInfoEO);
LambdaUpdateWrapper<DummyInventoryInfoEO> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<DummyInventoryInfoEO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(DummyInventoryInfoEO::getId,dummyInventoryInfoEO.getId()); updateWrapper.in(DummyInventoryInfoEO::getId,dummyInventoryInfoEO.getId());
@@ -329,7 +329,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
@Override @Override
public List<DummyInventoryInfoEO> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) { public List<DummyInventoryInfoEO> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap()); QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap());
// queryWrapper.in("dummy_inventory_base_id",dummyInventoryInfoEO.getDummyInventoryBaseId()); // queryWrapper.in("dummy_inventory_base_id",dummyInventoryInfoEO.getDummyInventoryBaseId());
queryWrapper.orderByDesc("create_time","serial_number"); queryWrapper.orderByDesc("create_time","serial_number");
List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(queryWrapper); List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(queryWrapper);
@@ -461,7 +461,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
dummyInventoryInfoEOList.add(dummyInventoryInfoEOTemp); dummyInventoryInfoEOList.add(dummyInventoryInfoEOTemp);
} }
// this.updateBatchById(dummyInventoryInfoEOList); // this.updateBatchById(dummyInventoryInfoEOList);
for (DummyInventoryInfoEO inventoryInfoEO : dummyInventoryInfoEOList) { for (DummyInventoryInfoEO inventoryInfoEO : dummyInventoryInfoEOList) {
LambdaUpdateWrapper<DummyInventoryInfoEO> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<DummyInventoryInfoEO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(DummyInventoryInfoEO::getId,inventoryInfoEO.getId()); updateWrapper.in(DummyInventoryInfoEO::getId,inventoryInfoEO.getId());
@@ -1116,28 +1116,28 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
} }
} }
// 校验头部是否符合模板 // 校验头部是否符合模板
// String substring = headerSb.toString(); // String substring = headerSb.toString();
// if (substring.endsWith(",") || substring.endsWith("，")){ // if (substring.endsWith(",") || substring.endsWith("，")){
// substring = headerSb.substring(0, headerSb.length() - 1); // substring = headerSb.substring(0, headerSb.length() - 1);
// } // }
// String excelHeader = substring.toString(); // String excelHeader = substring.toString();
// if (!title.equals(excelHeader)) { // if (!title.equals(excelHeader)) {
// workbook.close(); // workbook.close();
// //删除原上传文件 // //删除原上传文件
// FileUnZip.deleteDir(saveDirectory); // FileUnZip.deleteDir(saveDirectory);
// if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ // if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
// throw new JeroBootException("读取失败，请严格按照模板文件导入数据"); // throw new JeroBootException("读取失败，请严格按照模板文件导入数据");
// }else{ // }else{
// throw new JeroBootException("The data fails to be read. Import data strictly according to the template file"); // throw new JeroBootException("The data fails to be read. Import data strictly according to the template file");
// } // }
// //
// } // }
} }
} }
workbook.close(); workbook.close();
// //树形数据字典 // //树形数据字典
List<SysCategory> categoryList = sysCategoryService.list(); List<SysCategory> categoryList = sysCategoryService.list();
//普通数据字典 //普通数据字典
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll(); List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
@@ -1488,12 +1488,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
for (String fileName : designDeliverableTemplate.split(",")) { for (String fileName : designDeliverableTemplate.split(",")) {
List<File> nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,dummyInventoryInfoEO.getCut(),errorMsg,msgList,nameCn,nameEn); List<File> nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,dummyInventoryInfoEO.getCut(),errorMsg,msgList,nameCn,nameEn);
if (nowFileList.size() == 0) { if (nowFileList.size() == 0) {
// if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ // if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
// errorMsg += "压缩包中没有" + fileName + "文件; "; // errorMsg += "压缩包中没有" + fileName + "文件; ";
// }else{ // }else{
// errorMsg += " Not in the zip package" + fileName + "file; "; // errorMsg += " Not in the zip package" + fileName + "file; ";
// } // }
// msgList.add(errorMsg); // msgList.add(errorMsg);
} else { } else {
try { try {
FileInputStream input = new FileInputStream(nowFileList.get(0)); FileInputStream input = new FileInputStream(nowFileList.get(0));
@@ -1712,19 +1712,19 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
case "*Number": return "serialNumber"; case "*Number": return "serialNumber";
case "title": return "title"; case "title": return "title";
case "Sub-Title": return "subtitle"; case "Sub-Title": return "subtitle";
// case "适用范围": return "shi4Yong4Fan4Wei2"; // case "适用范围": return "shi4Yong4Fan4Wei2";
// case "状态": return "state"; // case "状态": return "state";
// case "对应标准": return "correspondingStandard"; // case "对应标准": return "correspondingStandard";
case "Usage": return "implementType"; case "Usage": return "implementType";
// case "新车实施日期": return "xin1Che1Xing2Shi2Shi1Ri4Qi1"; // case "新车实施日期": return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
// case "在产车实施日期": return "implementTime"; // case "在产车实施日期": return "implementTime";
// case "WVTA ID": return "wvtaId"; // case "WVTA ID": return "wvtaId";
case "Certification Type": return "attestationType"; case "Certification Type": return "attestationType";
case "*Certification Level": return "attestationRank"; case "*Certification Level": return "attestationRank";
case "Applicable Supplement": return "applicableSupplement"; case "Applicable Supplement": return "applicableSupplement";
// case "技术领域": return "technologyTerritory"; // case "技术领域": return "technologyTerritory";
case "*Responsible Field": return "dutyTerritory"; case "*Responsible Field": return "dutyTerritory";
// case "适用地区": return "region"; // case "适用地区": return "region";
case "Comments": return "remark"; case "Comments": return "remark";
case "design type of deliverables": return "designDeliverableType"; case "design type of deliverables": return "designDeliverableType";
case "design deliverable template": return "designDeliverableTemplate"; case "design deliverable template": return "designDeliverableTemplate";
@@ -1944,21 +1944,21 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
//技术领域 //技术领域
// String technologyTerritory = dummyInventoryInfoEOEn.getTechnologyTerritory(); // String technologyTerritory = dummyInventoryInfoEOEn.getTechnologyTerritory();
// if(StringUtils.isNotBlank(technologyTerritory)){ // if(StringUtils.isNotBlank(technologyTerritory)){
// StringBuilder sb = new StringBuilder(); // StringBuilder sb = new StringBuilder();
// for (String s : technologyTerritory.split(",")) { // for (String s : technologyTerritory.split(",")) {
// List<SysCategory> collect = sysCategoryList.stream() // List<SysCategory> collect = sysCategoryList.stream()
// .filter(e -> s.equals(e.getId())).collect(Collectors.toList()); // .filter(e -> s.equals(e.getId())).collect(Collectors.toList());
// if(collect.size() != 0){ // if(collect.size() != 0){
// sb.append(collect.get(0).getEnName()+","); // sb.append(collect.get(0).getEnName()+",");
// } // }
// } // }
// if(StringUtils.isNotBlank(sb)){ // if(StringUtils.isNotBlank(sb)){
// String substring = sb.substring(0, sb.length() - 1); // String substring = sb.substring(0, sb.length() - 1);
// dummyInventoryInfoEOEn.setTechnologyTerritory(substring); // dummyInventoryInfoEOEn.setTechnologyTerritory(substring);
// } // }
// } // }
} }
} }