接口调整

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();

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>

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;
     }
 
     /**