From 17965dd5227a25b66e5fc69a4701fb7609f92299 Mon Sep 17 00:00:00 2001
From: hxh <762326930@qq.com>
Date: Thu, 14 Mar 2024 11:32:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=B0=B4=E9=97=B8?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kms/yg/df/mapper/BsSgcDfJbxxMapper.java   |  2 +-
 .../kms/yg/sz/mapper/BsSgcSzGcdaMapper.java   | 25 +++++++++--
 .../sz/controller/SzProjectController.java    |  6 +++
 .../sz/dto/SzYqStatisticsProjectListDto.java  | 41 +++++++++++++++++++
 .../sz/dto/SzYqStatisticsProjectQueDto.java   | 26 ++++++++++++
 .../kms/yxgh/sz/service/SzProjectService.java |  6 +++
 6 files changed, 101 insertions(+), 5 deletions(-)
 create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqStatisticsProjectListDto.java
 create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqStatisticsProjectQueDto.java

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 84586207..94989995 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
@@ -143,7 +143,7 @@ public interface BsSgcDfJbxxMapper extends BaseMapper<BsSgcDfJbxx> {
             "<script>",
             "SELECT df.dike_code AS dikeCode, df.dike_name AS dikeName, wr.water_level AS waterLevel, wr.rain_fall AS rainfall ",
             "FROM bs_sgc_df_gcda df ",
-            "LEFT JOIN bs_sgc_df_syq wr ON wr.dike_code = df.dike_code and df.expr_date is null and wr.expr_date is null ",
+            "LEFT JOIN bs_sgc_df_syq wr ON wr.dike_code = df.dike_code and df.expr_date is null  ",
             "INNER JOIN (",
             "  SELECT dike_code, MAX(create_time) AS max_time ",
             "  FROM bs_sgc_df_syq ",
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 a667f6c1..216f4483 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
@@ -4,10 +4,7 @@ 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.yg.sz.domain.BsSgcSzGcda;
-import com.kms.yxgh.sz.dto.SzProjectListDto;
-import com.kms.yxgh.sz.dto.SzYhProjectQueDto;
-import com.kms.yxgh.sz.dto.SzYqProjectListDto;
-import com.kms.yxgh.sz.dto.SzYqProjectQueDto;
+import com.kms.yxgh.sz.dto.*;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
@@ -104,4 +101,24 @@ public interface BsSgcSzGcdaMapper extends BaseMapper<BsSgcSzGcda> {
             "</script>")
     IPage<SzYqProjectListDto> getSzYqProjectListWithPage(Page<SzYqProjectListDto> page, @Param("szProject") SzYqProjectQueDto szProject);
 
+    @Select("<script>" +
+            "SELECT df.waga_code as wagaCode, df.waga_name as wagaName, df.water_level AS waterLevel, df.rain_fall AS rainfall " +
+            "FROM bs_sgc_sz_jbxx df " +
+            "LEFT JOIN bs_sgc_df_syq pj ON pj.waga_code = df.waga_code and df.expr_date is null " +
+            "INNER JOIN (" +
+            "  SELECT waga_code, MAX(create_time) AS max_time " +
+            "  FROM bs_sgc_df_syq " +
+            "  WHERE DATE(create_time) = CURDATE() " +
+            "  GROUP BY waga_code" +
+            ") wr_max ON wr.waga_code = wr_max.waga_code AND wr.create_time = wr_max.max_time " +
+            "WHERE 1=1 " +
+            "and df.expr_date is null  " +
+            "<if test='szProject.riverLocation != null and szProject.riverLocation != \"\"'>" +
+            "AND df.river_location = #{szProject.riverLocation} " +
+            "</if>" +
+            "<if test='szProject.adcd != null and szProject.adcd != \"\"'>" +
+            "AND df.adcd = #{szProject.adcd} " +
+            "</if>" +
+            "</script>")
+    IPage<SzYqStatisticsProjectListDto> getSzYqProjectStatisticsWithPage(Page<SzYqStatisticsProjectListDto> page, @Param("szProject") SzYqStatisticsProjectQueDto szProject);
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzProjectController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzProjectController.java
index 6722b81c..9b32e7ce 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzProjectController.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzProjectController.java
@@ -46,6 +46,12 @@ public class SzProjectController {
         return szProjectService.getYqProjectList(sp);
     }
 
+    //水雨情工程统计列表
+    @PostMapping("/yq/statistics")
+    @ApiOperation("水闸水雨情工程统计列表")
+    public IPage<SzYqStatisticsProjectListDto> yqStatistics(@RequestBody SearchParam<SzYqStatisticsProjectQueDto> sp) {
+        return szProjectService.getYqProjectStatistics(sp);
+    }
 
     @PostMapping("/rel-checking")
     @ApiOperation("关联检查项")
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
new file mode 100644
index 00000000..fedf9b80
--- /dev/null
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqStatisticsProjectListDto.java
@@ -0,0 +1,41 @@
+package com.kms.yxgh.sz.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName: SzYqStatisticsProjectListDto
+ * @Description: TODO
+ * @Date: 2024/3/1 下午3:14
+ * *
+ * @author: hxh
+ * @version: 1.0
+ */
+
+@ApiModel("水闸水雨情统计工程列表")
+@Data
+public class SzYqStatisticsProjectListDto {
+
+    @ApiModelProperty(value = "水闸编号")
+    private String dikeCode;
+    @ApiModelProperty(value = "水闸名称")
+    private String dikeName;
+    //水位
+    @ApiModelProperty(value = "水位")
+    private Double waterLevel;
+    //雨量
+    @ApiModelProperty(value = "雨量")
+    private Double rainfall;
+
+    //距离警戒水位
+    @ApiModelProperty(value = "距离警戒水位")
+    public Double getDistance() {
+        if (waterLevel == null) {
+            return null;
+        } else {
+            return waterLevel - 10.0;
+        }
+    }
+
+}
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqStatisticsProjectQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqStatisticsProjectQueDto.java
new file mode 100644
index 00000000..19f9d188
--- /dev/null
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqStatisticsProjectQueDto.java
@@ -0,0 +1,26 @@
+package com.kms.yxgh.sz.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName: SzYqStatisticsProjectQueDto
+ * @Description: TODO
+ * @Date: 2024/3/1 下午3:13
+ * *
+ * @author: hxh
+ * @version: 1.0
+ */
+
+@ApiModel("水闸水雨情统计工程查询参数")
+@Data
+public class SzYqStatisticsProjectQueDto {
+    //所属流域
+    @ApiModelProperty(value = "所属流域")
+    private String riverLocation;
+
+    @ApiModelProperty(value = "行政区划")
+    private String adcd;
+
+}
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzProjectService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzProjectService.java
index 3e7699c9..c43c9fe1 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzProjectService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzProjectService.java
@@ -97,4 +97,10 @@ public class SzProjectService {
         }).collect(Collectors.toList()));
         return relDto;
     }
+
+    public IPage<SzYqStatisticsProjectListDto> getYqProjectStatistics(SearchParam<SzYqStatisticsProjectQueDto> sp) {
+        Page<SzYqStatisticsProjectListDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
+        SzYqStatisticsProjectQueDto szProject = Optional.ofNullable(sp.getData()).orElseGet(SzYqStatisticsProjectQueDto::new);
+        return bsSgcSzGcdaMapper.getSzYqProjectStatisticsWithPage(page, szProject);
+    }
 }
\ No newline at end of file