fix: 修复字典类型字段使用string

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java

@@ -57,6 +57,11 @@ public class DfPlanDetailDto {
     @ApiModelProperty("检查依据文档")
     private List<String> files;
 
+    public String getCycleType() {
+        if (cycleType == null || cycleType.isEmpty())
+            return "0";
+        return cycleType;
+    }
 
     @Data
     public static class OperatorDto {

shuili-system/src/main/java/com/kms/yxgh/sz/dto/StartPlan.java

@@ -21,6 +21,6 @@ public class StartPlan {
   @ApiModelProperty("水闸编号")
   private String wagaCode;
   @ApiModelProperty("巡查类型")
-  private Long type;
+  private String type;
 
 }

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java

@@ -23,7 +23,7 @@ public class SzCheckingDetailDto {
   private String name;
 
   @ApiModelProperty("巡查类型")
-  private Long type;
+  private String type;
 
   @ApiModelProperty("检查项")
   private List<SzCheckingItemDto> items;

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPlanDetailDto.java

@@ -4,9 +4,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import java.util.Date;
 import java.util.List;
-import lombok.Data;
 
 
 /**
@@ -19,52 +20,57 @@ import lombok.Data;
 @ApiModel("水闸巡视检查计划详情")
 public class SzPlanDetailDto {
 
-  @ApiModelProperty("主键")
-  private String id;
+    @ApiModelProperty("主键")
+    private String id;
 
-  @ApiModelProperty("水闸编码")
-  private String wagaCode;
+    @ApiModelProperty("水闸编码")
+    private String wagaCode;
 
-  @ApiModelProperty("名称")
-  private String name;
+    @ApiModelProperty("名称")
+    private String name;
 
-  @ApiModelProperty("巡查ID")
-  private String xcId;
+    @ApiModelProperty("巡查ID")
+    private String xcId;
 
-  @ApiModelProperty("巡查类型")
-  private Long type;
+    @ApiModelProperty("巡查类型")
+    private Long type;
 
-  @ApiModelProperty("检查次数")
-  private Long frequency;
+    @ApiModelProperty("检查次数")
+    private String frequency;
 
-  @ApiModelProperty("周期")
-  private Long cycleType;
+    @ApiModelProperty("周期")
+    private String cycleType;
 
-  @ApiModelProperty("是否提醒")
-  private Boolean isReminder;
+    @ApiModelProperty("是否提醒")
+    private Boolean isReminder;
 
-  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-  @ApiModelProperty("提醒时间")
-  private Date reminderTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("提醒时间")
+    private Date reminderTime;
 
-  @ApiModelProperty("附加配置")
-  private JSONObject otherConfig;
+    @ApiModelProperty("附加配置")
+    private JSONObject otherConfig;
 
-  @ApiModelProperty("执行人")
-  private List<OperatorDto> operators;
+    @ApiModelProperty("执行人")
+    private List<OperatorDto> operators;
 
+    public String getCycleType() {
+        if (cycleType == null || cycleType.isEmpty())
+            return "0";
+        return cycleType;
+    }
 
-  @Data
-  public static class OperatorDto {
+    @Data
+    public static class OperatorDto {
 
-    @ApiModelProperty("主键")
-    private String id;
+        @ApiModelProperty("主键")
+        private String id;
 
-    @ApiModelProperty("用户id")
-    private String uid;
-    @ApiModelProperty("用户名称")
-    private String name;
+        @ApiModelProperty("用户id")
+        private String uid;
+        @ApiModelProperty("用户名称")
+        private String name;
 
-  }
+    }
 
 }

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPlanSimpleDto.java

@@ -29,7 +29,7 @@ public class SzPlanSimpleDto {
     private String xcId;
 
     @ApiModelProperty("巡查类型")
-    private Long type;
+    private String type;
 
     @ApiModelProperty("最后巡检时间")
     private Date lastTime;

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordDetailDto.java

@@ -30,7 +30,7 @@ public class SzRecordDetailDto {
   private String name;
 
   @ApiModelProperty("状态")
-  private Long status;
+  private String status;
 
   @ApiModelProperty("巡查项")
   private List<SzRecordItemDto> items;

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordSearchDto.java

@@ -26,7 +26,7 @@ public class SzRecordSearchDto {
   private String name;
 
   @ApiModelProperty("状态")
-  private Long status;
+  private String status;
 
   @ApiModelProperty("异常部位")
   private List<String> parts;

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzWaterRegimeDetailDto.java

@@ -35,10 +35,10 @@ public class SzWaterRegimeDetailDto {
     private String remark;
 
     @ApiModelProperty("状态")
-    private Integer status;
+    private String status;
 
     @ApiModelProperty("闸门状态")
-    private Integer doorStatus;
+    private String doorStatus;
 
     @ApiModelProperty("天气情况")
     private String weatherCondition;

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java

@@ -49,7 +49,7 @@ public class SzYhRecordDetailDto {
     private String implement;
 
     @ApiModelProperty("状态")
-    private Long status;
+    private String status;
 
     @ApiModelProperty("创建时间")
     private Date createTime;

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzWaterRegimeMapper.java

@@ -3,13 +3,18 @@ package com.kms.yxgh.sz.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.yxgh.common.DailySumDto;
 import com.kms.yxgh.sz.domain.SzWaterRegime;
 import com.kms.yxgh.sz.dto.SzWaterRegimeDetailDto;
+import com.kms.yxgh.sz.dto.SzYqExceedIndexQueDto;
 import com.kms.yxgh.sz.dto.SzYqRecordSearchDto;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
+import java.util.List;
+
 @Repository
 public interface SzWaterRegimeMapper extends BaseMapper<SzWaterRegime> {
 
@@ -32,4 +37,34 @@ public interface SzWaterRegimeMapper extends BaseMapper<SzWaterRegime> {
             "ORDER BY wr.create_time DESC" +
             "</script>")
     IPage<SzWaterRegimeDetailDto> searchPage(Page<SzWaterRegimeDetailDto> page, @Param("searchDto") SzYqRecordSearchDto searchDto);
+
+    //指定时间内指定堤防低于分洪水位次数
+    @Select("SELECT COUNT(1) FROM bs_sgc_sz_syq WHERE waga_code = #{dto.wagaCode} AND create_time  >= #{tenDaysAgo} AND water_level <= #{peakLevel}")
+    int belowPeakCount(@Param(value = "dto") SzYqExceedIndexQueDto dto, @Param(value = "tenDaysAgo") Date tenDaysAgo, @Param(value = "peakLevel") int peakLevel);
+
+    ///指定时间内指定堤防超出警戒水位次数
+    @Select("SELECT COUNT(1) FROM bs_sgc_sz_syq WHERE waga_code = #{dto.wagaCode} AND create_time >= #{tenDaysAgo} AND water_level >= #{warningLevel}")
+    int exceedWarningCount(@Param(value = "dto") SzYqExceedIndexQueDto dto, @Param(value = "tenDaysAgo") Date tenDaysAgo, @Param(value = "warningLevel") int warningLevel);
+
+
+    //指定时间内指定堤防超出降雨量次数
+    @Select("SELECT COUNT(1) FROM bs_sgc_sz_syq WHERE waga_code = #{dto.wagaCode} AND create_time >= #{twentyFourHoursAgo} AND rain_fall >= #{rainfall}")
+    int exceedRainfallCount(@Param(value = "dto") SzYqExceedIndexQueDto dto, @Param(value = "twentyFourHoursAgo") Date twentyFourHoursAgo, @Param(value = "rainfall") int rainfall);
+
+    //指定时间内指定堤防超出过闸流量次数
+    @Select("SELECT COUNT(1) FROM bs_sgc_sz_syq WHERE waga_code = #{dto.wagaCode} AND create_time >= #{twentyFourHoursAgo} AND GATE_FLOW >= #{sluiceFlow}")
+    int exceedSluiceFlowCount(@Param(value = "dto") SzYqExceedIndexQueDto dto, @Param(value = "twentyFourHoursAgo") Date twentyFourHoursAgo, @Param(value = "sluiceFlow") int sluiceFlow);
+
+    //获取指定日期内某堤防水位数据，水位数据按天分组，数据取每天最新的水位值
+    @Select("SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS date, MAX(water_level) AS sum  FROM bs_sgc_sz_syq WHERE waga_code = #{dto.wagaCode} AND create_time >= #{tenDaysAgo} GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')")
+    List<DailySumDto> getTenDaysWaterRegime(@Param(value = "dto") SzYqExceedIndexQueDto dto, @Param(value = "tenDaysAgo") Date tenDaysAgo);
+
+    //获取指定日期内某堤防降雨量数据，降雨量数据按天分组，数据取每天最新的降雨量值
+    @Select("SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS date, MAX(rain_fall) AS sum  FROM bs_sgc_sz_syq WHERE waga_code = #{dto.wagaCode} AND create_time >= #{tenDaysAgo} GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')")
+    List<DailySumDto> getTenDaysTotalRainfall(@Param(value = "dto") SzYqExceedIndexQueDto dto, @Param(value = "tenDaysAgo") Date tenDaysAgo);
+
+    //获取指定日期内某堤防过闸流量数据，过闸流量数据按天分组，数据取每天最新的过闸流量值
+    @Select("SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS date, MAX(gate_flow) AS sum  FROM bs_sgc_sz_syq WHERE waga_code = #{dto.wagaCode} AND create_time >= #{tenDaysAgo} GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')")
+    List<DailySumDto> getTenDaysTotalSluiceFlow(@Param(value = "dto") SzYqExceedIndexQueDto dto, @Param(value = "tenDaysAgo") Date tenDaysAgo);
+
 }