From 3866b52dccff5e4f181ed7e5c25e8190661273c2 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 28 Oct 2022 14:18:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95-=E5=A1=AB=E5=86=99=E4=BA=BA?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 207 ++++++++++-------- 1 file changed, 114 insertions(+), 93 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 0d38f314a..b8c6c0624 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -33,7 +33,6 @@ import com.jero.modules.cert.collect.vo.ParamsManifestVO; import com.jero.modules.cert.report.entity.*; import com.jero.modules.cert.report.service.*; import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO; -import com.jero.modules.cert.template.entity.ParamsInfoEO; import com.jero.modules.cert.template.entity.ParamsInfoPublishEO; import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.cert.template.enums.ControlVerifyEnum; @@ -2552,8 +2551,6 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> datas = result; if(datas!=null &&!datas.isEmpty()){ try { - //获取全部sheet页中表格 - XSSFWorkbook workbook=new XSSFWorkbook(new FileInputStream(excelfile)); int i = 0 ; List> datasUpdate = new ArrayList<>(); //处理空行数据，当读取exceL出现空行过多时，空行数为20以上时中断读取，将数据清洗为新的list @@ -2639,9 +2636,6 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl configDataList = (List) map.get("configDataList"); - - - List paramsInfoEOS = new ArrayList<>(); for (ParamsConfigDataEO importDto : configDataList) { //判断此行数据是否全部为空,是则不读取 if (checkObjAllFieldsIsNull(importDto)) { @@ -2668,8 +2662,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); - Map configMap = paramsConfigEOList.stream().collect(Collectors.toMap(ParamsConfigEO::getConfigName, ParamsConfigEO::getId)); + Map configMap = paramsConfigEOList.stream().collect(Collectors.toMap(ParamsConfigEO::getId, ParamsConfigEO::getConfigName)); // 查询清单参数项 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, paramsManifestId); @@ -3411,8 +3412,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl configDataList = new ArrayList<>(); List stringMessage = new ArrayList<>(); - int i = 2; //记录行号 - int num = 0; //记录是第几条数据 + int i = 3; //记录行号 //循环验证数据 for (Map dto : dataList) { i++; @@ -3435,201 +3435,219 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = paramsConfigDataEOList.stream().filter(e-> collectManifestMap.get(nioNumber).equals(e.getParamsCollectManifestId()) - && configMap.get(key).equals(e.getParamsConfigId())).collect(Collectors.toList()); + && key.equals(e.getParamsConfigId())).collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(list)) { configDataEO.setId(list.get(0).getId()); } configDataEO.setParamsCollectManifestId(collectManifestMap.get(nioNumber)); - configDataEO.setParamsConfigId(configMap.get(key)); + configDataEO.setParamsConfigId(key); // 校验配置列 - if (ControlTypeEnum.TEXT.getValue().equals(value)) { - resultMap = validateText(key, controlVerify, value, isMust, "1000", cut); + if (ControlTypeEnum.TEXT.getValue().equals(controlType)) { + resultMap = validateText(configMap.get(key), controlVerify, value, isMust, "1000", cut); errorMsg += (String)resultMap.get("errorMsg"); countError += (int)resultMap.get("countError"); configDataEO.setTextData(value); - } else if (ControlTypeEnum.PULL_SINGLE.getValue().equals(value)) { - resultMap = validatePull(key, controlValues, value, isMust, true, cut); + } else if (ControlTypeEnum.PULL_SINGLE.getValue().equals(controlType)) { + resultMap = validatePull(configMap.get(key), controlValues, value, isMust, true, cut); errorMsg += (String)resultMap.get("errorMsg"); countError += (int)resultMap.get("countError"); configDataEO.setPullData(value); - } else if (ControlTypeEnum.PULL_MORE.getValue().equals(value)) { - resultMap = validatePull(key, controlValues, value, isMust, false, cut); + } else if (ControlTypeEnum.PULL_MORE.getValue().equals(controlType)) { + resultMap = validatePull(configMap.get(key), controlValues, value, isMust, false, cut); errorMsg += (String)resultMap.get("errorMsg"); countError += (int)resultMap.get("countError"); configDataEO.setPullData(value); - } else if (ControlTypeEnum.FILE.getValue().equals(value)) { - resultMap = validateFile(key, unzipfilepath, value, isMust , cut); + } else if (ControlTypeEnum.FILE.getValue().equals(controlType)) { + resultMap = validateFile(configMap.get(key), unzipfilepath, value, isMust , cut); errorMsg += (String)resultMap.get("errorMsg"); countError += (int)resultMap.get("countError"); configDataEO.setFileConnectId(value); - } else if (ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(value)) { + } else if (ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(controlType)) { // 校验必填 if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if(CutEnum.CN.getValue().equals(cut)) { - errorMsg += key + "为必填项,不能为空；"; + errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { - errorMsg += key + " is mandatory and cannot be empty; "; + errorMsg += configMap.get(key) + " is mandatory and cannot be empty; "; } countError++; } else { - resultMap = validatePull(key, controlValues, value.split("#")[0], isMust, true, cut); - errorMsg += (String) resultMap.get("errorMsg"); - countError += (int) resultMap.get("countError"); - configDataEO.setPullData(value.split("#")[0]); - if (value.split("#").length > 1) { - resultMap = validateText(key, controlVerify, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), "1000", cut); + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[1], isMust, true, cut); errorMsg += (String) resultMap.get("errorMsg"); countError += (int) resultMap.get("countError"); - configDataEO.setTextData(value.split("#")[1]); + configDataEO.setPullData(value.split("#")[1]); + + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + + } else { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, true, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[0]); } } - } else if (ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(value)) { + } else if (ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)) { // 校验必填 if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if(CutEnum.CN.getValue().equals(cut)) { - errorMsg += key + "为必填项,不能为空；"; + errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { - errorMsg += key + " is mandatory and cannot be empty; "; + errorMsg += configMap.get(key) + " is mandatory and cannot be empty; "; } countError++; } else { - resultMap = validatePull(key, controlValues, value.split("#")[0], isMust, false, cut); - errorMsg += (String) resultMap.get("errorMsg"); - countError += (int) resultMap.get("countError"); - configDataEO.setPullData(value.split("#")[0]); - if (value.split("#").length > 1) { - resultMap = validateText(key, controlVerify, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), "1000", cut); + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[1], isMust, false, cut); errorMsg += (String) resultMap.get("errorMsg"); countError += (int) resultMap.get("countError"); - configDataEO.setTextData(value.split("#")[1]); + configDataEO.setPullData(value.split("#")[1]); + + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } else { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, false, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[0]); } } - } else if (ControlTypeEnum.TEXT_FILE.getValue().equals(value)) { + } else if (ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)) { // 校验必填 if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if(CutEnum.CN.getValue().equals(cut)) { - errorMsg += key + "为必填项,不能为空；"; + errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { - errorMsg += key + " is mandatory and cannot be empty; "; + errorMsg += configMap.get(key) + " is mandatory and cannot be empty; "; } countError++; } else { - resultMap = validateText(key, controlVerify, value.split("#")[0], isMust, "1000", cut); + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], isMust, "1000", cut); errorMsg += (String) resultMap.get("errorMsg"); countError += (int) resultMap.get("countError"); configDataEO.setTextData(value.split("#")[0]); if (value.split("#").length > 1) { - resultMap = validateFile(key, unzipfilepath, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), cut); + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), cut); errorMsg += (String) resultMap.get("errorMsg"); countError += (int) resultMap.get("countError"); configDataEO.setFileConnectId(value.split("#")[1]); } } - } else if (ControlTypeEnum.PULL_SINGLE_FILE.getValue().equals(value)) { + } else if (ControlTypeEnum.PULL_SINGLE_FILE.getValue().equals(controlType)) { // 校验必填 if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if(CutEnum.CN.getValue().equals(cut)) { - errorMsg += key + "为必填项,不能为空；"; + errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { - errorMsg += key + " is mandatory and cannot be empty; "; + errorMsg += configMap.get(key) + " is mandatory and cannot be empty; "; } countError++; } else { - resultMap = validatePull(key, controlValues, value.split("#")[0], isMust, true, cut); + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, true, cut); errorMsg += (String) resultMap.get("errorMsg"); countError += (int) resultMap.get("countError"); configDataEO.setPullData(value.split("#")[0]); if (value.split("#").length > 1) { - resultMap = validateFile(key, unzipfilepath, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), cut); + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), cut); errorMsg += (String) resultMap.get("errorMsg"); countError += (int) resultMap.get("countError"); configDataEO.setFileConnectId(value.split("#")[1]); } } - } else if (ControlTypeEnum.PULL_MORE_FILE.getValue().equals(value)) { + } else if (ControlTypeEnum.PULL_MORE_FILE.getValue().equals(controlType)) { // 校验必填 if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if(CutEnum.CN.getValue().equals(cut)) { - errorMsg += key + "为必填项,不能为空；"; + errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { - errorMsg += key + " is mandatory and cannot be empty; "; + errorMsg += configMap.get(key) + " is mandatory and cannot be empty; "; } countError++; } else { - resultMap = validatePull(key, controlValues, value.split("#")[0], isMust, false, cut); + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, false, cut); errorMsg += (String) resultMap.get("errorMsg"); countError += (int) resultMap.get("countError"); configDataEO.setPullData(value.split("#")[0]); if (value.split("#").length > 1) { - resultMap = validateFile(key, unzipfilepath, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), cut); + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), cut); errorMsg += (String) resultMap.get("errorMsg"); countError += (int) resultMap.get("countError"); configDataEO.setFileConnectId(value.split("#")[1]); } } - } else if (ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(value)) { + } else if (ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) { // 校验必填 if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if(CutEnum.CN.getValue().equals(cut)) { - errorMsg += key + "为必填项,不能为空；"; + errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { - errorMsg += key + " is mandatory and cannot be empty; "; + errorMsg += configMap.get(key) + " is mandatory and cannot be empty; "; } countError++; } else { - resultMap = validatePull(key, controlValues, value.split("#")[0], isMust, false, cut); - errorMsg += (String) resultMap.get("errorMsg"); - countError += (int) resultMap.get("countError"); - configDataEO.setPullData(value.split("#")[0]); - if (value.split("#").length > 1) { - resultMap = validateText(key, controlVerify, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), "1000", cut); + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[1], isMust, true, cut); errorMsg += (String) resultMap.get("errorMsg"); countError += (int) resultMap.get("countError"); - configDataEO.setTextData(value.split("#")[1]); + configDataEO.setPullData(value.split("#")[1]); + + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + + if (value.split("#").length > 2) { + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[2], ParamsIsMustEnum.NO.getValue(), cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setFileConnectId(value.split("#")[2]); + } + } else { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, false, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[0]); } - if (value.split("#").length > 2) { - resultMap = validateFile(key, unzipfilepath, value.split("#")[2], ParamsIsMustEnum.NO.getValue(), cut); - errorMsg += (String) resultMap.get("errorMsg"); - countError += (int) resultMap.get("countError"); - configDataEO.setFileConnectId(value.split("#")[2]); - } } } else { if (CutEnum.EN.getValue().equals(cut)) { - errorMsg += key + "did not match the Control Component in the system; "; + errorMsg += configMap.get(key) + "did not match the Control Component in the system; "; countError ++; } else { - errorMsg += key + "未匹配到系统中的控件类型"; + errorMsg += configMap.get(key) + "未匹配到系统中的控件类型"; countError ++; } } @@ -3730,7 +3748,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl