add:一张图

shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java

@@ -10,7 +10,7 @@ public enum DfYhV2StatusEnum {
     NO_DEFECTS("无隐患", "3"),
     UNDER_MAINTENANCE("养护中", "4"),
     ACCEPTED("已验收", "5"),
-    YES_UNDER("已养护", "6")
+    YES_UNDER("已养护", "6"),
     ;
 
 

shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java

@@ -1,28 +1,38 @@
 package com.kms.yxgh.common.enums;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.df.service.BsSgcDfSafeJbxxService;
+import com.kms.yg.res.service.AttResBaseService;
+import com.kms.yg.sz.domain.BsSgcSzSzrw;
+import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
 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.domain.DfCheckingProblemV2;
 import com.kms.yxgh.df.mapper.DfCheckingProblemV2Mapper;
 import com.kms.yxgh.df.mapper.DfCheckingRecordV2Mapper;
 import com.kms.yxgh.df.mapper.DfCheckingV2Mapper;
 import com.kms.yxgh.df.mapper.DfYhV2Mapper;
+import com.kms.yxgh.df.service.DfCheckingProblemV2Service;
+import com.kms.yxgh.df.service.DfYhV2Service;
 import com.kms.yxgh.dw.mapper.DwCheckingProblemV2Mapper;
 import com.kms.yxgh.dw.mapper.DwCheckingRecordV2Mapper;
 import com.kms.yxgh.dw.mapper.DwCheckingV2Mapper;
 import com.kms.yxgh.dw.mapper.DwYhV2Mapper;
+import com.kms.yxgh.sz.domain.SzCheckingProblemV2;
 import com.kms.yxgh.sz.mapper.SzCheckingProblemV2Mapper;
 import com.kms.yxgh.sz.mapper.SzCheckingRecordV2Mapper;
 import com.kms.yxgh.sz.mapper.SzCheckingV2Mapper;
 import com.kms.yxgh.sz.mapper.SzYhV2Mapper;
+import com.kms.yxgh.sz.service.SzCheckingProblemV2Service;
+import com.kms.yxgh.sz.service.SzYhV2Service;
 import com.shuili.common.utils.SpringUtils;
 import lombok.Getter;
-import org.springframework.util.StringUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -314,31 +324,30 @@ public enum StaticIndexEnum {
 
     YZT_SK_SUM("水库", sp -> {
         Map<String,String> map =new HashMap<>();
-        map.put("sum","7596");
+        AttResBaseService service = SpringUtils.getBean(AttResBaseService.class);
+        map.put("sum",String.valueOf(service));
         return map;
     }, "座", "0"),
     YZT_SZ_SUM("水闸", sp -> {
         Map<String,String> map =new HashMap<>();
-        map.put("sum","5456");
+        BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class);
+        map.put("sum",String.valueOf(service.count()));
         return map;
     }, "座", "0"),
     YZT_DF_SUM("堤防", sp -> {
         Map<String,String> map =new HashMap<>();
-        DfCheckingRecordV2Mapper mapper = SpringUtils.getBean(DfCheckingRecordV2Mapper.class);
-        int count = mapper.paragraphCountNumber(sp);
-        map.put("sum",String.valueOf(count));
+        BsSgcDfSafeJbxxService service = SpringUtils.getBean(BsSgcDfSafeJbxxService.class);
+        map.put("sum",String.valueOf(service.count()));
         return map;
     }, "段", "0"),
 
     YZT_SSYX_SUM("水事影像监测监视点", sp -> {
         Map<String,String> map =new HashMap<>();
-//        ATT_WMST_BASE
         return map;
-    }, "个", "0"),
+    }, "个", "125"),
     YZT_SWGCJCCZ_SUM("水文工程检测测站数量", sp -> {
         Map<String,String> map =new HashMap<>();
         AttStBaseService service = SpringUtils.getBean(AttStBaseService.class);
-        service.count();
         map.put("sum",String.valueOf(service.count()));
         return map;
     }, "个", "0"),
@@ -350,7 +359,6 @@ public enum StaticIndexEnum {
     }, "个", "0"),
 
 
