From edae909b8bf9f84b6f5512605ddf6cbcfebac774 Mon Sep 17 00:00:00 2001
From: yangzhe123 <2824096059@qq.com>
Date: Thu, 27 Nov 2025 17:59:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gunshi/project/hsz/model/WarningRuleInfo.java |  3 +++
 .../project/hsz/service/RiceRqWaterService.java   | 15 +++++++++++++++
 .../project/hsz/timetask/WarningRuleTask.java     |  2 ++
 3 files changed, 20 insertions(+)

diff --git a/src/main/java/com/gunshi/project/hsz/model/WarningRuleInfo.java b/src/main/java/com/gunshi/project/hsz/model/WarningRuleInfo.java
index fc705d7..4918803 100644
--- a/src/main/java/com/gunshi/project/hsz/model/WarningRuleInfo.java
+++ b/src/main/java/com/gunshi/project/hsz/model/WarningRuleInfo.java
@@ -61,4 +61,7 @@ public class WarningRuleInfo {
      */
     @TableField(exist = false)
     private List<WarningCondition> conditions;
+
+    @TableField("status")
+    private Integer status;
 }
diff --git a/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java b/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java
index 618ad07..a3a9cc3 100644
--- a/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java
@@ -263,6 +263,12 @@ public class RiceRqWaterService extends ServiceImpl<RiceRqWaterMapper, RiceRqWat
             BigDecimal irrigationVolume = BigDecimal.ZERO;
 
             // 计算泡田期在当前月份的耗水量
+            /**
+             * 由于这个方法是按照月份进行计算的，所以当后面的生长期有属于泡田期的月份时，那么也要把泡田期的算上
+             * 比如 泡田期3.30~4.25
+             *      返青期4·26~5·6
+             *      属于四月份的有泡田期和返青期，那么计算的时候就要把泡田期在四月份的灌溉用水量和返青期在四月份的灌溉用水量计算上
+             */
             if (isMonthInKaPeriod(sortedMonth, kaStartTime, kaEndTime)) {
                 int kaDaysInMonth = calculateKaDaysInMonth(kaStartTime, kaEndTime, sortedMonth);
                 BigDecimal kaConsumption = kaQuota.divide(BigDecimal.valueOf(totalKaDays), 100, RoundingMode.HALF_UP)
@@ -318,8 +324,17 @@ public class RiceRqWaterService extends ServiceImpl<RiceRqWaterMapper, RiceRqWat
                         totalConsumption = totalConsumption.add(growPeriod.getWaterRqStage());
                     } else {
                         // 跨月份：按天数比例分配耗水量
+                        //当前月份对应阶段的耗水量/当前阶段的全天数
+                        /**
+                         * 比如
+                         * 泡田期 3.30~4.25
+                         * 返青期 4·26~5·6  这里就跨月份了
+                         * 同时month为4 表示4月份
+                         * 那么计算公式为 返青期耗水量/返青期天数11天*返青期四月份天数(ps 泡田期在四月份的耗水量已经计算完了）
+                         */
                         BigDecimal dailyConsumption = growPeriod.getWaterRqStage()
                                 .divide(BigDecimal.valueOf(growPeriod.getDays()), 10, RoundingMode.HALF_UP);
+                        //再去乘当前阶段在当前月份的天数
                         BigDecimal monthlyConsumption = dailyConsumption.multiply(BigDecimal.valueOf(daysInMonth));
                         totalConsumption = totalConsumption.add(monthlyConsumption);
                     }
diff --git a/src/main/java/com/gunshi/project/hsz/timetask/WarningRuleTask.java b/src/main/java/com/gunshi/project/hsz/timetask/WarningRuleTask.java
index c4b65c9..4670e7f 100644
--- a/src/main/java/com/gunshi/project/hsz/timetask/WarningRuleTask.java
+++ b/src/main/java/com/gunshi/project/hsz/timetask/WarningRuleTask.java
@@ -104,6 +104,7 @@ public class WarningRuleTask {
                 String ruleInfo = generateRuleInfo(conditions);
 
                 WarningRuleInfo warningRuleInfo = new WarningRuleInfo();
+                warningRuleInfo.setCreateName(warningRule.getCreateName());
                 warningRuleInfo.setRuleId(warningRule.getId());
                 warningRuleInfo.setRuleName(warningRule.getRuleName());
                 warningRuleInfo.setConditions(conditions);
@@ -111,6 +112,7 @@ public class WarningRuleTask {
                 warningRuleInfo.setRuleInfo(ruleInfo);
                 warningRuleInfo.setWarningType(warningType);
                 warningRuleInfo.setWarningLevel(warningRule.getWarningLevel());
+                warningRuleInfo.setStatus(warningRule.getStatus());
                 warningRuleInfoService.save(warningRuleInfo);
             }
         }