优化

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

@@ -6887,7 +6887,7 @@ public class AsyncTask {
         boolean csADExecute = true;
 
         //#1好氧硝酸盐
-        /*BigDecimal no3Hlj1Jqr = tXinyiRobot.getNo3Hlj1Jqr();
+        BigDecimal no3Hlj1Jqr = tXinyiRobot.getNo3Hlj1Jqr();
         //#2好氧硝酸盐
         BigDecimal no3Hlj2Jqr = tXinyiRobot.getNo3Hlj2Jqr();
         //1#缺氧出-硝酸盐
@@ -6895,7 +6895,7 @@ public class AsyncTask {
         BigDecimal nh31Jqr = tXinyiRobot.getNh31Jqr();
         //2#缺氧出-硝酸盐
         BigDecimal no3Qyc2Jqr = tXinyiRobot.getNo3Qyc2Jqr();
-        BigDecimal nh32Jqr = tXinyiRobot.getNh32Jqr();*/
+        BigDecimal nh32Jqr = tXinyiRobot.getNh32Jqr();
 
         //总氮的标准值和管控值
         BigDecimal cszzBzz = normConfig.getCszzBzz();
@@ -6932,15 +6932,15 @@ public class AsyncTask {
         if(!CollectionUtils.isEmpty(tXinyiRobots) && tXinyiRobots.size() == INT_10){
             for (TXinyiRobot xinyiRobot : tXinyiRobots) {
                 //判断 增加容错
-                BigDecimal no3Hlj1JqrTemp = tXinyiRobot.getNo3Hlj1Jqr();
+                BigDecimal no3Hlj1JqrTemp = xinyiRobot.getNo3Hlj1Jqr();
                 //#2好氧硝酸盐
-                BigDecimal no3Hlj2JqrTemp = tXinyiRobot.getNo3Hlj2Jqr();
+                BigDecimal no3Hlj2JqrTemp = xinyiRobot.getNo3Hlj2Jqr();
                 //1#缺氧出-硝酸盐
-                BigDecimal no3Qyc1JqrTemp = tXinyiRobot.getNo3Qyc1Jqr();
-                BigDecimal nh31JqrTemp = tXinyiRobot.getNh31Jqr();
+                BigDecimal no3Qyc1JqrTemp = xinyiRobot.getNo3Qyc1Jqr();
+                BigDecimal nh31JqrTemp = xinyiRobot.getNh31Jqr();
                 //2#缺氧出-硝酸盐
-                BigDecimal no3Qyc2JqrTemp = tXinyiRobot.getNo3Qyc2Jqr();
-                BigDecimal nh32JqrTemp = tXinyiRobot.getNh32Jqr();
+                BigDecimal no3Qyc2JqrTemp = xinyiRobot.getNo3Qyc2Jqr();
+                BigDecimal nh32JqrTemp = xinyiRobot.getNh32Jqr();
                 if(Objects.isNull(no3Qyc1JqrTemp))
                     no3Qyc1JqrTemp = BigDecimal.ZERO;
                 if(Objects.isNull(nh31JqrTemp))
@@ -7130,9 +7130,11 @@ public class AsyncTask {
             }
         }
 
-        //2#缺氧出-硝酸盐
+
+
+        //出水氨氮
         if(!Objects.isNull(csadBzz) && csADExecute){
-            handleXinYiWarningsRobotOrigin(csadBzz, divide, csadGkz, ROBOT_CS_AD.getCode(), tXinyiIndustry, normConfig, getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsNh3(), jsslSjz, normConfig.getJsadSjz()));
+            handleXinYiWarningsRobotOrigin(csadBzz, tenVals.get(INDEX_0), csadGkz, ROBOT_CS_AD.getCode(), tXinyiIndustry, normConfig, getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsNh3(), jsslSjz, normConfig.getJsadSjz()));
         }
 
     }