From 0d340bc85e95be02fd17d182128b23486f60a25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 19 Oct 2023 20:53:30 +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 --- .../service/IParamsConfigDataEOService.java | 2 + .../IParamsConfigDataHistoryEOService.java | 2 +- .../impl/ParamsConfigDataEOServiceImpl.java | 39 ++++++++++++++++++- .../ParamsConfigDataHistoryEOServiceImpl.java | 38 +++++++++++++++++- .../controller/ParamsReportEOController.java | 26 +++++++++++++ .../IParamsReportConfigDataEOService.java | 2 + .../ParamsReportConfigDataEOServiceImpl.java | 39 ++++++++++++++++++- 7 files changed, 143 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java index 1a5ac490f..202ff895c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java @@ -78,4 +78,6 @@ public interface IParamsConfigDataEOService extends IService * @return */ List queryListByConfigIdList(List configIdList); + + void handleData(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java index 13fb9d79c..0bcd2d08e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java @@ -30,5 +30,5 @@ public interface IParamsConfigDataHistoryEOService extends IService queryListByConfigIdList(List configIdList); int deleteByParamsCollectManifestIdList(List paramsCollectManifestIdList); - + void handleData(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java index 2766ceeac..f96652911 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java @@ -11,8 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.List; +import java.util.*; /** * @Description: 参数配置数据 @@ -138,4 +137,40 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl list = this.list(); + Map> map = new HashMap<>(); + for (ParamsConfigDataEO prcd : list) { + String pid = prcd.getParamsCollectManifestId()+"+"+prcd.getParamsConfigId(); + List dataList = null; + if(map.containsKey(pid)){ + dataList = map.get(pid); + }else{ + dataList = new ArrayList<>(); + } + dataList.add(prcd); + map.put(pid,dataList); + } + List updateList = new ArrayList<>(); + for (List dataList:map.values()) { + Collections.sort(dataList, new Comparator() { + @Override + public int compare(ParamsConfigDataEO o1, ParamsConfigDataEO o2) { + return Integer.compare(o1.getOrderNum(), o2.getOrderNum()); + } + }); + int num = 0; + for (ParamsConfigDataEO prcd:dataList) { + prcd.setOrderNum(num); + updateList.add(prcd); + num++; + } + } + + if(CollectionUtil.isNotEmpty(updateList)){ + this.updateBatchById(updateList); + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java index 620f6da2b..7f4b19bcb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java @@ -10,7 +10,7 @@ import com.jero.modules.cert.collect.service.IParamsConfigDataHistoryEOService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; +import java.util.*; /** * @Description: 参数配置数据历史版本 @@ -62,4 +62,40 @@ public class ParamsConfigDataHistoryEOServiceImpl extends ServiceImpl list = this.list(); + Map> map = new HashMap<>(); + for (ParamsConfigDataHistoryEO prcd : list) { + String pid = prcd.getParamsCollectManifestId()+"+"+prcd.getParamsConfigId(); + List dataList = null; + if(map.containsKey(pid)){ + dataList = map.get(pid); + }else{ + dataList = new ArrayList<>(); + } + dataList.add(prcd); + map.put(pid,dataList); + } + List updateList = new ArrayList<>(); + for (List dataList:map.values()) { + Collections.sort(dataList, new Comparator() { + @Override + public int compare(ParamsConfigDataHistoryEO o1, ParamsConfigDataHistoryEO o2) { + return Integer.compare(o1.getOrderNum(), o2.getOrderNum()); + } + }); + int num = 0; + for (ParamsConfigDataHistoryEO prcd:dataList) { + prcd.setOrderNum(num); + updateList.add(prcd); + num++; + } + } + + if(CollectionUtil.isNotEmpty(updateList)){ + this.updateBatchById(updateList); + } + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index f875ee776..b12561b94 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -6,10 +6,13 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.cert.collect.service.IParamsConfigDataEOService; +import com.jero.modules.cert.collect.service.IParamsConfigDataHistoryEOService; import com.jero.modules.cert.report.entity.ParamsReportConfigEO; import com.jero.common.system.vo.DictModel; import com.jero.modules.cert.report.entity.ParamsReportEO; import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO; +import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService; import com.jero.modules.cert.report.service.IParamsReportConfigEOService; import com.jero.modules.cert.report.service.IParamsReportEOService; import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService; @@ -70,6 +73,18 @@ public class ParamsReportEOController extends JeroController handleData() { + paramsReportConfigDataEOService.handleData(); + paramsConfigDataEOService.handleData(); + paramsConfigDataHistoryEOService.handleData(); + return Result.OK(); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java index ab3698f26..a5dea695e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java @@ -42,4 +42,6 @@ public interface IParamsReportConfigDataEOService extends IService queryListByCollectManifestIdList(List paramsCollectManifestIdList); + + void handleData(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java index 0f72783e3..105c45a61 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java @@ -8,7 +8,7 @@ import com.jero.modules.cert.report.mapper.ParamsReportConfigDataEOMapper; import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService; import org.springframework.stereotype.Service; -import java.util.List; +import java.util.*; /** * @Description: 上报库参数配置数据 @@ -93,4 +93,41 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl list = this.list(); + Map> map = new HashMap<>(); + for (ParamsReportConfigDataEO prcd : list) { + String pid = prcd.getParamsCollectManifestId()+"+"+prcd.getParamsConfigId(); + List dataList = null; + if(map.containsKey(pid)){ + dataList = map.get(pid); + }else{ + dataList = new ArrayList<>(); + } + dataList.add(prcd); + map.put(pid,dataList); + } + List updateList = new ArrayList<>(); + for (List dataList:map.values()) { + Collections.sort(dataList, new Comparator() { + @Override + public int compare(ParamsReportConfigDataEO o1, ParamsReportConfigDataEO o2) { + return Integer.compare(o1.getOrderNum(), o2.getOrderNum()); + } + }); + int num = 0; + for (ParamsReportConfigDataEO prcd:dataList) { + prcd.setOrderNum(num); + updateList.add(prcd); + num++; + } + } + + if(CollectionUtil.isNotEmpty(updateList)){ + this.updateBatchById(updateList); + } + } + + }