fix: 统一过闸流量单词

shuili-system/src/main/java/com/kms/yxgh/df/domain/DfWaterRegime.java

@@ -49,7 +49,7 @@ public class DfWaterRegime extends SyBaseEntity {
     private Float rainFall;
 
     @ApiModelProperty("过闸流量")
-    private Float sluiceFlow;
+    private Float gateFlow;
 
     @ApiModelProperty("文件档案")
     private String doc;

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

@@ -52,6 +52,9 @@ public class DfWaterRegimeDetailDto {
     @ApiModelProperty("雨量监测")
     private Float rainFall;
 
+    @ApiModelProperty("过闸流量")
+    private Float gateFlow;
+
     @ApiModelProperty("文档")
     private Doc doc;
 

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

@@ -25,16 +25,16 @@ public class DfYqDailyWaterLevelDto {
     private Map<String, WaterLevel> waterLevelMap;
 
     @ApiModelProperty("降雨量和过闸流量")
-    private Map<String, RainfallAndSluiceFlow> rainfallAndSluiceFlowMap;
+    private Map<String, RainfallAndGateFlow> rainfallAndGateFlowMap;
 
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
-    public static class RainfallAndSluiceFlow {
+    public static class RainfallAndGateFlow {
         @ApiModelProperty("降雨量")
         private String rainfall;
         @ApiModelProperty("过闸流量")
-        private String sluiceFlow;
+        private String gateFlow;
     }
 
     @AllArgsConstructor

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

@@ -27,5 +27,5 @@ public class DfYqExceedIndexDto {
     private Integer exceedRainfallCount;
 
     @ApiModelProperty("超出过闸流量次数")
-    private Integer exceedSluiceFlowCount;
+    private Integer exceedGateFlowCount;
 }

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfWaterRegimeMapper.java

@@ -52,8 +52,8 @@ public interface DfWaterRegimeMapper extends BaseMapper<DfWaterRegime> {
     int exceedRainfallCount(@Param(value = "dto") DfYqExceedIndexQueDto dto, @Param(value = "twentyFourHoursAgo") Date twentyFourHoursAgo, @Param(value = "rainfall") int rainfall);
 
     //指定时间内指定堤防超出过闸流量次数
-    @Select("SELECT COUNT(1) FROM bs_sgc_df_syq WHERE dike_code = #{dto.dikeCode} AND create_time >= #{twentyFourHoursAgo} AND GATE_FLOW >= #{sluiceFlow}")
-    int exceedSluiceFlowCount(@Param(value = "dto") DfYqExceedIndexQueDto dto, @Param(value = "twentyFourHoursAgo") Date twentyFourHoursAgo, @Param(value = "sluiceFlow") int sluiceFlow);
+    @Select("SELECT COUNT(1) FROM bs_sgc_df_syq WHERE dike_code = #{dto.dikeCode} AND create_time >= #{twentyFourHoursAgo} AND GATE_FLOW >= #{gateFlow}")
+    int exceedGateFlowCount(@Param(value = "dto") DfYqExceedIndexQueDto dto, @Param(value = "twentyFourHoursAgo") Date twentyFourHoursAgo, @Param(value = "gateFlow") int gateFlow);
 
 
     //获取指定日期内某堤防水位数据，水位数据按天分组，数据取每天最新的水位值
@@ -65,5 +65,5 @@ public interface DfWaterRegimeMapper extends BaseMapper<DfWaterRegime> {
 
     //获取指定日期内某堤防过闸流量，数据按天分组，数据获取当天过闸流量的总和
     @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<DailySumDto> getTenDaysTotalSluiceFlow(@Param("dto") DfYqExceedIndexQueDto dto, @Param("date") Date date);
+    List<DailySumDto> getTenDaysTotalGateFlow(@Param("dto") DfYqExceedIndexQueDto dto, @Param("date") Date date);
 }

shuili-system/src/main/java/com/kms/yxgh/df/service/DfYqStatisticsService.java

@@ -37,14 +37,14 @@ public class DfYqStatisticsService {
         CompletableFuture<Integer> belowPeakCount = CompletableFuture.supplyAsync(() -> belowPeakCount(dto));
         CompletableFuture<Integer> exceedWarningCount = CompletableFuture.supplyAsync(() -> exceedWarningCount(dto));
         CompletableFuture<Integer> exceedRainfallCount = CompletableFuture.supplyAsync(() -> exceedRainfallCount(dto));
-        CompletableFuture<Integer> exceedSluiceFlowCount = CompletableFuture.supplyAsync(() -> exceedSluiceFlowCount(dto));
+        CompletableFuture<Integer> exceedGateFlowCount = CompletableFuture.supplyAsync(() -> exceedGateFlowCount(dto));
 
-        CompletableFuture.allOf(belowPeakCount, exceedWarningCount, exceedRainfallCount, exceedSluiceFlowCount).join();
+        CompletableFuture.allOf(belowPeakCount, exceedWarningCount, exceedRainfallCount, exceedGateFlowCount).join();
 
         result.setBelowPeakCount(belowPeakCount.join());
         result.setExceedWarningCount(exceedWarningCount.join());
         result.setExceedRainfallCount(exceedRainfallCount.join());
-        result.setExceedSluiceFlowCount(exceedSluiceFlowCount.join());
+        result.setExceedGateFlowCount(exceedGateFlowCount.join());
         return result;
     }
 
@@ -74,9 +74,9 @@ public class DfYqStatisticsService {
         return Date.from(LocalDateTime.now().minusDays(1).atZone(ZoneId.systemDefault()).toInstant());
     }
 
-    private int exceedSluiceFlowCount(DfYqExceedIndexQueDto dto) {
+    private int exceedGateFlowCount(DfYqExceedIndexQueDto dto) {
         Date tenDaysAgo = getTenDaysAgo();
-        return dfWaterRegimeMapper.exceedSluiceFlowCount(dto, tenDaysAgo, 100);
+        return dfWaterRegimeMapper.exceedGateFlowCount(dto, tenDaysAgo, 100);
     }
 
     public DfYqDailyWaterLevelDto getTenDaysWaterRegime(DfYqExceedIndexQueDto dto) {
@@ -88,9 +88,9 @@ public class DfYqStatisticsService {
 
     public DfYqDailyWaterLevelDto getTenDaysRainfall(DfYqExceedIndexQueDto dto) {
         List<DailySumDto> dailyRainfall = dfWaterRegimeMapper.getTenDaysTotalRainfall(dto, getTenDaysAgo());
-        List<DailySumDto> dailySluiceFlow = dfWaterRegimeMapper.getTenDaysTotalSluiceFlow(dto, getTenDaysAgo());
+        List<DailySumDto> dailyGateFlow = dfWaterRegimeMapper.getTenDaysTotalGateFlow(dto, getTenDaysAgo());
         DfYqDailyWaterLevelDto result = new DfYqDailyWaterLevelDto();
-        populateRainfallAndSluiceFlowMap(result, dailyRainfall, dailySluiceFlow);
+        populateRainfallAndGateFlowMap(result, dailyRainfall, dailyGateFlow);
         return result;
     }
 
@@ -110,22 +110,22 @@ public class DfYqStatisticsService {
     }
 
 
-    private void populateRainfallAndSluiceFlowMap(DfYqDailyWaterLevelDto result, List<DailySumDto> dailyRainfall, List<DailySumDto> dailySluiceFlow) {
+    private void populateRainfallAndGateFlowMap(DfYqDailyWaterLevelDto result, List<DailySumDto> dailyRainfall, List<DailySumDto> dailyGateFlow) {
         Map<String, DailySumDto> dailyRainfallMap = convertListToMap(dailyRainfall);
-        Map<String, DailySumDto> dailySluiceFlowMap = convertListToMap(dailySluiceFlow);
+        Map<String, DailySumDto> dailyGateFlowMap = convertListToMap(dailyGateFlow);
 
-        Map<String, DfYqDailyWaterLevelDto.RainfallAndSluiceFlow> rainfallAndSluiceFlowMap =
+        Map<String, DfYqDailyWaterLevelDto.RainfallAndGateFlow> rainfallAndGateFlowMap =
                 IntStream.range(0, 10)
                         .mapToObj(i -> LocalDateTime.now().minusDays(10).plusDays(i))
                         .collect(Collectors.toMap(
                                 date -> date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),
-                                date -> new DfYqDailyWaterLevelDto.RainfallAndSluiceFlow(
+                                date -> new DfYqDailyWaterLevelDto.RainfallAndGateFlow(
                                         getSum(dailyRainfallMap, date),
-                                        getSum(dailySluiceFlowMap, date)
+                                        getSum(dailyGateFlowMap, date)
                                 )
                         ));
 
-        result.setRainfallAndSluiceFlowMap(rainfallAndSluiceFlowMap);
+        result.setRainfallAndGateFlowMap(rainfallAndGateFlowMap);
     }
 
 

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

@@ -25,16 +25,16 @@ public class SzYqDailyWaterLevelDto {
     private Map<String, WaterLevel> waterLevelMap;
 
     @ApiModelProperty("降雨量和过闸流量")
-    private Map<String, RainfallAndSluiceFlow> rainfallAndSluiceFlowMap;
+    private Map<String, RainfallAndGateFlow> rainfallAndGateFlowMap;
 
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
-    public static class RainfallAndSluiceFlow {
+    public static class RainfallAndGateFlow {
         @ApiModelProperty("降雨量")
         private String rainfall;
         @ApiModelProperty("过闸流量")
-        private String sluiceFlow;
+        private String gateFlow;
     }
 
     @AllArgsConstructor

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

@@ -27,5 +27,5 @@ public class SzYqExceedIndexDto {
     private Integer exceedRainfallCount;
 
     @ApiModelProperty("超出过闸流量次数")
-    private Integer exceedSluiceFlowCount;
+    private Integer exceedGateFlowCount;
 }

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

@@ -52,8 +52,8 @@ public interface SzWaterRegimeMapper extends BaseMapper<SzWaterRegime> {
     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 COUNT(1) FROM bs_sgc_sz_syq WHERE waga_code = #{dto.wagaCode} AND create_time >= #{twentyFourHoursAgo} AND GATE_FLOW >= #{gateFlow}")
+    int exceedGateFlowCount(@Param(value = "dto") SzYqExceedIndexQueDto dto, @Param(value = "twentyFourHoursAgo") Date twentyFourHoursAgo, @Param(value = "gateFlow") int gateFlow);
 
     //获取指定日期内某堤防水位数据，水位数据按天分组，数据取每天最新的水位值
     @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')")
@@ -65,6 +65,6 @@ public interface SzWaterRegimeMapper extends BaseMapper<SzWaterRegime> {
 
     //获取指定日期内某堤防过闸流量数据，过闸流量数据按天分组，数据取每天最新的过闸流量值
     @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);
+    List<DailySumDto> getTenDaysTotalGateFlow(@Param(value = "dto") SzYqExceedIndexQueDto dto, @Param(value = "tenDaysAgo") Date tenDaysAgo);
 
 }

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYqStatisticsService.java

@@ -37,14 +37,14 @@ public class SzYqStatisticsService {
         CompletableFuture<Integer> belowPeakCount = CompletableFuture.supplyAsync(() -> belowPeakCount(dto));
         CompletableFuture<Integer> exceedWarningCount = CompletableFuture.supplyAsync(() -> exceedWarningCount(dto));
         CompletableFuture<Integer> exceedRainfallCount = CompletableFuture.supplyAsync(() -> exceedRainfallCount(dto));
-        CompletableFuture<Integer> exceedSluiceFlowCount = CompletableFuture.supplyAsync(() -> exceedSluiceFlowCount(dto));
+        CompletableFuture<Integer> exceedGateFlowCount = CompletableFuture.supplyAsync(() -> exceedGateFlowCount(dto));
 
-        CompletableFuture.allOf(belowPeakCount, exceedWarningCount, exceedRainfallCount, exceedSluiceFlowCount).join();
+        CompletableFuture.allOf(belowPeakCount, exceedWarningCount, exceedRainfallCount, exceedGateFlowCount).join();
 
         result.setBelowPeakCount(belowPeakCount.join());
         result.setExceedWarningCount(exceedWarningCount.join());
         result.setExceedRainfallCount(exceedRainfallCount.join());
-        result.setExceedSluiceFlowCount(exceedSluiceFlowCount.join());
+        result.setExceedGateFlowCount(exceedGateFlowCount.join());
         return result;
     }
 
@@ -74,9 +74,9 @@ public class SzYqStatisticsService {
         return Date.from(LocalDateTime.now().minusDays(1).atZone(ZoneId.systemDefault()).toInstant());
     }
 
-    private int exceedSluiceFlowCount(SzYqExceedIndexQueDto dto) {
+    private int exceedGateFlowCount(SzYqExceedIndexQueDto dto) {
         Date tenDaysAgo = getTenDaysAgo();
-        return szWaterRegimeMapper.exceedSluiceFlowCount(dto, tenDaysAgo, 100);
+        return szWaterRegimeMapper.exceedGateFlowCount(dto, tenDaysAgo, 100);
     }
 
     public SzYqDailyWaterLevelDto getTenDaysWaterRegime(SzYqExceedIndexQueDto dto) {
@@ -88,9 +88,9 @@ public class SzYqStatisticsService {
 
     public SzYqDailyWaterLevelDto getTenDaysRainfall(SzYqExceedIndexQueDto dto) {
         List<DailySumDto> dailyRainfall = szWaterRegimeMapper.getTenDaysTotalRainfall(dto, getTenDaysAgo());
-        List<DailySumDto> dailySluiceFlow = szWaterRegimeMapper.getTenDaysTotalSluiceFlow(dto, getTenDaysAgo());
+        List<DailySumDto> dailyGateFlow = szWaterRegimeMapper.getTenDaysTotalGateFlow(dto, getTenDaysAgo());
         SzYqDailyWaterLevelDto result = new SzYqDailyWaterLevelDto();
-        populateRainfallAndSluiceFlowMap(result, dailyRainfall, dailySluiceFlow);
+        populateRainfallAndGateFlowMap(result, dailyRainfall, dailyGateFlow);
         return result;
     }
 
@@ -110,22 +110,22 @@ public class SzYqStatisticsService {
     }
 
 
-    private void populateRainfallAndSluiceFlowMap(SzYqDailyWaterLevelDto result, List<DailySumDto> dailyRainfall, List<DailySumDto> dailySluiceFlow) {
+    private void populateRainfallAndGateFlowMap(SzYqDailyWaterLevelDto result, List<DailySumDto> dailyRainfall, List<DailySumDto> dailyGateFlow) {
         Map<String, DailySumDto> dailyRainfallMap = convertListToMap(dailyRainfall);
-        Map<String, DailySumDto> dailySluiceFlowMap = convertListToMap(dailySluiceFlow);
+        Map<String, DailySumDto> dailyGateFlowMap = convertListToMap(dailyGateFlow);
 
-        Map<String, SzYqDailyWaterLevelDto.RainfallAndSluiceFlow> rainfallAndSluiceFlowMap =
+        Map<String, SzYqDailyWaterLevelDto.RainfallAndGateFlow> rainfallAndGateFlowMap =
                 IntStream.range(0, 10)
                         .mapToObj(i -> LocalDateTime.now().minusDays(10).plusDays(i))
                         .collect(Collectors.toMap(
                                 date -> date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),
-                                date -> new SzYqDailyWaterLevelDto.RainfallAndSluiceFlow(
+                                date -> new SzYqDailyWaterLevelDto.RainfallAndGateFlow(
                                         getSum(dailyRainfallMap, date),
-                                        getSum(dailySluiceFlowMap, date)
+                                        getSum(dailyGateFlowMap, date)
                                 )
                         ));
 
-        result.setRainfallAndSluiceFlowMap(rainfallAndSluiceFlowMap);
+        result.setRainfallAndGateFlowMap(rainfallAndGateFlowMap);
     }