定时任务处理大表 - 天 月 维度数据新增超污染物负荷和超污染物限制计算 手动处理历史数据相关的3个接口也新增相关处理

slibra-admin/src/main/java/com/slibra/web/controller/business/HandleDataController.java

@@ -1445,7 +1445,26 @@ public class HandleDataController extends BaseController
         xinyiBigTableHour.setJsQsb(xinyiCalculate.getQSB());
         xinyiBigTableHour.setJsFcxsl(xinyiCalculate.getFCXSL());
         xinyiBigTableHour.setJsFcxslbl(xinyiCalculate.getFCXSLBL());
+        //2024年7月11日15:57:20 外回流比采用新的公式计算
         xinyiBigTableHour.setJsWhlbRN(xinyiCalculate.getWhlRN());
+        //2025年03月19日17:14:35 处理 超污染物限制 和 超污染物负荷 进出水五大指标相关计算
+        xinyiBigTableHour.setJsCsCodCwrwxz(xinyiCalculate.getCsCodCwrwxz());
+        xinyiBigTableHour.setJsCsSsCwrwxz(xinyiCalculate.getCsSsCwrwxz());
+        xinyiBigTableHour.setJsCsZdCwrwxz(xinyiCalculate.getCsZdCwrwxz());
+        xinyiBigTableHour.setJsCsZlCwrwxz(xinyiCalculate.getCsZlCwrwxz());
+        xinyiBigTableHour.setJsCsAdCwrwxz(xinyiCalculate.getCsAdCwrwxz());
+
+        xinyiBigTableHour.setJsJsCodCwrwfh(xinyiCalculate.getJsCodCwrwfh());
+        xinyiBigTableHour.setJsJsSsCwrwfh(xinyiCalculate.getJsSsCwrwfh());
+        xinyiBigTableHour.setJsJsZdCwrwfh(xinyiCalculate.getJsZdCwrwfh());
+        xinyiBigTableHour.setJsJsZlCwrwfh(xinyiCalculate.getJsZlCwrwfh());
+        xinyiBigTableHour.setJsJsAdCwrwfh(xinyiCalculate.getJsAdCwrwfh());
+
+        xinyiBigTableHour.setJsJsCodCwrwxz(xinyiCalculate.getJsCodCwrwxz());
+        xinyiBigTableHour.setJsJsSsCwrwxz(xinyiCalculate.getJsSsCwrwxz());
+        xinyiBigTableHour.setJsJsZdCwrwxz(xinyiCalculate.getJsZdCwrwxz());
+        xinyiBigTableHour.setJsJsZlCwrwxz(xinyiCalculate.getJsZlCwrwxz());
+        xinyiBigTableHour.setJsJsAdCwrwxz(xinyiCalculate.getJsAdCwrwxz());
     }
 
     // 处理日报

slibra-system/src/main/resources/mapper/business/TXinyiBigTableDayMapper.xml

@@ -1003,7 +1003,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AVG( JS_WDSCNL ) JS_WDSCNL,
             AVG( JS_QSB ) JS_QSB,
             AVG( JS_FCXSL ) JS_FCXSL,
