diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 9724c1dcf..2bef73cf0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -1793,11 +1793,28 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> configDataVOList = (List>) paramsReportConfigDataMap.get("list"); + logCnContent.append("将"); + logEnContent.append(" set "); + + logCnContent.append(paramsReportConfigEO.getConfigName()).append("的"); + logEnContent.append(paramsReportConfigEO.getConfigName()); Map paramsConfigDataVOMap = (Map) paramsReportConfigDataMap.get("paramsConfigData"); @@ -1831,6 +1853,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> configDataVOList = (List>) paramsConfigDataMap.getValue(); + + if (CollectionUtil.isNotEmpty(configDataVOList)) { Integer orderNum = (Integer) configDataVOList.get(0).get("orderNum"); @@ -1999,22 +2023,106 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl removeConfigDataWrap = new QueryWrapper<>(); - removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsConfigId,paramsReportConfigEOId); - removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId); - this.paramsReportConfigDataEOService.remove(removeConfigDataWrap); paramsReportConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); paramsReportConfigDataEO.setParamsConfigId(paramsReportConfigEOId); newConfigDataEOList.add(paramsReportConfigDataEO); } +// +// logCnContent.append(paramsReportConfigEO.getConfigName()).append("的"); +// logEnContent.append(paramsReportConfigEO.getConfigName()); } + QueryWrapper prcdQueryWrap = new QueryWrapper<>(); + prcdQueryWrap.lambda().eq(ParamsReportConfigDataEO::getParamsConfigId,paramsReportConfigEOId); + prcdQueryWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId); + List prcdEoList = this.paramsReportConfigDataEOService.list(prcdQueryWrap); + if(CollectionUtils.isNotEmpty(prcdEoList)){ + List paramsConfigDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey()).distinct().collect(Collectors.toList()); - logCnContent.append(paramsReportConfigEO.getConfigName()).append("的"); - logEnContent.append(paramsReportConfigEO.getConfigName()); + List newAddPcdDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey()).filter(e -> { + boolean flag = false; + // 如果key的长度是16位,则是新添加的 + if (e.length() == 16) { + flag = true; + } + return flag; + }).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(newAddPcdDataIdList)){ + StringBuilder dataValueSb = new StringBuilder(); + for (String newAddPcdDataId : newAddPcdDataIdList) { + List> configDataVOList = (List>) paramsConfigDataVOMap.get(newAddPcdDataId); + for (Map paramsConfigDataVO : configDataVOList) { + String type = (String) paramsConfigDataVO.get("type"); + + String dataValue = ""; + if(ObjectUtils.isNotEmpty(paramsConfigDataVO.get("dataValue"))){ + dataValue = String.valueOf(paramsConfigDataVO.get("dataValue")); + } + // 如果是附件 单独处理 + if(StringUtils.equals(type,ConfigDataTypeEnum.FILE.getValue())){ + + } + dataValueSb.append("\"").append(dataValue).append("\","); + } + } + + String dataValue = ""; + if(StringUtils.isNotBlank(dataValueSb.toString())){ + dataValue = dataValueSb.toString().substring(0,dataValueSb.length()-1); + } + + addLogCnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中添加了").append(dataValue).append(","); + addLogEnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中添加了").append(dataValue).append(","); + + addFlag = true; + } + + // 判断有没有被减掉的(删除的) + List deletePrcdEoList = prcdEoList.stream().filter(prcdEo -> { + boolean flag = true; + for (String paramsConfigDataId : paramsConfigDataIdList) { + if(StringUtils.equals(prcdEo.getId(),paramsConfigDataId)){ + flag = false; + break; + } + } + return flag; + }).collect(Collectors.toList()); + + // 如果有被删的数据 增加log记录 + if(CollectionUtils.isNotEmpty(deletePrcdEoList)){ + StringBuilder dataValueSb = new StringBuilder(); + for (ParamsReportConfigDataEO paramsReportConfigDataEO : deletePrcdEoList) { + if(StringUtils.isNotBlank(paramsReportConfigDataEO.getTextData())){ + dataValueSb.append("\"").append(paramsReportConfigDataEO.getTextData()).append("\","); + } + if(StringUtils.isNotBlank(paramsReportConfigDataEO.getPullData())){ + dataValueSb.append("\"").append(paramsReportConfigDataEO.getPullData()).append("\","); + } + if(StringUtils.isNotBlank(paramsReportConfigDataEO.getFileConnectId())){ + dataValueSb.append("\"").append(paramsReportConfigDataEO.getFileConnectId()).append("\","); + } + } + String dataValue = ""; + if(StringUtils.isNotBlank(dataValueSb.toString())){ + dataValue = dataValueSb.toString().substring(0,dataValueSb.length()-1); + } + deleteLogCnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中删除了").append(dataValue).append(","); + deleteLogEnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中删除了").append(dataValue).append(","); + + deleteFlag = true; + } + } + + + QueryWrapper removeConfigDataWrap = new QueryWrapper<>(); + removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsConfigId,paramsReportConfigEOId); + removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId); + this.paramsReportConfigDataEOService.remove(removeConfigDataWrap); //******************这里是当前配置的循环结束了****************** //判断结尾是不是该配置的名字--如果是(说明该配置没有被改变)需要从logCnContent中删除该配置名字 @@ -2037,7 +2145,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl{ - if(item.id==value){ - this.form.cpsb = item.cpsb - this.form.cpmc = item.cpmc - this.form.cpxh = item.cpxh - getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{ - this.form.dllx1=res.result.dllx1 == null?undefined:res.result.dllx1 - this.form.dllx2=res.result.dllx2== null?undefined:res.result.dllx2 - }) - } - }) + + this.$nextTick(()=>{ + this.form={...this.form} + this.$refs.ruleForm.validateField('bapc') + }) + this.selectListPc.map(item=>{ + if(item.id==value){ + this.form.cpsb = item.cpsb + this.form.cpmc = item.cpmc + this.form.cpxh = item.cpxh + getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{ + this.form.dllx1=res.result.dllx1 == null?undefined:res.result.dllx1 + this.form.dllx2=res.result.dllx2== null?undefined:res.result.dllx2 + }) + } + }) this.$forceUpdate() }, update(val){