预测报警图表展示取值来源调整 小数位调整 写死值改成枚举

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

@@ -955,27 +955,14 @@ public class RyTask
                 TXinyiIndustry tXinyiIndustryTemp = tXinyiIndustries6.get(5 - i);
                 ChartBasic chartBasic = new ChartBasic();
                 chartBasic.setTime(tXinyiIndustryTemp.getTestHour().substring(11));
-                //2024年6月25日10:10:38 bug修改，需要判断类型赋不同的值
-                if(BusinessEnum.BigModelForecastEnum.TN.getCode().equalsIgnoreCase(category)
-                    || BusinessEnum.BigModelForecastEnum.XSY1.getCode().equalsIgnoreCase(category)
-                        || BusinessEnum.BigModelForecastEnum.XSY2.getCode().equalsIgnoreCase(category))
-                    chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiIndustryTemp.getCsTn(), INT_2));
-                if(BusinessEnum.BigModelForecastEnum.COD.getCode().equalsIgnoreCase(category))
-                    chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiIndustryTemp.getCsCod(), INT_2));
-                if(BusinessEnum.BigModelForecastEnum.SS.getCode().equalsIgnoreCase(category))
-                    chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiIndustryTemp.getCsSs(), INT_2));
-                if(BusinessEnum.BigModelForecastEnum.TP.getCode().equalsIgnoreCase(category)
-                    || BusinessEnum.BigModelForecastEnum.ZLSY.getCode().equalsIgnoreCase(category))
-                    chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiIndustryTemp.getCsTp(), INT_2));
-                if(BusinessEnum.BigModelForecastEnum.NH3.getCode().equalsIgnoreCase(category))
-                    chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiIndustryTemp.getCsNh3(), INT_2));
+                chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiIndustryTemp.getCsCod(), INT_2));
                 chartsDataList.add(chartBasic);
             }
             for (int i = 0; i < split.length; i++) {
                 String val = split[i];
                 ChartBasic chartBasic = new ChartBasic();
                 chartBasic.setTime(hours[i]);
-                chartBasic.setVal(new BigDecimal(val));
+                chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
                 chartsDataList.add(chartBasic);
             }
             handleXinYiWarningsYC(cscodBzz, split, cscodGkz, BusinessEnum.WarningCategoryEnum.CS_COD_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
@@ -1000,14 +987,14 @@ public class RyTask
                 TXinyiIndustry tXinyiIndustryTemp = tXinyiIndustries6.get(5 - i);
                 ChartBasic chartBasic = new ChartBasic();
                 chartBasic.setTime(tXinyiIndustryTemp.getTestHour().substring(11));
-                chartBasic.setVal(tXinyiIndustryTemp.getCsSs());
+                chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiIndustryTemp.getCsSs(), INT_2));
                 chartsDataList.add(chartBasic);
             }
             for (int i = 0; i < split.length; i++) {
                 String val = split[i];
                 ChartBasic chartBasic = new ChartBasic();
                 chartBasic.setTime(hours[i]);
-                chartBasic.setVal(new BigDecimal(val));
+                chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
                 chartsDataList.add(chartBasic);
             }
             handleXinYiWarningsYC(csSSBzz, split, csssGkz, BusinessEnum.WarningCategoryEnum.CS_SS_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsSs(), tXinyiIndustry, chartsDataList, date);
@@ -1032,14 +1019,14 @@ public class RyTask
                 TXinyiIndustry tXinyiIndustryTemp = tXinyiIndustries6.get(5 - i);
                 ChartBasic chartBasic = new ChartBasic();
                 chartBasic.setTime(tXinyiIndustryTemp.getTestHour().substring(11));