-            AVG( JS_FCXSLBL ) JS_FCXSLBL
+            AVG( JS_FCXSLBL ) JS_FCXSLBL,
+            AVG( JS_CS_COD_CWRWXZ ) JS_CS_COD_CWRWXZ,
+            AVG( JS_CS_SS_CWRWXZ ) JS_CS_SS_CWRWXZ,
+            AVG( JS_CS_ZD_CWRWXZ ) JS_CS_ZD_CWRWXZ,
+            AVG( JS_CS_ZL_CWRWXZ ) JS_CS_ZL_CWRWXZ,
+            AVG( JS_CS_AD_CWRWXZ ) JS_CS_AD_CWRWXZ,
+            AVG( JS_JS_COD_CWRWFH ) JS_JS_COD_CWRWFH,
+            AVG( JS_JS_SS_CWRWFH ) JS_JS_SS_CWRWFH,
+            AVG( JS_JS_ZD_CWRWFH ) JS_JS_ZD_CWRWFH,
+            AVG( JS_JS_ZL_CWRWFH ) JS_JS_ZL_CWRWFH,
+            AVG( JS_JS_AD_CWRWFH ) JS_JS_AD_CWRWFH,
+            AVG( JS_JS_COD_CWRWXZ ) JS_JS_COD_CWRWXZ,
+            AVG( JS_JS_SS_CWRWXZ ) JS_JS_SS_CWRWXZ,
+            AVG( JS_JS_ZD_CWRWXZ ) JS_JS_ZD_CWRWXZ,
+            AVG( JS_JS_ZL_CWRWXZ ) JS_JS_ZL_CWRWXZ,
+            AVG( JS_JS_AD_CWRWXZ ) JS_JS_AD_CWRWXZ
         FROM
             t_xinyi_big_table_hour
         WHERE TEST_DATE = #{day}
@@ -1172,11 +1187,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               avg(`JS_WDSCNL`) JS_WDSCNL,
               avg(`JS_QSB`) JS_QSB,
               avg(`JS_FCXSL`) JS_FCXSL,
-              avg(`JS_FCXSLBL`) JS_FCXSLBL
+              avg(`JS_FCXSLBL`) JS_FCXSLBL,
+              AVG( JS_CS_COD_CWRWXZ ) JS_CS_COD_CWRWXZ,
+              AVG( JS_CS_SS_CWRWXZ ) JS_CS_SS_CWRWXZ,
+              AVG( JS_CS_ZD_CWRWXZ ) JS_CS_ZD_CWRWXZ,
+              AVG( JS_CS_ZL_CWRWXZ ) JS_CS_ZL_CWRWXZ,
+              AVG( JS_CS_AD_CWRWXZ ) JS_CS_AD_CWRWXZ,
+              AVG( JS_JS_COD_CWRWFH ) JS_JS_COD_CWRWFH,
+              AVG( JS_JS_SS_CWRWFH ) JS_JS_SS_CWRWFH,
+              AVG( JS_JS_ZD_CWRWFH ) JS_JS_ZD_CWRWFH,
+              AVG( JS_JS_ZL_CWRWFH ) JS_JS_ZL_CWRWFH,
+              AVG( JS_JS_AD_CWRWFH ) JS_JS_AD_CWRWFH,
+              AVG( JS_JS_COD_CWRWXZ ) JS_JS_COD_CWRWXZ,
+              AVG( JS_JS_SS_CWRWXZ ) JS_JS_SS_CWRWXZ,
+              AVG( JS_JS_ZD_CWRWXZ ) JS_JS_ZD_CWRWXZ,
+              AVG( JS_JS_ZL_CWRWXZ ) JS_JS_ZL_CWRWXZ,
+              AVG( JS_JS_AD_CWRWXZ ) JS_JS_AD_CWRWXZ
         FROM
             t_xinyi_big_table_day
         GROUP BY
-            DATE_FORMAT(STR_TO_DATE(TEST_DATE, '%Y/%m/%d'), '%Y/%m');
+            DATE_FORMAT(STR_TO_DATE(TEST_DATE, '%Y/%m/%d'), '%Y/%m')
     </select>
 
 
@@ -1342,7 +1372,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             avg(`JS_WDSCNL`) JS_WDSCNL,
             avg(`JS_QSB`) JS_QSB,
             avg(`JS_FCXSL`) JS_FCXSL,
