From 27e5783de3d2948aeb9fd1aa4160eed91b275e56 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 6 Mar 2024 09:45:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E4=BD=BF=E7=94=A8string?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/df/dto/DfPlanDetailDto.java | 5 ++ .../java/com/kms/yxgh/sz/dto/StartPlan.java | 2 +- .../kms/yxgh/sz/dto/SzCheckingDetailDto.java | 2 +- .../com/kms/yxgh/sz/dto/SzPlanDetailDto.java | 72 ++++++++++--------- .../com/kms/yxgh/sz/dto/SzPlanSimpleDto.java | 2 +- .../kms/yxgh/sz/dto/SzRecordDetailDto.java | 2 +- .../kms/yxgh/sz/dto/SzRecordSearchDto.java | 2 +- .../yxgh/sz/dto/SzWaterRegimeDetailDto.java | 4 +- .../kms/yxgh/sz/dto/SzYhRecordDetailDto.java | 2 +- .../yxgh/sz/mapper/SzWaterRegimeMapper.java | 35 +++++++++ 10 files changed, 87 insertions(+), 41 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java index b13666e7..d29e7a63 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java @@ -57,6 +57,11 @@ public class DfPlanDetailDto { @ApiModelProperty("检查依据文档") private List files; + public String getCycleType() { + if (cycleType == null || cycleType.isEmpty()) + return "0"; + return cycleType; + } @Data public static class OperatorDto { diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/StartPlan.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/StartPlan.java index 9104649e..9bb389cf 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/StartPlan.java +++ b/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; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java index ae14daa3..a20e7a47 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java +++ b/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 items; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPlanDetailDto.java index d927a88d..687398a5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPlanDetailDto.java +++ b/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 operators; + @ApiModelProperty("执行人") + private List 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; - } + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPlanSimpleDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPlanSimpleDto.java index 8eb907b0..8d9bfd3d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPlanSimpleDto.java +++ b/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; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordDetailDto.java index ba3318dc..120afb04 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordDetailDto.java +++ b/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 items; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordSearchDto.java index 689590f1..d9c58358 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordSearchDto.java +++ b/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 parts; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzWaterRegimeDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzWaterRegimeDetailDto.java index 64583c03..62a9a3ed 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzWaterRegimeDetailDto.java +++ b/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; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java index 1dd079c8..9e056862 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java +++ b/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; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzWaterRegimeMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzWaterRegimeMapper.java index 4bb6d568..4e30f8e6 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzWaterRegimeMapper.java +++ b/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 { @@ -32,4 +37,34 @@ public interface SzWaterRegimeMapper extends BaseMapper { "ORDER BY wr.create_time DESC" + "") IPage searchPage(Page 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 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 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 getTenDaysTotalSluiceFlow(@Param(value = "dto") SzYqExceedIndexQueDto dto, @Param(value = "tenDaysAgo") Date tenDaysAgo); + } \ No newline at end of file