diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/WarningStatisticQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/WarningStatisticQueDto.java index 0158a4c4..9e8d59f1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/dto/WarningStatisticQueDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/WarningStatisticQueDto.java @@ -57,6 +57,10 @@ public class WarningStatisticQueDto { /** * 告警类型 */ - WARNING_TYPE + WARNING_TYPE, + /** + * 状态 + */ + STATUS } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/mapper/WarningMapper.java b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/WarningMapper.java index 1f4b0d6e..2947df5c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/mapper/WarningMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/WarningMapper.java @@ -69,4 +69,31 @@ public interface WarningMapper extends BaseMapper { "") IPage statisticByWarningType(Page page, @Param("sp") WarningStatisticQueDto sp); + @Select("") + IPage statisticByStatus(Page page, @Param("sp") WarningStatisticQueDto sp); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/service/WarningService.java b/shuili-system/src/main/java/com/kms/yxgh/common/service/WarningService.java index 7ecc135a..f96a735a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/service/WarningService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/service/WarningService.java @@ -100,7 +100,7 @@ public class WarningService { if (WarningStatisticQueDto.StatisticType.ENGINEERING.equals(sp.getType())) { iPage = warningMapper.statisticByCode(page, sp); warningStatisticDto.setStatistics(iPage.getRecords()); - } else { + } else if (WarningStatisticQueDto.StatisticType.WARNING_TYPE.equals(sp.getType())) { iPage = warningMapper.statisticByWarningType(page, sp); warningStatisticDto.setStatistics(iPage.getRecords().stream().peek(item -> { SysDictData dictData = dictDataCache.get(new DictKey("xc_warnning_type", item.getCode())); @@ -108,6 +108,12 @@ public class WarningService { item.setName(dictData.getDictLabel()); } }).collect(Collectors.toList())); + } else { + iPage = warningMapper.statisticByStatus(page, sp); + warningStatisticDto.setStatistics(iPage.getRecords().stream().peek(item -> { + item.setName(item.getCode().equals("0") ? "未处理" : "已处理"); + }).collect(Collectors.toList())); + } return warningStatisticDto; }