-            avg(`JS_FCXSLBL`) JS_FCXSLBL
+            avg(`JS_FCXSLBL`) JS_FCXSLBL,
+            AVG( JS_CS_COD_CWRWXZ ) JS_CS_COD_CWRWXZ,
+            AVG( JS_CS_SS_CWRWXZ ) JS_CS_SS_CWRWXZ,
+            AVG( JS_CS_ZD_CWRWXZ ) JS_CS_ZD_CWRWXZ,
+            AVG( JS_CS_ZL_CWRWXZ ) JS_CS_ZL_CWRWXZ,
+            AVG( JS_CS_AD_CWRWXZ ) JS_CS_AD_CWRWXZ,
+            AVG( JS_JS_COD_CWRWFH ) JS_JS_COD_CWRWFH,
+            AVG( JS_JS_SS_CWRWFH ) JS_JS_SS_CWRWFH,
+            AVG( JS_JS_ZD_CWRWFH ) JS_JS_ZD_CWRWFH,
+            AVG( JS_JS_ZL_CWRWFH ) JS_JS_ZL_CWRWFH,
+            AVG( JS_JS_AD_CWRWFH ) JS_JS_AD_CWRWFH,
+            AVG( JS_JS_COD_CWRWXZ ) JS_JS_COD_CWRWXZ,
+            AVG( JS_JS_SS_CWRWXZ ) JS_JS_SS_CWRWXZ,
+            AVG( JS_JS_ZD_CWRWXZ ) JS_JS_ZD_CWRWXZ,
+            AVG( JS_JS_ZL_CWRWXZ ) JS_JS_ZL_CWRWXZ,
+            AVG( JS_JS_AD_CWRWXZ ) JS_JS_AD_CWRWXZ
         from t_xinyi_big_table_hour where TEST_DATE = #{testDate}
     </select>
 

slibra-system/src/main/resources/mapper/business/TXinyiBigTableHourMapper.xml

@@ -840,6 +840,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+
+    <!-- 2025年03月19日17:35:42 下面是新增的SQL，不允许删除或者覆盖 -->
+
+
     <select id="selectTXinyiBigTableHourByTestDate" resultMap="TXinyiBigTableHourResult">
          select TEST_DATE from t_xinyi_big_table_hour WHERE TEST_DATE >= #{date} group by TEST_DATE
         <!-- select TEST_DATE from t_xinyi_big_table_hour group by TEST_DATE -->

slibra-system/src/main/resources/mapper/business/TXinyiBigTableMonthMapper.xml

@@ -1003,7 +1003,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AVG( JS_WDSCNL ) JS_WDSCNL,
             AVG( JS_QSB ) JS_QSB,
             AVG( JS_FCXSL ) JS_FCXSL,
-            AVG( JS_FCXSLBL ) JS_FCXSLBL
+            AVG( JS_FCXSLBL ) JS_FCXSLBL,
+            AVG( JS_CS_COD_CWRWXZ ) JS_CS_COD_CWRWXZ,
+            AVG( JS_CS_SS_CWRWXZ ) JS_CS_SS_CWRWXZ,
+            AVG( JS_CS_ZD_CWRWXZ ) JS_CS_ZD_CWRWXZ,
+            AVG( JS_CS_ZL_CWRWXZ ) JS_CS_ZL_CWRWXZ,
+            AVG( JS_CS_AD_CWRWXZ ) JS_CS_AD_CWRWXZ,
+            AVG( JS_JS_COD_CWRWFH ) JS_JS_COD_CWRWFH,
+            AVG( JS_JS_SS_CWRWFH ) JS_JS_SS_CWRWFH,
+            AVG( JS_JS_ZD_CWRWFH ) JS_JS_ZD_CWRWFH,
+            AVG( JS_JS_ZL_CWRWFH ) JS_JS_ZL_CWRWFH,
+            AVG( JS_JS_AD_CWRWFH ) JS_JS_AD_CWRWFH,
+            AVG( JS_JS_COD_CWRWXZ ) JS_JS_COD_CWRWXZ,
+            AVG( JS_JS_SS_CWRWXZ ) JS_JS_SS_CWRWXZ,
+            AVG( JS_JS_ZD_CWRWXZ ) JS_JS_ZD_CWRWXZ,
+            AVG( JS_JS_ZL_CWRWXZ ) JS_JS_ZL_CWRWXZ,
+            AVG( JS_JS_AD_CWRWXZ ) JS_JS_AD_CWRWXZ
         FROM
             t_xinyi_big_table_hour
         WHERE TEST_DATE between #{begin} and #{end}