From 7c29af2398d7b829adc2e1933099f7ba61499c61 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Thu, 14 Mar 2024 18:30:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B0=B4=E9=97=B8?= =?UTF-8?q?=E6=B0=B4=E9=9B=A8=E6=83=85=E5=B7=A5=E7=A8=8B=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yg/df/mapper/BsSgcDfJbxxMapper.java | 21 ++++++++----------- .../kms/yg/sz/mapper/BsSgcSzGcdaMapper.java | 19 +++++++---------- .../yxgh/df/mapper/DfWaterRegimeMapper.java | 9 ++++++++ .../sz/dto/SzYqStatisticsProjectListDto.java | 4 ++-- .../yxgh/sz/mapper/SzWaterRegimeMapper.java | 7 +++++++ 5 files changed, 35 insertions(+), 25 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java index 94989995..03410aca 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java @@ -141,25 +141,22 @@ public interface BsSgcDfJbxxMapper extends BaseMapper { @Select({ "" }) + @Results({ + @Result(property = "dikeCode", column = "dike_code"), + @Result(property = "dikeName", column = "dike_name"), + @Result(property = "waterLevel", column = "dike_code", javaType = Integer.class, one = @One(select = "com.kms.yxgh.df.mapper.DfWaterRegimeMapper.getTodayWaterLevel")), + @Result(property = "rainfall", column = "dike_code", javaType = Integer.class, one = @One(select = "com.kms.yxgh.df.mapper.DfWaterRegimeMapper.getTodayRainfall")) + }) IPage getDfYqStatisticsProjectListWithPage(Page page, @Param("dfProject") DfYqStatisticsProjectQueDto dfProject); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java index c4977566..d8007c5a 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java @@ -105,17 +105,8 @@ public interface BsSgcSzGcdaMapper extends BaseMapper { IPage getSzYqProjectListWithPage(Page page, @Param("szProject") SzYqProjectQueDto szProject); @Select("") + @Results({ + @Result(property = "wagaCode", column = "waga_code"), + @Result(property = "wagaName", column = "waga_name"), + @Result(property = "rainfall", column = "waga_code", javaType = Date.class, one = @One(select = "com.kms.yxgh.sz.mapper.SzWaterRegimeMapper.getTodayRainfall")), + @Result(property = "waterLevel", column = "waga_code", javaType = Date.class, one = @One(select = "com.kms.yxgh.sz.mapper.SzWaterRegimeMapper.getTodayWaterLevel")), + }) IPage getSzYqProjectStatisticsWithPage(Page page, @Param("szProject") SzYqStatisticsProjectQueDto szProject); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfWaterRegimeMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfWaterRegimeMapper.java index 5ebcdf89..bf904d71 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfWaterRegimeMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfWaterRegimeMapper.java @@ -67,4 +67,13 @@ public interface DfWaterRegimeMapper extends BaseMapper { //获取指定日期内某堤防过闸流量，数据按天分组，数据获取当天过闸流量的总和 @Select("SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS date, SUM(GATE_FLOW) AS sum FROM bs_sgc_df_syq WHERE create_time >= #{date} AND dike_code = #{dto.dikeCode} GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')") List getTenDaysTotalGateFlow(@Param("dto") DfYqExceedIndexQueDto dto, @Param("date") Date date); + + //获取当天最新的水位数据 + @Select("SELECT water_level FROM bs_sgc_df_syq WHERE dike_code = #{dikeCode} AND DATE(create_time) = CURDATE() ORDER BY create_time DESC LIMIT 1") + int getTodayWaterLevel(@Param("dikeCode") String dikeCode); + + //获取当天最新的降雨量数据 + @Select("SELECT rain_fall FROM bs_sgc_df_syq WHERE dike_code = #{dikeCode} AND DATE(create_time) = CURDATE() ORDER BY create_time DESC LIMIT 1") + int getTodayRainfall(@Param("dikeCode") String dikeCode); + } \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqStatisticsProjectListDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqStatisticsProjectListDto.java index fedf9b80..5f01d580 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqStatisticsProjectListDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqStatisticsProjectListDto.java @@ -18,9 +18,9 @@ import lombok.Data; public class SzYqStatisticsProjectListDto { @ApiModelProperty(value = "水闸编号") - private String dikeCode; + private String wagaCode; @ApiModelProperty(value = "水闸名称") - private String dikeName; + private String wagaName; //水位 @ApiModelProperty(value = "水位") private Double waterLevel; 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 08101ebc..044fb78c 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 @@ -68,4 +68,11 @@ public interface SzWaterRegimeMapper extends BaseMapper { @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 getTenDaysTotalGateFlow(@Param(value = "dto") SzYqExceedIndexQueDto dto, @Param(value = "tenDaysAgo") Date tenDaysAgo); + //获取当天最新的水位数据 + @Select("SELECT water_level FROM bs_sgc_sz_syq WHERE waga_code = #{wagaCode} AND DATE(create_time) = CURDATE() ORDER BY create_time DESC LIMIT 1") + Double getTodayWaterLevel(@Param(value = "wagaCode") String wagaCode); + + //获取当天最新的降雨量数据 + @Select("SELECT rain_fall FROM bs_sgc_sz_syq WHERE waga_code = #{wagaCode} AND DATE(create_time) = CURDATE() ORDER BY create_time DESC LIMIT 1") + Double getTodayRainfall(@Param(value = "wagaCode") String wagaCode); } \ No newline at end of file