From a74f3493d6db8f3ac4face78f2aebadafc4ff42a Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Tue, 14 Jun 2022 17:26:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95log+?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BF=A1=E6=81=AF=E5=86=85=E5=AE=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryInfoEOServiceImpl.java | 98 +++++++++----------
 1 file changed, 49 insertions(+), 49 deletions(-)

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