From 17d1104509b43184ee7ec59c2ee63fe2356839e9 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Mon, 14 Aug 2023 21:35:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/system/pojo/dto/EpdDTO.java |  6 +++++
 .../controller/EleEpdPqdController.java       |  2 +-
 .../system/mapper/mapping/EleEpdPqdMapper.xml |  6 +++--
 .../service/impl/EleEpdPqdServiceImpl.java    | 23 ++++++++++++++++++-
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/dto/EpdDTO.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/dto/EpdDTO.java
index ef8613518..d3436986f 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/dto/EpdDTO.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/dto/EpdDTO.java
@@ -19,4 +19,10 @@ public class EpdDTO {
     @ApiModelProperty("inflxuDB表名")
     private String tableName;
 
+    @ApiModelProperty("起始次数")
+    private Integer harmStart;
+
+    @ApiModelProperty("结束次数")
+    private Integer harmEnd;
 }
+
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java
index 752ee81de..b5aaf084f 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java
@@ -196,7 +196,7 @@ public class EleEpdPqdController extends BaseController {
     @PostMapping("/findAll")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("查询所有字典数据")
-    @ApiIgnore
+//    @ApiIgnore
     public HttpResult<List<EpdDTO>> findAll(){
         String methodDescribe = getMethodDescribe("findAll");
         List<EpdDTO> list = eleEpdPqdService.findAll();
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml
index 854cfbafb..e89df2db1 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml
@@ -47,12 +47,14 @@
     <select id="findAll" resultType="EpdDTO">
         select
             t0.Name dictName,
-            t1.Name tableName
+            t1.Name tableName,
+            t0.Harm_Start harmStart,
+	        t0.Harm_End harmEnd
         from
             ele_epd_pqd t0
         left join sys_dict_data t1 on
             t0.Class_Id = t1.Id
         where t0.status = 1
-        group by t0.Name,t1.Name
+        group by t0.Name,t1.Name,t0.Harm_Start,t0.Harm_End
     </select>
 </mapper>
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java
index f93d4b696..134b2f2f4 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java
@@ -209,7 +209,28 @@ public class EleEpdPqdServiceImpl extends ServiceImpl<EleEpdPqdMapper, EleEpdPqd
 
     @Override
     public List<EpdDTO> findAll() {
-        return this.baseMapper.findAll();
+        List<EpdDTO> removeList = new ArrayList<>(),addList = new ArrayList<>();
+        List<EpdDTO> list = this.baseMapper.findAll();
+        if (CollectionUtil.isNotEmpty(list)){
+            list.forEach(item->{
+                if (!Objects.isNull(item.getHarmStart()) && !Objects.isNull(item.getHarmEnd())){
+                    removeList.add(item);
+                    for (int i = item.getHarmStart(); i <= item.getHarmEnd(); i++) {
+                        EpdDTO epdDTO = new EpdDTO();
+                        epdDTO.setDictName(item.getDictName() + "_" + i);
+                        epdDTO.setTableName(item.getTableName());
+                        addList.add(epdDTO);
+                    }
+                }
+            });
+            if (CollectionUtil.isNotEmpty(removeList)){
+                list.removeAll(removeList);
+            }
+            if (CollectionUtil.isNotEmpty(addList)){
+                list.addAll(addList);
+            }
+        }
+        return list;
     }
 
     /**