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

Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT

Browse Source
This commit is contained in:
范强强
2023-10-20 13:56:18 +08:00
parent 3666038b2a d6103d5ce2
commit 68e338c66e
1 changed files with 30 additions and 11 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/ParamsManifestEOServiceImpl.java
+30 -11
View File
@@ -36,7 +36,9 @@ import com.jero.modules.cert.collect.service.IParamsManifestEOService;
import com.jero.modules.cert.collect.service.IParamsManifestHistoryEOService;
import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
import com.jero.modules.cert.collect.vo.ParamsManifestVO;
import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
import com.jero.modules.cert.report.entity.ParamsReportEO;
import com.jero.modules.cert.report.service.IParamsReportConfigEOService;
import com.jero.modules.cert.report.service.IParamsReportDetailEOService;
import com.jero.modules.cert.report.service.IParamsReportEOService;
import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
@@ -125,6 +127,8 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
@Autowired
private IParamsConfigHistoryEOService paramsConfigHistoryEOService;
@Autowired
private IParamsReportConfigEOService paramsReportConfigEOService;
@Autowired
private IParamsConfigDataEOService paramsConfigDataEOService;
@@ -897,26 +901,41 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
// 查询配置信息
List<ParamsConfigEO> configEOList = new ArrayList<>();
List<String> configIdList = new ArrayList<>();
List<ParamsConfigHistoryEO> configList = paramsConfigHistoryEOService.queryList(paramsManifestHistoryEO.getId());
for (ParamsConfigHistoryEO config : configList) {
List<ParamsReportConfigEO> prcList = paramsReportConfigEOService.queryList(paramsReportEO.getId());
for (ParamsReportConfigEO config : prcList) {
ParamsConfigEO newConfig = new ParamsConfigEO();
BeanUtils.copyProperties(config,newConfig);
newConfig.setParamsManifestId(paramsManifestHistoryEO.getSourceParamsManifestId());
configEOList.add(newConfig);
configIdList.add(newConfig.getId());
}
if (CollectionUtil.isNotEmpty(configList)) {
if (CollectionUtil.isNotEmpty(configEOList)) {
paramsConfigEOService.saveOrUpdateBatch(configEOList);
}
List<ParamsConfigDataEO> configDataEOList = new ArrayList<>();
List<ParamsConfigDataHistoryEO> paramsConfigDataEOList = paramsConfigDataHistoryEOService.queryListByConfigIdList(configIdList);
for (ParamsConfigDataHistoryEO configData : paramsConfigDataEOList) {
ParamsConfigDataEO newConfigData = new ParamsConfigDataEO();
BeanUtils.copyProperties(configData,newConfigData);
configDataEOList.add(newConfigData);
// 按照上报库参数项配置数据 更新 参数收集清单配置数据
List<Map<String, Object>> reportConfigDataEOList = 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("params_config_id"))).collect(Collectors.toList());
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(configDataEOList)) {
paramsConfigDataEOService.saveOrUpdateBatch(configDataEOList);
if (CollectionUtil.isNotEmpty(updateConfigDataEOList)) {
paramsConfigDataEOService.saveOrUpdateBatch(updateConfigDataEOList);
}
// 更新项目参数项