-                chartBasic.setVal(tXinyiIndustryTemp.getCsTn());
+                chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiIndustryTemp.getCsTn(), INT_2));
                 chartsDataList.add(chartBasic);
             }
             for (int i = 0; i < split.length; i++) {
                 String val = split[i];
                 ChartBasic chartBasic = new ChartBasic();
                 chartBasic.setTime(hours[i]);
-                chartBasic.setVal(new BigDecimal(val));
+                chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
                 chartsDataList.add(chartBasic);
             }
             handleXinYiWarningsYC(cszzBzz, split, cszzGkz, BusinessEnum.WarningCategoryEnum.CS_TN_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
@@ -1060,18 +1047,18 @@ public class RyTask
             BigDecimal cszlBzz = normConfig.getCszlBzz();
             BigDecimal cszlGkz = normConfig.getCszlGkz();
             //处理展示数据
-            for (int i = 0; i < tXinyiIndustries6.size(); i++) {
-                TXinyiIndustry tXinyiIndustryTemp = tXinyiIndustries6.get(5 - i);
+            for (int i = 0; i < tXinyiRobots6.size(); i++) {
+                TXinyiRobot tXinyiRobotTemp = tXinyiRobots6.get(5 - i);
                 ChartBasic chartBasic = new ChartBasic();
-                chartBasic.setTime(tXinyiIndustryTemp.getTestHour().substring(11));
-                chartBasic.setVal(tXinyiIndustryTemp.getCsTp());
+                chartBasic.setTime(tXinyiRobotTemp.getTestHour().substring(11));
+                chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiRobotTemp.getTpRccJqr(), INT_2));
                 chartsDataList.add(chartBasic);
             }
             for (int i = 0; i < split.length; i++) {
                 String val = split[i];
                 ChartBasic chartBasic = new ChartBasic();
                 chartBasic.setTime(hours[i]);
-                chartBasic.setVal(new BigDecimal(val));
+                chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
                 chartsDataList.add(chartBasic);
             }
             handleXinYiWarningsYC(cszlBzz, split, cszlGkz, BusinessEnum.WarningCategoryEnum.CS_TP_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsTp(), tXinyiIndustry, chartsDataList, date);
@@ -1096,14 +1083,14 @@ public class RyTask
                 TXinyiIndustry tXinyiIndustryTemp = tXinyiIndustries6.get(5 - i);
                 ChartBasic chartBasic = new ChartBasic();
                 chartBasic.setTime(tXinyiIndustryTemp.getTestHour().substring(11));
-                chartBasic.setVal(tXinyiIndustryTemp.getCsNh3());
+                chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiIndustryTemp.getCsNh3(), INT_2));
                 chartsDataList.add(chartBasic);
             }
             for (int i = 0; i < split.length; i++) {
                 String val = split[i];
                 ChartBasic chartBasic = new ChartBasic();
                 chartBasic.setTime(hours[i]);
-                chartBasic.setVal(new BigDecimal(val));
+                chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
                 chartsDataList.add(chartBasic);
             }
             handleXinYiWarningsYC(csadBzz, split, csadGkz, BusinessEnum.WarningCategoryEnum.CS_AD_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsNh3(), tXinyiIndustry, chartsDataList, date);
@@ -1132,14 +1119,14 @@ public class RyTask
                 TXinyiRobot tXinyiRobotTemp = tXinyiRobots6.get(5 - i);
                 ChartBasic chartBasic = new ChartBasic();
                 chartBasic.setTime(tXinyiRobotTemp.getTestHour().substring(11));
-                chartBasic.setVal(tXinyiRobotTemp.getNo3Hlj1Jqr());
+                chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiRobotTemp.getNo3Hlj1Jqr(), INT_2));
                 chartsDataList.add(chartBasic);
             }
             for (int i = 0; i < split.length; i++) {
                 String val = split[i];
                 ChartBasic chartBasic = new ChartBasic();
                 chartBasic.setTime(hours[i]);
-                chartBasic.setVal(new BigDecimal(val));
+                chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
                 chartsDataList.add(chartBasic);
             }
             handleXinYiWarningsYC(cszzBzz, split, cszzGkz, BusinessEnum.WarningCategoryEnum.CS_XSY_1_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
@@ -1167,14 +1154,14 @@ public class RyTask
                 TXinyiRobot tXinyiRobotTemp = tXinyiRobots6.get(5 - i);
                 ChartBasic chartBasic = new ChartBasic();
                 chartBasic.setTime(tXinyiRobotTemp.getTestHour().substring(11));
-                chartBasic.setVal(tXinyiRobotTemp.getNo3Hlj2Jqr());
+                chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiRobotTemp.getNo3Hlj2Jqr(), INT_2));
                 chartsDataList.add(chartBasic);
             }
             for (int i = 0; i < split.length; i++) {
                 String val = split[i];
                 ChartBasic chartBasic = new ChartBasic();
                 chartBasic.setTime(hours[i]);
-                chartBasic.setVal(new BigDecimal(val));
+                chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
                 chartsDataList.add(chartBasic);
             }
             handleXinYiWarningsYC(cszzBzz, split, cszzGkz, BusinessEnum.WarningCategoryEnum.CS_XSY_2_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);