Browse Source

记录模型新增 好氧池硝酸盐#1 和 好氧池硝酸盐#2 的真实值的3个小时数据处理 图表数据调整

王苗苗 6 days ago
parent
commit
94de02ef0f

+ 1 - 1
slibra-admin/src/main/resources/application-dev.yml

@@ -109,7 +109,7 @@ application:
 #默认走测试环境
 big-model:
   ip: 10.0.0.24
-  port: 47070
+  port: 37070
   temperature: 0.7
   topP: 0.7
 

+ 33 - 0
slibra-quartz/src/main/java/com/slibra/quartz/task/AsyncTask.java

@@ -613,6 +613,7 @@ public class AsyncTask {
             for (TXinyiForecastComparison tXinyiForecastComparison : tXinyiForecastComparisons1) {
                 BigDecimal hsForecastOne = tXinyiForecastComparison.getHsForecastOne();
                 BigDecimal yyForecastOne = tXinyiForecastComparison.getYyForecastOne();
+                BigDecimal jlForecastOne = tXinyiForecastComparison.getJlForecastOne();
                 /*if(XSY1.equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealOne(no3Hlj1Jqr);
                     if(!Objects.isNull(no3Hlj1Jqr) && no3Hlj1Jqr.compareTo(BigDecimal.ZERO) > 0){
@@ -647,6 +648,11 @@ public class AsyncTask {
                             tXinyiForecastComparison.setYyErrorRateOne((subtract).divide(no3Hlj1Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                             tXinyiForecastComparison.setYyOneSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
                         }
+                        if(!Objects.isNull(jlForecastOne)){
+                            BigDecimal subtract = no3Hlj1Jqr.subtract(jlForecastOne);
+                            tXinyiForecastComparison.setJlErrorRateOne((subtract).divide(no3Hlj1Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
+                            tXinyiForecastComparison.setJlOneSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
+                        }
                     }
                 }
 
@@ -664,6 +670,11 @@ public class AsyncTask {
                             tXinyiForecastComparison.setYyErrorRateOne((subtract).divide(no3Hlj2Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                             tXinyiForecastComparison.setYyOneSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
                         }
+                        if(!Objects.isNull(jlForecastOne)){
+                            BigDecimal subtract = no3Hlj2Jqr.subtract(jlForecastOne);
+                            tXinyiForecastComparison.setJlErrorRateOne((subtract).divide(no3Hlj2Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
+                            tXinyiForecastComparison.setJlOneSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
+                        }
                     }
                 }
 
@@ -761,6 +772,7 @@ public class AsyncTask {
             for (TXinyiForecastComparison tXinyiForecastComparison : tXinyiForecastComparisons2) {
                 BigDecimal hsForecastTwo = tXinyiForecastComparison.getHsForecastTwo();
                 BigDecimal yyForecastTwo = tXinyiForecastComparison.getYyForecastTwo();
+                BigDecimal jlForecastTwo = tXinyiForecastComparison.getJlForecastTwo();
                 /*if(XSY1.equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealTwo(no3Hlj1Jqr);
                     if(!Objects.isNull(no3Hlj1Jqr) && no3Hlj1Jqr.compareTo(BigDecimal.ZERO) > 0){
@@ -795,6 +807,11 @@ public class AsyncTask {
                             tXinyiForecastComparison.setYyErrorRateTwo((subtract).divide(no3Hlj1Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                             tXinyiForecastComparison.setYyTwoSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
                         }
+                        if(!Objects.isNull(jlForecastTwo)){
+                            BigDecimal subtract = no3Hlj1Jqr.subtract(jlForecastTwo);
+                            tXinyiForecastComparison.setJlErrorRateTwo((subtract).divide(no3Hlj1Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
+                            tXinyiForecastComparison.setJlTwoSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
+                        }
                     }
                 }
 
@@ -812,6 +829,11 @@ public class AsyncTask {
                             tXinyiForecastComparison.setYyErrorRateTwo((subtract).divide(no3Hlj2Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                             tXinyiForecastComparison.setYyTwoSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
                         }
+                        if(!Objects.isNull(jlForecastTwo)){
+                            BigDecimal subtract = no3Hlj2Jqr.subtract(jlForecastTwo);
+                            tXinyiForecastComparison.setJlErrorRateTwo((subtract).divide(no3Hlj2Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
+                            tXinyiForecastComparison.setJlTwoSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
+                        }
                     }
                 }
 
@@ -908,6 +930,7 @@ public class AsyncTask {
             for (TXinyiForecastComparison tXinyiForecastComparison : tXinyiForecastComparisons3) {
                 BigDecimal hsForecastThree = tXinyiForecastComparison.getHsForecastThree();
                 BigDecimal yyForecastThree = tXinyiForecastComparison.getYyForecastThree();
+                BigDecimal jlForecastThree = tXinyiForecastComparison.getJlForecastThree();
                 /*if(XSY1.equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealThree(no3Hlj1Jqr);
                     if(!Objects.isNull(no3Hlj1Jqr) && no3Hlj1Jqr.compareTo(BigDecimal.ZERO) > 0){
@@ -942,6 +965,11 @@ public class AsyncTask {
                             tXinyiForecastComparison.setYyErrorRateThree((subtract).divide(no3Hlj1Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                             tXinyiForecastComparison.setYyThreeSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
                         }
+                        if(!Objects.isNull(jlForecastThree)){
+                            BigDecimal subtract = no3Hlj1Jqr.subtract(jlForecastThree);
+                            tXinyiForecastComparison.setJlErrorRateThree((subtract).divide(no3Hlj1Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
+                            tXinyiForecastComparison.setJlThreeSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
+                        }
                     }
                 }
 
@@ -959,6 +987,11 @@ public class AsyncTask {
                             tXinyiForecastComparison.setYyErrorRateThree((subtract).divide(no3Hlj2Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                             tXinyiForecastComparison.setYyThreeSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
                         }
+                        if(!Objects.isNull(jlForecastThree)){
+                            BigDecimal subtract = no3Hlj2Jqr.subtract(jlForecastThree);
+                            tXinyiForecastComparison.setJlErrorRateThree((subtract).divide(no3Hlj2Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
+                            tXinyiForecastComparison.setJlThreeSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
+                        }
                     }
                 }
 

+ 3 - 4
slibra-system/src/main/java/com/slibra/business/service/impl/TXinyiForecastComparisonServiceImpl.java

@@ -127,8 +127,8 @@ public class TXinyiForecastComparisonServiceImpl implements ITXinyiForecastCompa
         //获取日期集合
         //把最新的一条数据的最后两个点的预测值补上
         TXinyiForecastComparison tXinyiForecastComparison = list.get(list.size() - 1);
-        timeList.add(tXinyiForecastComparison.getForecastTimeTwo());
-        timeList.add(tXinyiForecastComparison.getForecastTimeThree());
+        /*timeList.add(tXinyiForecastComparison.getForecastTimeTwo());
+        timeList.add(tXinyiForecastComparison.getForecastTimeThree());*/
         jsonObject.put("time", timeList);
         //获取数据集合
         //把最新的一条数据的最后两个点的预测值补上
@@ -178,8 +178,7 @@ public class TXinyiForecastComparisonServiceImpl implements ITXinyiForecastCompa
     private JSONObject getRealByTXinyiForecastComparison(List<TXinyiForecastComparison> list, List<String> timeList) {
         JSONObject jsonObject = new JSONObject();
         //获取日期集合
-        List<String> tempList = timeList;//因为后续会赋值,这里要用个变量接收下
-        jsonObject.put("time", tempList);
+        jsonObject.put("time", timeList);
         //获取数据集合
         jsonObject.put("data", list.stream().map(TXinyiForecastComparison::getRealOne).collect(Collectors.toList()));
         return jsonObject;