diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java index 7750198e..eb4b54dd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java @@ -54,8 +54,10 @@ public enum ProjectCharEnum { ,StaticIndexEnum.YZT_SZ_SUM ,StaticIndexEnum.YZT_DF_SUM), "数量", Collections.emptyList()), K2("测报设施建设", Arrays.asList( - StaticIndexEnum.YZT_CONSTRUCT_SYQ_SUM - ,StaticIndexEnum.YZT_CONSTRUCT_DBAQ_SUM), "数量", Collections.emptyList()), + StaticIndexEnum.YZT_SSYX_SUM + ,StaticIndexEnum.YZT_SWGCJCCZ_SUM + ,StaticIndexEnum.YZT_SWGCJCCD_SUM + ), "数量", Collections.emptyList()), K3("监督检查总览", Arrays.asList( StaticIndexEnum.YZT_SUPERVISE_JRGJ_YCL_SUM ,StaticIndexEnum.YZT_SUPERVISE_JRGJ_DCL_SUM @@ -81,7 +83,7 @@ public enum ProjectCharEnum { ), "数量", Collections.emptyList()), K6_1("日常巡查", Collections.singletonList( - StaticIndexEnum.YZT_DAILY_DCL_NUMBER_SUM + StaticIndexEnum.YZT_DAILY_BL_NUMBER_SUM ), "数量", Collections.emptyList()), diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java index e89a54e4..838fb9ad 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java @@ -3,6 +3,9 @@ package com.kms.yxgh.common.enums; import cn.hutool.core.collection.CollectionUtil; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysXzqhService; +import com.kms.yg.cz.service.AttStBaseService; +import com.kms.yg.cz.service.AttStMpService; +import com.kms.yg.sz.service.BsSgcSzSzrwService; import com.kms.yxgh.common.dto.*; import com.kms.yxgh.common.service.Statistic; import com.kms.yxgh.df.mapper.DfCheckingProblemV2Mapper; @@ -19,6 +22,7 @@ import com.kms.yxgh.sz.mapper.SzCheckingV2Mapper; import com.kms.yxgh.sz.mapper.SzYhV2Mapper; import com.shuili.common.utils.SpringUtils; import lombok.Getter; +import org.springframework.util.StringUtils; import java.util.*; import java.util.stream.Collectors; @@ -310,7 +314,7 @@ public enum StaticIndexEnum { YZT_SK_SUM("水库", sp -> { Map map =new HashMap<>(); - map.put("sum","5451"); + map.put("sum","7596"); return map; }, "座", "0"), YZT_SZ_SUM("水闸", sp -> { @@ -319,24 +323,32 @@ public enum StaticIndexEnum { return map; }, "座", "0"), YZT_DF_SUM("堤防", sp -> { + Map map =new HashMap<>(); DfCheckingRecordV2Mapper mapper = SpringUtils.getBean(DfCheckingRecordV2Mapper.class); int count = mapper.paragraphCountNumber(sp); - - Map map =new HashMap<>(); - map.put("sum","5457"); + map.put("sum",String.valueOf(count)); return map; }, "段", "0"), - YZT_CONSTRUCT_SYQ_SUM("水库", sp -> { + YZT_SSYX_SUM("水事影像监测监视点", sp -> { Map map =new HashMap<>(); - map.put("sum","5451"); +// ATT_WMST_BASE return map; - }, "水闸", "0"), - YZT_CONSTRUCT_DBAQ_SUM("总数", sp -> { + }, "个", "0"), + YZT_SWGCJCCZ_SUM("水文工程检测测站数量", sp -> { Map map =new HashMap<>(); - map.put("sum","5456"); + AttStBaseService service = SpringUtils.getBean(AttStBaseService.class); + service.count(); + map.put("sum",String.valueOf(service.count())); return map; }, "个", "0"), + YZT_SWGCJCCD_SUM("水文工程检测测点数量", sp -> { + Map map =new HashMap<>(); + AttStMpService service = SpringUtils.getBean(AttStMpService.class); + map.put("sum", String.valueOf(service.count())); + return map; + }, "个", "0"), + YZT_SUPERVISE_JRGJ_YCL_SUM("已处理", sp -> { @@ -365,7 +377,8 @@ public enum StaticIndexEnum { YZT_TOUR_CHECK_RWS_SUM("任务数", sp -> { Map map =new HashMap<>(); - map.put("sum","456"); + BsSgcSzSzrwService service = SpringUtils.getBean(BsSgcSzSzrwService.class); + map.put("sum",String.valueOf(service.count())); return map; }, "个", "0"), @@ -431,11 +444,12 @@ public enum StaticIndexEnum { return map; }, "个", "0"), - YZT_DAILY_DCL_NUMBER_SUM("待处理", sp -> { + YZT_DAILY_BL_NUMBER_SUM("比例", sp -> { Map map =new HashMap<>(); - map.put("sum","10000"); + map.put("bl","70"); return map; - }, "个", "0") + }, "个", "0"), + ; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java index fcddd16d..302b78e5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java @@ -79,4 +79,10 @@ public interface DfCheckingRecordV2Mapper extends BaseMapper { ) int countXm(@Param("data") ObjectStatisticQueDto sp); + + + + + + }