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

修改参数多值排序问题

Browse Source
This commit is contained in:
高嵩
2023-10-19 19:26:55 +08:00
parent ca902b3949
commit 3a51d4d520
4 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+5 -1
View File
@@ -836,7 +836,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
});
for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDatas) {
List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
paramsConfigDataVO.put(paramsConfigDataEO.getOrderNum() + "+" + paramsConfigDataEO.getId(), paramsConfigDataVOList);
String num = "0";
if(ObjectUtil.isNotEmpty(paramsConfigDataEO.getOrderNum())){
num = String.valueOf(paramsConfigDataEO.getOrderNum());
}
paramsConfigDataVO.put(num + "+" + paramsConfigDataEO.getId(), paramsConfigDataVOList);
}
}else{
ParamsConfigDataEO paramsConfigDataEO = this.getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
+5 -1
View File
@@ -177,7 +177,11 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
});
for (ParamsConfigDataHistoryEO paramsConfigDataEO : configDataEOList) {
List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
paramsConfigDataVO.put(paramsConfigDataEO.getOrderNum()+"+"+paramsConfigDataEO.getId(), paramsConfigDataVOList);
String num = "0";
if(ObjectUtil.isNotEmpty(paramsConfigDataEO.getOrderNum())){
num = String.valueOf(paramsConfigDataEO.getOrderNum());
}
paramsConfigDataVO.put(num+"+"+paramsConfigDataEO.getId(), paramsConfigDataVOList);
}
}else{
ParamsConfigDataHistoryEO paramsConfigDataEO = this.getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+23 -24
View File
@@ -700,57 +700,49 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
if (StringUtils.isNotEmpty(paramsInfoPublishEO.getFileTemplateConnectId())) {
updateCollectManifestEO.setFileTemplateConnectId(paramsInfoPublishEO.getFileTemplateConnectId());
}
updateCollectManifestEOList.add(updateCollectManifestEO);
}
}
//删除旧的参数数据
List<String> oldDataList = oldParamsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getId).collect(Collectors.toList());
paramsConfigDataEOService.deleteByParamsCollectManifestIdList(oldDataList);
// 查询配置信息
List<String> configIdList = paramsConfigEOService.queryList(id).stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
List<ParamsConfigDataEO> paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(configIdList);
// 按照上报库参数项配置数据 更新 参数收集清单配置数据
List<Map<String, Object>> reportConfigDataEOList = new ArrayList<>();
List<ParamsConfigDataEO> configDataEOList = new ArrayList<>();
for (ParamsCollectManifestEO updateCollectManifestEO : updateCollectManifestEOList) {
for (String configId : configIdList) {
reportConfigDataEOList = paramsReportConfigDataList.stream().filter(e -> updateCollectManifestEO.getNioNumber().equals(e.get("nio_number"))
&& configId.equals(e.get("old_params_config_id"))).collect(Collectors.toList());
configDataEOList = paramsConfigDataEOList.stream().filter(e -> updateCollectManifestEO.getId().equals(e.getParamsCollectManifestId())
&& configId.equals(e.getParamsConfigId())).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(reportConfigDataEOList) && CollectionUtil.isNotEmpty(configDataEOList)) {
ParamsConfigDataEO updateParamsConfigDataEO = new ParamsConfigDataEO();
updateParamsConfigDataEO.setId(String.valueOf(configDataEOList.get(0).getId()));
updateParamsConfigDataEO.setTextData((String) reportConfigDataEOList.get(0).get("text_data"));
updateParamsConfigDataEO.setPullData((String) reportConfigDataEOList.get(0).get("pull_data"));
updateParamsConfigDataEO.setFileConnectId((String) reportConfigDataEOList.get(0).get("file_connect_id"));
updateParamsConfigDataEO.setOrderNum((Integer) reportConfigDataEOList.get(0).get("order_num"));
updateConfigDataEOList.add(updateParamsConfigDataEO);
} else if (CollectionUtil.isNotEmpty(reportConfigDataEOList) && CollectionUtil.isEmpty(configDataEOList)) {
ParamsConfigDataEO addParamsConfigDataEO = new ParamsConfigDataEO();
addParamsConfigDataEO.setId(UUID.randomUUID().toString().replace("-", ""));
addParamsConfigDataEO.setTextData((String) reportConfigDataEOList.get(0).get("text_data"));
addParamsConfigDataEO.setPullData((String) reportConfigDataEOList.get(0).get("pull_data"));
addParamsConfigDataEO.setFileConnectId((String) reportConfigDataEOList.get(0).get("file_connect_id"));
addParamsConfigDataEO.setOrderNum((Integer) reportConfigDataEOList.get(0).get("order_num"));
addParamsConfigDataEO.setParamsConfigId(configId);
addParamsConfigDataEO.setParamsCollectManifestId(updateCollectManifestEO.getId());
updateConfigDataEOList.add(addParamsConfigDataEO);
if (CollectionUtil.isNotEmpty(reportConfigDataEOList)) {
for (Map<String, Object> rcdMap : reportConfigDataEOList) {
ParamsConfigDataEO addParamsConfigDataEO = new ParamsConfigDataEO();
addParamsConfigDataEO.setId(UUID.randomUUID().toString().replace("-", ""));
addParamsConfigDataEO.setTextData((String) rcdMap.get("text_data"));
addParamsConfigDataEO.setPullData((String) rcdMap.get("pull_data"));
addParamsConfigDataEO.setFileConnectId((String) rcdMap.get("file_connect_id"));
addParamsConfigDataEO.setOrderNum((Integer) rcdMap.get("order_num"));
addParamsConfigDataEO.setParamsConfigId(configId);
addParamsConfigDataEO.setParamsCollectManifestId(updateCollectManifestEO.getId());
updateConfigDataEOList.add(addParamsConfigDataEO);
}
}
}
}
if (CollectionUtil.isNotEmpty(updateConfigDataEOList)) {
paramsConfigDataEOService.saveOrUpdateBatch(updateConfigDataEOList);
}
// 删除参数项配置数据
if (CollectionUtil.isNotEmpty(delCollectManifestIdList)) {
paramsConfigDataEOService.deleteByParamsCollectManifestIdList(delCollectManifestIdList);
}
// 更新项目参数项
paramsCollectManifestEOService.updateBatchById(updateCollectManifestEOList);
// 参数清单版本加 1
ParamsManifestEO updateManifestEO = new ParamsManifestEO();
updateManifestEO.setId(id);
@@ -814,6 +806,13 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
// 查询上报库的项目所有参数项的配置数据
ParamsReportEO paramsReportEO = paramsReportEOService.queryByOldParamsManifestId(paramsManifestHistoryEO.getSourceParamsManifestId(), paramsManifestHistoryEO.getVersion());
if(ObjectUtil.isEmpty(paramsReportEO)){
if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("无法找到对应版本上报库，无法发起变更！");
} else {
throw new JeroBootException("Cannot find the corresponding version report, and cannot be initiated change!");
}
}
List<Map<String, Object>> paramsReportConfigDataList = paramsReportDetailEOService.listInfoForChange(paramsReportEO.getId());
// 比较模板参数项 和 项目参数项
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+6 -2
View File
@@ -249,7 +249,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
});
for (ParamsReportConfigDataEO paramsConfigDataEO : paramsConfigDataEOList) {
List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
paramsConfigDataVO.put(paramsConfigDataEO.getOrderNum()+"+"+paramsConfigDataEO.getId(),paramsConfigDataVOList);
String num = "0";
if(ObjectUtil.isNotEmpty(paramsConfigDataEO.getOrderNum())){
num = String.valueOf(paramsConfigDataEO.getOrderNum());
}
paramsConfigDataVO.put(num+"+"+paramsConfigDataEO.getId(),paramsConfigDataVOList);
}
}
@@ -1885,8 +1889,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
int orderNum = (Integer) configDataVOList.get(0).get("orderNum");
int plusIndex = configDataId.indexOf("+");
if (plusIndex != -1) {
configDataId = configDataId.substring(plusIndex + 1);
orderNum = Integer.parseInt(configDataId.substring(0, plusIndex));
configDataId = configDataId.substring(plusIndex + 1);
}
ParamsReportConfigDataEO paramsReportConfigDataEO = new ParamsReportConfigDataEO();
paramsReportConfigDataEO.setOrderNum(orderNum);