-
     YZT_SUPERVISE_JRGJ_YCL_SUM("已处理", sp -> {
         Map<String,String> map =new HashMap<>();
         map.put("sum","15");
@@ -384,13 +392,18 @@ public enum StaticIndexEnum {
 
     YZT_TOUR_CHECK_DJD_SUM("待鉴定", sp -> {
         Map<String,String> map =new HashMap<>();
-        map.put("sum","400");
+        BsSgcSzSzrwService service = SpringUtils.getBean(BsSgcSzSzrwService.class);
+        int countDtb = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>().eq(BsSgcSzSzrw::getStatus, 1));
+        int countDsh = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>().eq(BsSgcSzSzrw::getStatus, 0));
+        map.put("sum",String.valueOf(countDtb+countDsh));
         return map;
     }, "个", "0"),
 
     YZT_TOUR_CHECK_YJD_SUM("已鉴定", sp -> {
         Map<String,String> map =new HashMap<>();
-        map.put("sum","56");
+        BsSgcSzSzrwService service = SpringUtils.getBean(BsSgcSzSzrwService.class);
+        int count = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>().eq(BsSgcSzSzrw::getStatus, 2));
+        map.put("sum",String.valueOf(count));
         return map;
     }, "个", "0"),
 
@@ -422,31 +435,31 @@ public enum StaticIndexEnum {
 
     YZT_DAILY_YB_NUMBER_SUM("一般", sp -> {
         Map<String,String> map =new HashMap<>();
-        map.put("sum","56");
+        map.put("sum",String.valueOf(getProblemGrade(PatrolMaintenanceCategory.DJ_YB.getValue())));
         return map;
     }, "个", "0"),
 
     YZT_DAILY_JD_NUMBER_SUM("较大", sp -> {
         Map<String,String> map =new HashMap<>();
-        map.put("sum","56");
+        map.put("sum",String.valueOf(getProblemGrade(PatrolMaintenanceCategory.DJ_JD.getValue())));
         return map;
     }, "个", "0"),
 
     YZT_DAILY_ZD_NUMBER_SUM("重大", sp -> {
         Map<String,String> map =new HashMap<>();
-        map.put("sum","56");
+        map.put("sum",String.valueOf(getProblemGrade(PatrolMaintenanceCategory.DJ_ZD.getValue())));
         return map;
     }, "个", "0"),
 
-    YZT_DAILY_JJ_NUMBER_SUM("紧急", sp -> {
+    YZT_DAILY_JJ_NUMBER_SUM("零星", sp -> {
         Map<String,String> map =new HashMap<>();
-        map.put("sum","56");
+        map.put("sum",String.valueOf(getProblemGrade(PatrolMaintenanceCategory.DJ_LX.getValue())));
         return map;
     }, "个", "0"),
 
     YZT_DAILY_BL_NUMBER_SUM("比例", sp -> {
         Map<String,String> map =new HashMap<>();
-        map.put("bl","70");
+        map.put("bl",getYhSum());
         return map;
     }, "个", "0"),
 
@@ -466,6 +479,35 @@ public enum StaticIndexEnum {
         this.defaultValue = defaultValue;
     }
 
+    public static int getProblemGrade(String dj) {
+        DfCheckingProblemV2Service dfQxService = SpringUtils.getBean(DfCheckingProblemV2Service.class);
+        SzCheckingProblemV2Service szQxService = SpringUtils.getBean(SzCheckingProblemV2Service.class);
+        int dfCount = dfQxService.count(new LambdaQueryWrapper<DfCheckingProblemV2>().eq(DfCheckingProblemV2::getProblemLevel, dj));
+        int szCount = szQxService.count(new LambdaQueryWrapper<SzCheckingProblemV2>().eq(SzCheckingProblemV2::getProblemLevel, dj));
+        return dfCount+szCount;
+    }
+
+    public static String getYhSum() {
+        DfYhV2Service dfYhV2Service = SpringUtils.getBean(DfYhV2Service.class);
+        SzYhV2Service szYhV2Service = SpringUtils.getBean(SzYhV2Service.class);
+        int dfCount = dfYhV2Service.count();
+        int szCount = szYhV2Service.count();
+
+        int yb = getProblemGrade(PatrolMaintenanceCategory.DJ_YB.getValue());
+        int jd = getProblemGrade(PatrolMaintenanceCategory.DJ_JD.getValue());
+        int zd = getProblemGrade(PatrolMaintenanceCategory.DJ_ZD.getValue());
+        int lx = getProblemGrade(PatrolMaintenanceCategory.DJ_LX.getValue());
+
+        int qxCount = dfCount + szCount;
+        int yhCount = yb+jd+zd+lx;
+
+        int bl=0;
+        if (qxCount!=0 && yhCount!=0) {
+            bl=qxCount/yhCount;
+        }
+        return String.valueOf(bl);
+    }
+
 
 
     public static Map<String, String> dataGroup(List<CountDateDto> list) {

shuili-system/src/main/java/com/kms/yxgh/dw/domain/DwCheckingProblemV2.java

@@ -90,14 +90,14 @@ public class DwCheckingProblemV2 extends SyBaseEntity {
      * 工程代码
      */
     @ApiModelProperty("工程代码")
-    private String projectCode;
+    private String dikeCode;
 
 
     /**
      * 工程代码名称
      */
     @ApiModelProperty("工程代码名称")
-    private String projectName;
+    private String dikeName;
 
     /**
      * 巡查开始时间

shuili-system/src/main/java/com/kms/yxgh/dw/domain/DwCheckingRecord.java

@@ -88,14 +88,14 @@ public class DwCheckingRecord extends SyBaseEntity {
      * 工程代码
      */
     @ApiModelProperty("工程代码")
-    private String projectCode;
+    private String dikeCode;
 
 
     /**
      * 工程代码名称
      */
     @ApiModelProperty("工程代码名称")
-    private String projectName;
+    private String dikeName;
 
 
     /**

shuili-system/src/main/java/com/kms/yxgh/dw/domain/DwCheckingV2ProjectManage.java

@@ -23,14 +23,14 @@ public class DwCheckingV2ProjectManage extends SyBaseEntity {
      * 工程代码
      */
     @ApiModelProperty("工程代码")
-    private String projectCode;
+    private String dikeCode;
 
 
     /**
      * 工程代码名称
      */
     @ApiModelProperty("工程代码名称")
-    private String projectName;
+    private String dikeName;
 
     /**
      * 项目名称

shuili-system/src/main/java/com/kms/yxgh/dw/domain/DwYhV2.java

@@ -92,14 +92,14 @@ public class DwYhV2 extends SyBaseEntity {
      * 工程代码
      */
     @ApiModelProperty("工程代码")
-    private String projectCode;
+    private String dikeCode;
 
 
     /**
      * 工程代码名称
      */
     @ApiModelProperty("工程代码名称")
-    private String projectName;
+    private String dikeName;
 
     /**
      * 维养开始时间

shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordDetailV2Dto.java

@@ -36,14 +36,14 @@ public class DwRecordDetailV2Dto {
 
     @NotBlank(message = "堤防编码不能为空", groups = {UpdateGroup.class})
     @ApiModelProperty("堤防编码")
-    private String projectCode;
+    private String dikeCode;
 
     @NotBlank(message = "堤防名称不能为空", groups = {UpdateGroup.class})
     @ApiModelProperty("堤防名称")
-    private String projectName;
+    private String dikeName;
 
     @ApiModelProperty("堤防类型")
-    private String projectType;
+    private String dikeType;
 
     @ApiModelProperty("状态")
     private String status;

shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java

@@ -12,9 +12,9 @@ import java.util.Date;
 public class DwRecordSearchV2Dto {
 
     @ApiModelProperty("工程名称")
-    private String projectName;
+    private String dikeName;
     @ApiModelProperty("工程类型")
-    private String projectType;
+    private String dikeType;
     @ApiModelProperty("巡查责任人")
     private String dutyHolder;
     @ApiModelProperty(value = "名称")

shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwV2CheckingDto.java

@@ -15,11 +15,11 @@ import java.util.List;
 public class DwV2CheckingDto {
 
     @ApiModelProperty("工程编码")
-    private String projectCode;
+    private String dikeCode;
     @ApiModelProperty("工程名称")
-    private String projectName;
+    private String dikeName;
     @ApiModelProperty("工程类型")
-    private String projectType;
+    private String dikeType;
 
     @NotNull
     @ApiModelProperty("主键")

shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwV2CheckingSearchDto.java

@@ -9,7 +9,7 @@ import lombok.Data;
 public class DwV2CheckingSearchDto {
 
     @ApiModelProperty(value = "工程编号")
-    private String projectCode;
+    private String dikeCode;
     @ApiModelProperty(value = "名称")
     private String name;
     @ApiModelProperty("巡查类型")

shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingProblemV2Mapper.java

@@ -24,7 +24,7 @@ public interface DwCheckingProblemV2Mapper extends BaseMapper<DwCheckingProblemV
     @Select("<script> " +
             "select base.adcd code ,count(1) sum  " +
             "from bs_sgc_dw_xcqx xm " +
-            "left join att_dike_base base on base.dike_code=xm.project_code " +
+            "left join att_dike_base base on base.dike_code=xm.dike_code " +
             "where 1=1 " +
             "<if test='data.startTime != null'> and xm.create_time &gt;= #{data.startTime} </if> " +
             "<if test='data.endTime != null'> and xm.create_time &lt;= #{data.endTime} </if> " +

shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingRecordV2Mapper.java

@@ -24,7 +24,7 @@ public interface DwCheckingRecordV2Mapper extends BaseMapper<DwCheckingRecord> {
     @Select("<script> " +
             "select base.adcd code ,count(1) sum  " +
             "from bs_sgc_dw_xsxcjl xm " +
-            "left join att_project_base base on base.dike_code=xm.project_code " +
+            "left join att_project_base base on base.dike_code=xm.dike_code " +
             "where 1=1 " +
             "<if test='data.startTime != null'> and xm.create_time &gt;= #{data.startTime} </if> " +
             "<if test='data.endTime != null'> and xm.create_time &lt;= #{data.endTime} </if> " +
@@ -44,7 +44,7 @@ public interface DwCheckingRecordV2Mapper extends BaseMapper<DwCheckingRecord> {
             "<if test='data.startTime != null' > and create_time &gt;= #{data.startTime} </if> " +
             "<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " +
             "<if test='data.code != null and data.code != \"\"'>" +
-            "and project_code = #{data.code} " +
+            "and dike_code = #{data.code} " +
             "</if>" +
             "<if test='category != null'>" +
             "and category = #{category.value} " +
@@ -58,7 +58,7 @@ public interface DwCheckingRecordV2Mapper extends BaseMapper<DwCheckingRecord> {
             "<if test='data.startTime != null' > and create_time &gt;= #{data.startTime} </if> " +
             "<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " +
             "<if test='data.code != null and data.code != \"\"'>" +
-            "and project_code = #{data.code} " +
+            "and dike_code = #{data.code} " +
             "</if>" +
             "</script>"
     )

shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingV2Mapper.java

@@ -23,7 +23,7 @@ public interface DwCheckingV2Mapper extends BaseMapper<DwCheckingV2ProjectManage
     @Select("<script> " +
             "select base.adcd code ,count(1) sum  " +
             "from bs_sgc_dw_xmgl xm " +
-            "left join att_dike_base base on base.dike_code=xm.project_code " +
+            "left join att_dike_base base on base.dike_code=xm.dike_code " +
             "where 1=1 " +
             "<if test='data.adcdQx != null and data.adcdQx != \"\"'>" +
             "and base.adcd like concat(#{data.adcdQx}, '%') " +

shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwYhV2Mapper.java

@@ -28,7 +28,7 @@ public interface DwYhV2Mapper extends BaseMapper<DwYhV2> {
     @Select("<script> " +
             "select base.adcd code ,count(1) sum  " +
             "from bs_sgc_dw_xcyj xm " +
-            "left join att_dike_base base on base.dike_code=xm.project_code " +
+            "left join att_dike_base base on base.dike_code=xm.dike_code " +
             "where 1=1 " +
             "<if test='data.startTime != null'> and xm.create_time &gt;= #{data.startTime} </if> " +
             "<if test='data.endTime != null'> and xm.create_time &lt;= #{data.endTime} </if> " +
@@ -45,7 +45,7 @@ public interface DwYhV2Mapper extends BaseMapper<DwYhV2> {
             "<if test='data.startTime != null'> and create_time &gt;= #{data.startTime} </if> " +
             "<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " +
             "<if test='data.code != null and data.code != \"\"'>" +
-            "and project_code = #{data.code} " +
+            "and dike_code = #{data.code} " +
             "</if>" +
             "group by DATE_FORMAT(create_time, '%Y-%m-%d') " +
             "</script>")

shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java

@@ -204,8 +204,8 @@ public class DwCheckingRecordV2Service extends BaseService<DwCheckingRecordV2Map
             dfCheckingProblemV2.setCheckingId(dwRecord.getCheckingId());
             dfCheckingProblemV2.setRecordId(dwRecord.getRecordId());
             dfCheckingProblemV2.setCheckingName(dwRecord.getCheckingName());
-            dfCheckingProblemV2.setProjectCode(dwRecord.getProjectCode());
-            dfCheckingProblemV2.setProjectName(dwRecord.getProjectName());
+            dfCheckingProblemV2.setDikeCode(dwRecord.getDikeCode());
+            dfCheckingProblemV2.setDikeName(dwRecord.getDikeName());
             dfCheckingProblemV2.setDutyHolderName(dwRecord.getCreateName());
             dfCheckingProblemV2.setDutyHolderId(dwRecord.getCreateUid());
             dfCheckingProblemV2.setStartDate(dwRecord.getStartDate());

sql/sy/v1.6.0/增量脚本/v1.6.1-update.sql

@@ -240,11 +240,12 @@ CREATE TABLE `bs_sgc_sz_xcyj` (
 
 
 
+
 CREATE TABLE `bs_sgc_dw_xmgl` (
                                   `id` int NOT NULL AUTO_INCREMENT COMMENT 'id',
                                   `name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查项名称',
-                                  `project_code` varchar(50) NOT NULL DEFAULT '' COMMENT '工程code',
-                                  `project_name` varchar(50) NOT NULL DEFAULT '' COMMENT '工程名称',
+                                  `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '工程code',
+                                  `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '工程名称',
                                   `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：animal_check_type',
                                   `category` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查类别字典：animal_prevention_category',
                                   `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人',
@@ -279,8 +280,8 @@ CREATE TABLE `bs_sgc_dw_xsxcjl` (
                                     `category` int NOT NULL DEFAULT '0' COMMENT '巡查类别字典：animal_prevention_category',
                                     `duty_holder_name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查责任人name',
                                     `duty_holder_id` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查责任人id',
-                                    `project_code` varchar(50) NOT NULL DEFAULT '' COMMENT '工程code',
-                                    `project_name` varchar(50) NOT NULL DEFAULT '' COMMENT '工程名称',
+                                    `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '工程code',
+                                    `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '工程名称',
                                     `start_date` datetime DEFAULT NULL COMMENT '巡查开始时间',
                                     `end_date` datetime DEFAULT NULL COMMENT '巡查结束时间',
                                     `scope` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查范围',
@@ -305,8 +306,8 @@ CREATE TABLE `bs_sgc_dw_xcqx` (
                                   `category` int NOT NULL DEFAULT '0' COMMENT '巡查类别 字典：animal_prevention_category',
                                   `duty_holder_name` varchar(50) NOT NULL DEFAULT '' COMMENT '缺陷人name',
                                   `duty_holder_id` varchar(50) NOT NULL DEFAULT '' COMMENT '缺陷人name',
-                                  `project_code` varchar(50) NOT NULL DEFAULT '' COMMENT '工程code',
-                                  `project_name` varchar(50) NOT NULL DEFAULT '' COMMENT '工程名称',
+                                  `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '工程code',
+                                  `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '工程名称',
                                   `start_date` datetime DEFAULT NULL COMMENT '缺陷开始时间',
                                   `end_date` datetime DEFAULT NULL COMMENT '缺陷结束时间',
                                   `content` varchar(200) NOT NULL DEFAULT '' COMMENT '描述',
@@ -331,8 +332,8 @@ CREATE TABLE `bs_sgc_dw_xcyj` (
                                   `name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查名称',
                                   `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：animal_check_type',
                                   `category` int NOT NULL DEFAULT '0' COMMENT '巡查类别 字典：animal_prevention_category',
-                                  `project_code` varchar(50) NOT NULL DEFAULT '' COMMENT '工程code',
-                                  `project_name` varchar(50) NOT NULL DEFAULT '' COMMENT '工程名称',
+                                  `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '工程code',
+                                  `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '工程名称',
                                   `start_date` datetime DEFAULT NULL COMMENT '维养开始时间',
                                   `end_date` datetime DEFAULT NULL COMMENT '维养结束时间',
                                   `position` varchar(200) NOT NULL DEFAULT '' COMMENT '问题位置',
@@ -351,6 +352,7 @@ CREATE TABLE `bs_sgc_dw_xcyj` (
 ) ENGINE=InnoDB AUTO_INCREMENT=58 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视养护管理表';
 
 
+
 alter table bs_sgc_qqjd_layer add column is_need_cluster varchar(50) default null COMMENT '是否需要聚合';
 alter table bs_sgc_qqjd_layer add column is_support_fast_query varchar(50) default null COMMENT '是否支持一键搜索';