判断调整

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

@@ -111,21 +111,21 @@ public class AsyncTask {
             for (TXinyiForecastComparison tXinyiForecastComparison : tXinyiForecastComparisons1) {
                 BigDecimal hsForecastOne = tXinyiForecastComparison.getHsForecastOne();
                 BigDecimal yyForecastOne = tXinyiForecastComparison.getYyForecastOne();
-                if("出水COD".equals(tXinyiForecastComparison.getCategory())){
+                if("cod".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealOne(csCod);
                     if(!Objects.isNull(csCod) && csCod.compareTo(BigDecimal.ZERO) > 0){
                         tXinyiForecastComparison.setHsErrorRateOne((csCod.subtract(hsForecastOne)).divide(csCod, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                         tXinyiForecastComparison.setYyErrorRateOne((csCod.subtract(yyForecastOne)).divide(csCod, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                     }
                 }
-                if("出水SS".equals(tXinyiForecastComparison.getCategory())){
+                if("ss".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealOne(csSs);
                     if(!Objects.isNull(csSs) && csSs.compareTo(BigDecimal.ZERO) > 0){
                         tXinyiForecastComparison.setHsErrorRateOne((csSs.subtract(hsForecastOne)).divide(csSs, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                         tXinyiForecastComparison.setYyErrorRateOne((csSs.subtract(yyForecastOne)).divide(csSs, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                     }
                 }
-                if("出水总氮".equals(tXinyiForecastComparison.getCategory())){
+                if("tn".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealOne(csTn);
                     if(!Objects.isNull(csTn) && csTn.compareTo(BigDecimal.ZERO) > 0){
                         tXinyiForecastComparison.setHsErrorRateOne((csTn.subtract(hsForecastOne)).divide(csTn, NUMBER_SCALE_4, RoundingMode.HALF_UP));
@@ -133,14 +133,14 @@ public class AsyncTask {
                     }
                 }
                 //2024年6月20日11:16:55 出水总磷的真实值从化验室获取
-                /*if("出水总磷".equals(tXinyiForecastComparison.getCategory())){
+                /*if("tp".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealOne(csTp);
                     if(!Objects.isNull(csTp) && csTp.compareTo(BigDecimal.ZERO) > 0){
                         tXinyiForecastComparison.setHsErrorRateOne((csTp.subtract(hsForecastOne)).divide(csTp, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                         tXinyiForecastComparison.setYyErrorRateOne((csTp.subtract(yyForecastOne)).divide(csTp, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                     }
                 }*/
-                if("出水氨氮".equals(tXinyiForecastComparison.getCategory())){
+                if("nh3".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealOne(csNh3);
                     if(!Objects.isNull(csNh3) && csNh3.compareTo(BigDecimal.ZERO) > 0){
                         tXinyiForecastComparison.setHsErrorRateOne((csNh3.subtract(hsForecastOne)).divide(csNh3, NUMBER_SCALE_4, RoundingMode.HALF_UP));
@@ -156,21 +156,21 @@ public class AsyncTask {
             for (TXinyiForecastComparison tXinyiForecastComparison : tXinyiForecastComparisons2) {
                 BigDecimal hsForecastTwo = tXinyiForecastComparison.getHsForecastTwo();
                 BigDecimal yyForecastTwo = tXinyiForecastComparison.getYyForecastTwo();
-                if("出水COD".equals(tXinyiForecastComparison.getCategory())){
+                if("cod".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealTwo(csCod);
                     if(!Objects.isNull(csCod) && csCod.compareTo(BigDecimal.ZERO) > 0){
                         tXinyiForecastComparison.setHsErrorRateTwo((csCod.subtract(hsForecastTwo)).divide(csCod, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                         tXinyiForecastComparison.setYyErrorRateTwo((csCod.subtract(yyForecastTwo)).divide(csCod, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                     }
                 }
-                if("出水SS".equals(tXinyiForecastComparison.getCategory())){
+                if("ss".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealTwo(csSs);
                     if(!Objects.isNull(csSs) && csSs.compareTo(BigDecimal.ZERO) > 0){
                         tXinyiForecastComparison.setHsErrorRateTwo((csSs.subtract(hsForecastTwo)).divide(csSs, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                         tXinyiForecastComparison.setYyErrorRateTwo((csSs.subtract(yyForecastTwo)).divide(csSs, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                     }
                 }
-                if("出水总氮".equals(tXinyiForecastComparison.getCategory())){
+                if("tn".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealTwo(csTn);
                     if(!Objects.isNull(csTn) && csTn.compareTo(BigDecimal.ZERO) > 0){
                         tXinyiForecastComparison.setHsErrorRateTwo((csTn.subtract(hsForecastTwo)).divide(csTn, NUMBER_SCALE_4, RoundingMode.HALF_UP));
@@ -178,14 +178,14 @@ public class AsyncTask {
                     }
                 }
                 //2024年6月20日11:16:55 出水总磷的真实值从化验室获取
-                /*if("出水总磷".equals(tXinyiForecastComparison.getCategory())){
+                /*if("tp".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealTwo(csTp);
                     if(!Objects.isNull(csTp) && csTp.compareTo(BigDecimal.ZERO) > 0){
                         tXinyiForecastComparison.setHsErrorRateTwo((csTp.subtract(hsForecastTwo)).divide(csTp, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                         tXinyiForecastComparison.setYyErrorRateTwo((csTp.subtract(yyForecastTwo)).divide(csTp, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                     }
                 }*/
-                if("出水氨氮".equals(tXinyiForecastComparison.getCategory())){
+                if("nh3".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealTwo(csNh3);
                     if(!Objects.isNull(csNh3) && csNh3.compareTo(BigDecimal.ZERO) > 0){
                         tXinyiForecastComparison.setHsErrorRateTwo((csNh3.subtract(hsForecastTwo)).divide(csNh3, NUMBER_SCALE_4, RoundingMode.HALF_UP));
@@ -201,21 +201,21 @@ public class AsyncTask {
             for (TXinyiForecastComparison tXinyiForecastComparison : tXinyiForecastComparisons3) {
                 BigDecimal hsForecastThree = tXinyiForecastComparison.getHsForecastThree();
                 BigDecimal yyForecastThree = tXinyiForecastComparison.getYyForecastThree();
-                if("出水COD".equals(tXinyiForecastComparison.getCategory())){
+                if("cod".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealThree(csCod);
                     if(!Objects.isNull(csCod) && csCod.compareTo(BigDecimal.ZERO) > 0){
                         tXinyiForecastComparison.setHsErrorRateThree((csCod.subtract(hsForecastThree)).divide(csCod, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                         tXinyiForecastComparison.setYyErrorRateThree((csCod.subtract(yyForecastThree)).divide(csCod, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                     }
                 }
-                if("出水SS".equals(tXinyiForecastComparison.getCategory())){
+                if("ss".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealThree(csSs);
                     if(!Objects.isNull(csSs) && csSs.compareTo(BigDecimal.ZERO) > 0){
                         tXinyiForecastComparison.setHsErrorRateThree((csSs.subtract(hsForecastThree)).divide(csSs, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                         tXinyiForecastComparison.setYyErrorRateThree((csSs.subtract(yyForecastThree)).divide(csSs, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                     }
                 }
-                if("出水总氮".equals(tXinyiForecastComparison.getCategory())){
+                if("tn".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealThree(csTn);
                     if(!Objects.isNull(csTn) && csTn.compareTo(BigDecimal.ZERO) > 0){
                         tXinyiForecastComparison.setHsErrorRateThree((csTn.subtract(hsForecastThree)).divide(csTn, NUMBER_SCALE_4, RoundingMode.HALF_UP));
@@ -223,14 +223,14 @@ public class AsyncTask {
                     }
                 }
                 //2024年6月20日11:16:55 出水总磷的真实值从化验室获取
-                /*if("出水总磷".equals(tXinyiForecastComparison.getCategory())){
+                /*if("tp".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealThree(csTp);
                     if(!Objects.isNull(csTp) && csTp.compareTo(BigDecimal.ZERO) > 0){
                         tXinyiForecastComparison.setHsErrorRateThree((csTp.subtract(hsForecastThree)).divide(csTp, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                         tXinyiForecastComparison.setYyErrorRateThree((csTp.subtract(yyForecastThree)).divide(csTp, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                     }
                 }*/
-                if("出水氨氮".equals(tXinyiForecastComparison.getCategory())){
+                if("nh3".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealThree(csNh3);
                     if(!Objects.isNull(csNh3) && csNh3.compareTo(BigDecimal.ZERO) > 0){
                         tXinyiForecastComparison.setHsErrorRateThree((csNh3.subtract(hsForecastThree)).divide(csNh3, NUMBER_SCALE_4, RoundingMode.HALF_UP));
@@ -255,7 +255,9 @@ public class AsyncTask {
         BigDecimal tpRccJqr = tXinyiRobot.getTpRccJqr();
         BigDecimal csTp = null;
         if(!Objects.isNull(tpRccJqr)){
-            csTp = tpRccJqr.divide(ROBOT_HY_DIVIDE, NUMBER_SCALE_4, RoundingMode.HALF_UP);
+//            csTp = tpRccJqr.divide(ROBOT_HY_DIVIDE, NUMBER_SCALE_4, RoundingMode.HALF_UP);
+            //2024年6月20日13:44:26  先不计算，结果会更准确
+            csTp = tpRccJqr;
         }
 
         //时间段1
@@ -283,7 +285,7 @@ public class AsyncTask {
                     }
                 }
                 //2024年6月20日11:14:42  总磷的真实值也从化验室获取
-                if("出水总磷".equals(tXinyiForecastComparison.getCategory())){
+                if("tp".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealOne(csTp);
                     if(!Objects.isNull(csTp) && csTp.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastOne))
@@ -320,7 +322,7 @@ public class AsyncTask {
                     }
                 }
                 //2024年6月20日11:14:42  总磷的真实值也从化验室获取
-                if("出水总磷".equals(tXinyiForecastComparison.getCategory())){
+                if("tp".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealTwo(csTp);
                     if(!Objects.isNull(csTp) && csTp.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastTwo))
@@ -357,7 +359,7 @@ public class AsyncTask {
                     }
                 }
                 //2024年6月20日11:14:42  总磷的真实值也从化验室获取
-                if("出水总磷".equals(tXinyiForecastComparison.getCategory())){
+                if("tp".equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealThree(csTp);
                     if(!Objects.isNull(csTp) && csTp.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastThree))