处理实时计算表的时候 和 处理计算表的历史数据的时候，超污染物负荷和超污染物限制 计算新增判断处理

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

@@ -927,6 +927,14 @@ public class HandleDataController extends BaseController
                     BigDecimal jsTp = tXinyiIndustry.getJsTp();
                     BigDecimal jsCod = tXinyiIndustry.getJsCod();
                     BigDecimal jsSlq = tXinyiIndustry.getJsSlq();
+                    BigDecimal jsSs = tXinyiIndustry.getJsSs();
+                    BigDecimal jsNh3 = tXinyiIndustry.getJsNh3();
+
+                    BigDecimal csCod = tXinyiIndustry.getCsCod();
+                    BigDecimal csSs = tXinyiIndustry.getCsSs();
+                    BigDecimal csTn = tXinyiIndustry.getCsTn();
+                    BigDecimal csTp = tXinyiIndustry.getCsTp();
+                    BigDecimal csNh3 = tXinyiIndustry.getCsNh3();
                     //计算
                     if(!Objects.isNull(jsBod5)){
                         if(!Objects.isNull(jsTn) && jsTn.compareTo(BigDecimal.ZERO) > 0)
@@ -983,26 +991,41 @@ public class HandleDataController extends BaseController
                             tXinyiCalculate.setWhlRN(DECIMAL_1620.divide(divide, NUMBER_SCALE_4, RoundingMode.HALF_UP).multiply(BigDecimal_100));
                         //2025年03月19日19:05:07 新增超污染物限制 和 超污染物负荷 进出水五大指标相关计算
                         if(!Objects.isNull(jsslSjz) && jsslSjz.compareTo(BigDecimal.ZERO) > 0){
-                            tXinyiCalculate.setJsCodCwrwfh(getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsCod(), jsslSjz, normConfig.getJscodSjz()));
-                            tXinyiCalculate.setJsSsCwrwfh(getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsSs(), jsslSjz, normConfig.getJsssSjz()));
-                            tXinyiCalculate.setJsZdCwrwfh(getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsTn(), jsslSjz, normConfig.getJszdSjz()));
-                            tXinyiCalculate.setJsZlCwrwfh(getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsTp(), jsslSjz, normConfig.getJszlSjz()));
-                            tXinyiCalculate.setJsAdCwrwfh(getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsNh3(), jsslSjz, normConfig.getJsadSjz()));
+                            if(!Objects.isNull(jsCod))
+                                tXinyiCalculate.setJsCodCwrwfh(getCwrwfhzByDetail(jsSlq, jsCod, jsslSjz, normConfig.getJscodSjz()));
+                            if(!Objects.isNull(jsSs))
+                                tXinyiCalculate.setJsSsCwrwfh(getCwrwfhzByDetail(jsSlq, jsSs, jsslSjz, normConfig.getJsssSjz()));
+                            if(!Objects.isNull(jsTn))
+                                tXinyiCalculate.setJsZdCwrwfh(getCwrwfhzByDetail(jsSlq, jsTn, jsslSjz, normConfig.getJszdSjz()));
+                            if(!Objects.isNull(jsTp))
+                                tXinyiCalculate.setJsZlCwrwfh(getCwrwfhzByDetail(jsSlq, jsTp, jsslSjz, normConfig.getJszlSjz()));
+                            if(!Objects.isNull(jsNh3))
+                                tXinyiCalculate.setJsAdCwrwfh(getCwrwfhzByDetail(jsSlq, jsNh3, jsslSjz, normConfig.getJsadSjz()));
                         }
-
-                        tXinyiCalculate.setCsCodCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getCsCod(), normConfig, CS_COD.getCode(), false));
-                        tXinyiCalculate.setCsSsCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getCsSs(), normConfig, CS_SS.getCode(), false));
-                        tXinyiCalculate.setCsZdCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getCsTn(), normConfig, CS_ZD.getCode(), false));
-                        tXinyiCalculate.setCsZlCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getCsTp(), normConfig, CS_ZL.getCode(), false));
-                        tXinyiCalculate.setCsAdCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getCsNh3(), normConfig, CS_AD.getCode(), false));
-
-                        tXinyiCalculate.setJsCodCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getJsCod(), normConfig, JS_COD.getCode(), false));
-                        tXinyiCalculate.setJsSsCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getJsSs(), normConfig, JS_SS.getCode(), false));
-                        tXinyiCalculate.setJsZdCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getJsTn(), normConfig, JS_ZD.getCode(), false));
-                        tXinyiCalculate.setJsZlCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getJsTp(), normConfig, JS_ZL.getCode(), false));
-                        tXinyiCalculate.setJsAdCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getJsNh3(), normConfig, JS_AD.getCode(), false));
                     }
 
