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> findAll(){ String methodDescribe = getMethodDescribe("findAll"); List 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 @@ 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 findAll() { - return this.baseMapper.findAll(); + List removeList = new ArrayList<>(),addList = new ArrayList<>(); + List 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; } /**