From c42e65c22cdb2099a42f4bfcf0837137fa887508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sun, 15 Oct 2023 18:24:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E5=A4=9A?= =?UTF-8?q?=E5=80=BC=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsManifestEOController.java | 16 ------ .../service/IParamsManifestEOService.java | 3 - .../impl/ParamsManifestEOServiceImpl.java | 57 ------------------- 3 files changed, 76 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index f9a6525c8..14c8158b0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -382,20 +382,4 @@ public class ParamsManifestEOController extends JeroController syncChangeDataFromReport(@RequestParam(name="paramsManifestId",required=true) String paramsManifestId, - @RequestParam(name="reportManifestId",required=true) String reportManifestId) { - paramsManifestEOService.syncChangeDataFromReport(paramsManifestId, reportManifestId); - return Result.OK("操作成功！"); - } - } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java index 3fadb4d47..175fc4866 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java @@ -119,7 +119,4 @@ public interface IParamsManifestEOService extends IService { * @param json */ void replacementUser(JSONObject json); - - - void syncChangeDataFromReport(String paramsManifestId, String reportManifestId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 818117a0d..75cf6800b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -760,63 +760,6 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl paramsCollectManifestEOList = paramsCollectManifestEOMapper.queryByParamManifestId(paramsManifestId); - - // 查询配置信息 - List pcList = paramsConfigEOService.queryList(paramsManifestId); - List configIdList = pcList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); - Map ocNameMap = pcList.stream().collect(Collectors.toMap(ParamsConfigEO::getId, ParamsConfigEO::getConfigName)); - List paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(configIdList); - List updateList = new ArrayList<>(); - - // 查询上报库的项目所有参数项的配置数据 - ParamsReportEO paramsReportEO = paramsReportEOService.getById(reportManifestId); - List> paramsReportConfigDataList = paramsReportDetailEOService.listInfoForChange(paramsReportEO.getId()); - - for (ParamsCollectManifestEO pcm : paramsCollectManifestEOList) { - if (CollectManifestStateEnum.CHANGE.getValue().equals(pcm.getState()) && !"11".equals(pcm.getControlType())) { - List pcdList = paramsConfigDataEOList.stream().filter(e -> e.getParamsCollectManifestId().equals(pcm.getId())).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(pcdList)) { - for (ParamsConfigDataEO pcd : pcdList) { - boolean flag = false; - List> prcdList = paramsReportConfigDataList.stream().filter(o -> - o.get("nio_number").equals(pcm.getNioNumber()) - && o.get("config_name").equals(ocNameMap.get(pcd.getParamsConfigId())) - ).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(prcdList) && prcdList.size() == 1) {//多值情况忽略 - Map prcdMap = prcdList.get(0); - if (ObjectUtil.isNotEmpty(prcdMap.get("text_data")) && !StringUtils.equals(pcd.getTextData(), String.valueOf(prcdMap.get("text_data")))) { - flag = true; - pcd.setTextData(String.valueOf(prcdMap.get("text_data"))); - } - if (ObjectUtil.isNotEmpty(prcdMap.get("pull_data")) && !StringUtils.equals(pcd.getPullData(), String.valueOf(prcdMap.get("pull_data")))) { - flag = true; - pcd.setPullData(String.valueOf(prcdMap.get("pull_data"))); - } - if (ObjectUtil.isNotEmpty(prcdMap.get("file_connect_id")) && !StringUtils.equals(pcd.getFileConnectId(), String.valueOf(prcdMap.get("file_connect_id")))) { - flag = true; - pcd.setFileConnectId(String.valueOf(prcdMap.get("file_connect_id"))); - } - if(flag){ - updateList.add(pcd); - } - } - } - } - } - } - if(CollectionUtils.isNotEmpty(updateList)){ - paramsConfigDataEOService.updateBatchById(updateList); - } - } - - /** * 从历史版本进行扩展变更 */