+                    if(!Objects.isNull(csCod))
+                        tXinyiCalculate.setCsCodCwrwxz(getCwrwxzByDetail(csCod, normConfig, CS_COD.getCode(), false));
+                    if(!Objects.isNull(csSs))
+                        tXinyiCalculate.setCsSsCwrwxz(getCwrwxzByDetail(csSs, normConfig, CS_SS.getCode(), false));
+                    if(!Objects.isNull(csTn))
+                        tXinyiCalculate.setCsZdCwrwxz(getCwrwxzByDetail(csTn, normConfig, CS_ZD.getCode(), false));
+                    if(!Objects.isNull(csTp))
+                        tXinyiCalculate.setCsZlCwrwxz(getCwrwxzByDetail(csTp, normConfig, CS_ZL.getCode(), false));
+                    if(!Objects.isNull(csNh3))
+                        tXinyiCalculate.setCsAdCwrwxz(getCwrwxzByDetail(csNh3, normConfig, CS_AD.getCode(), false));
+
+                    if(!Objects.isNull(jsCod))
+                        tXinyiCalculate.setJsCodCwrwxz(getCwrwxzByDetail(jsCod, normConfig, JS_COD.getCode(), false));
+                    if(!Objects.isNull(jsSs))
+                        tXinyiCalculate.setJsSsCwrwxz(getCwrwxzByDetail(jsSs, normConfig, JS_SS.getCode(), false));
+                    if(!Objects.isNull(jsTn))
+                        tXinyiCalculate.setJsZdCwrwxz(getCwrwxzByDetail(jsTn, normConfig, JS_ZD.getCode(), false));
+                    if(!Objects.isNull(jsTp))
+                        tXinyiCalculate.setJsZlCwrwxz(getCwrwxzByDetail(jsTp, normConfig, JS_ZL.getCode(), false));
+                    if(!Objects.isNull(jsNh3))
+                        tXinyiCalculate.setJsAdCwrwxz(getCwrwxzByDetail(jsNh3, normConfig, JS_AD.getCode(), false));
+
                     tempInsertData.add(tXinyiCalculate);
                     xinyiCalculateMapper.insertTXinyiCalculate(tXinyiCalculate);
                 }

slibra-quartz/src/main/java/com/slibra/quartz/task/AsyncTask.java

@@ -1100,6 +1100,15 @@ public class AsyncTask {
         BigDecimal jsTp = tXinyiIndustry.getJsTp();
         BigDecimal jsCod = tXinyiIndustry.getJsCod();
         BigDecimal jsSlq = tXinyiIndustry.getJsSlq();
+        BigDecimal jsSs = tXinyiIndustry.getJsSs();
+        BigDecimal jsNh3 = tXinyiIndustry.getJsNh3();
+
+        BigDecimal csCod = tXinyiIndustry.getCsCod();
+        BigDecimal csSs = tXinyiIndustry.getCsSs();
+        BigDecimal csTn = tXinyiIndustry.getCsTn();
+        BigDecimal csTp = tXinyiIndustry.getCsTp();
+        BigDecimal csNh3 = tXinyiIndustry.getCsNh3();
+
         //计算
         if(!Objects.isNull(jsBod5)){
             if(!Objects.isNull(jsTn) && jsTn.compareTo(BigDecimal.ZERO) > 0)
@@ -1154,25 +1163,39 @@ public class AsyncTask {
                 tXinyiCalculate.setWhlRN(DECIMAL_1620.divide(divide, NUMBER_SCALE_4, RoundingMode.HALF_UP).multiply(BigDecimal_100));
             //2025年03月19日16:43:12 新增超污染物限制 和 超污染物负荷 进出水五大指标相关计算
             if(!Objects.isNull(jsslSjz) && jsslSjz.compareTo(BigDecimal.ZERO) > 0){
-                tXinyiCalculate.setJsCodCwrwfh(getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsCod(), jsslSjz, normConfig.getJscodSjz()));
-                tXinyiCalculate.setJsSsCwrwfh(getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsSs(), jsslSjz, normConfig.getJsssSjz()));
-                tXinyiCalculate.setJsZdCwrwfh(getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsTn(), jsslSjz, normConfig.getJszdSjz()));
-                tXinyiCalculate.setJsZlCwrwfh(getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsTp(), jsslSjz, normConfig.getJszlSjz()));
-                tXinyiCalculate.setJsAdCwrwfh(getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsNh3(), jsslSjz, normConfig.getJsadSjz()));
+                if(!Objects.isNull(jsCod))
+                    tXinyiCalculate.setJsCodCwrwfh(getCwrwfhzByDetail(jsSlq, jsCod, jsslSjz, normConfig.getJscodSjz()));
+                if(!Objects.isNull(jsSs))
+                    tXinyiCalculate.setJsSsCwrwfh(getCwrwfhzByDetail(jsSlq, jsSs, jsslSjz, normConfig.getJsssSjz()));
+                if(!Objects.isNull(jsTn))
+                    tXinyiCalculate.setJsZdCwrwfh(getCwrwfhzByDetail(jsSlq, jsTn, jsslSjz, normConfig.getJszdSjz()));
+                if(!Objects.isNull(jsTp))
+                    tXinyiCalculate.setJsZlCwrwfh(getCwrwfhzByDetail(jsSlq, jsTp, jsslSjz, normConfig.getJszlSjz()));
+                if(!Objects.isNull(jsNh3))
+                    tXinyiCalculate.setJsAdCwrwfh(getCwrwfhzByDetail(jsSlq, jsNh3, jsslSjz, normConfig.getJsadSjz()));
             }
-
-            tXinyiCalculate.setCsCodCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getCsCod(), normConfig, CS_COD.getCode(), false));
-            tXinyiCalculate.setCsSsCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getCsSs(), normConfig, CS_SS.getCode(), false));
-            tXinyiCalculate.setCsZdCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getCsTn(), normConfig, CS_ZD.getCode(), false));
-            tXinyiCalculate.setCsZlCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getCsTp(), normConfig, CS_ZL.getCode(), false));
-            tXinyiCalculate.setCsAdCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getCsNh3(), normConfig, CS_AD.getCode(), false));
-
-            tXinyiCalculate.setJsCodCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getJsCod(), normConfig, JS_COD.getCode(), false));
-            tXinyiCalculate.setJsSsCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getJsSs(), normConfig, JS_SS.getCode(), false));
-            tXinyiCalculate.setJsZdCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getJsTn(), normConfig, JS_ZD.getCode(), false));
-            tXinyiCalculate.setJsZlCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getJsTp(), normConfig, JS_ZL.getCode(), false));
-            tXinyiCalculate.setJsAdCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getJsNh3(), normConfig, JS_AD.getCode(), false));
         }
+        if(!Objects.isNull(csCod))
+            tXinyiCalculate.setCsCodCwrwxz(getCwrwxzByDetail(csCod, normConfig, CS_COD.getCode(), false));
+        if(!Objects.isNull(csSs))
+            tXinyiCalculate.setCsSsCwrwxz(getCwrwxzByDetail(csSs, normConfig, CS_SS.getCode(), false));
+        if(!Objects.isNull(csTn))
+            tXinyiCalculate.setCsZdCwrwxz(getCwrwxzByDetail(csTn, normConfig, CS_ZD.getCode(), false));
+        if(!Objects.isNull(csTp))
+            tXinyiCalculate.setCsZlCwrwxz(getCwrwxzByDetail(csTp, normConfig, CS_ZL.getCode(), false));
+        if(!Objects.isNull(csNh3))
+            tXinyiCalculate.setCsAdCwrwxz(getCwrwxzByDetail(csNh3, normConfig, CS_AD.getCode(), false));
+
+        if(!Objects.isNull(jsCod))
+            tXinyiCalculate.setJsCodCwrwxz(getCwrwxzByDetail(jsCod, normConfig, JS_COD.getCode(), false));
+        if(!Objects.isNull(jsSs))
+            tXinyiCalculate.setJsSsCwrwxz(getCwrwxzByDetail(jsSs, normConfig, JS_SS.getCode(), false));
+        if(!Objects.isNull(jsTn))
+            tXinyiCalculate.setJsZdCwrwxz(getCwrwxzByDetail(jsTn, normConfig, JS_ZD.getCode(), false));
+        if(!Objects.isNull(jsTp))
+            tXinyiCalculate.setJsZlCwrwxz(getCwrwxzByDetail(jsTp, normConfig, JS_ZL.getCode(), false));
+        if(!Objects.isNull(jsNh3))
+            tXinyiCalculate.setJsAdCwrwxz(getCwrwxzByDetail(jsNh3, normConfig, JS_AD.getCode(), false));
         return tXinyiCalculate;
     }