优化 调整到枚举 名称调整 预测结果比对取值bug调整

slibra-common/src/main/java/com/slibra/common/constant/MyConstants.java

@@ -74,7 +74,15 @@ public class MyConstants {
     public static final String WARNING_DEFAULT_QUESTION= "在线仪表数据异常";
     public static final String WARNING_DEFAULT_CREATE = "task-job";
     public static final String DEFAULT_ID_IDENTIFIER = "@@id@@";
-    public static final String ZLSY = "zlsy";//正磷酸盐
+
+//    public static final String ZLSY = "zlsy";//正磷酸盐
+//    public static final String XSY1 = "xsy1";//正磷酸盐
+//    public static final String XSY2 = "xsy2";//正磷酸盐
+//    public static final String TN = "tn";//总氮
+//    public static final String COD = "cod";//cod
+//    public static final String SS = "ss";//ss
+//    public static final String NH3 = "nh3";//nh3
+//    public static final String TP = "tp";//tp
     public static final int MAX_COUNT = 30;
     public static final int INT_2 = 2;
     public static final int INT_10000 = 10000;//10秒钟

slibra-common/src/main/java/com/slibra/common/enums/BusinessEnum.java

@@ -146,4 +146,41 @@ public class BusinessEnum {
             return msg;
         }
     }
+
+
+
+    /**
+     * 预测调用参数枚举
+     */
+    public enum BigModelForecastEnum
+    {
+        ZLSY("zlsy", "zlsy"),
+        XSY1("xsy1", "xsy1"),
+        XSY2("xsy2", "xsy2"),
+        TN("tn", "tn"),
+        COD("cod", "cod"),
+        SS("ss", "ss"),
+        NH3("nh3", "nh3"),
+        TP("tp", "tp"),
+        ;
+
+        private final String code;
+        private final String msg;
+
+        BigModelForecastEnum(String code, String msg)
+        {
+            this.code = code;
+            this.msg = msg;
+        }
+
+        public String getCode()
+        {
+            return code;
+        }
+
+        public String getMsg()
+        {
+            return msg;
+        }
+    }
 }

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

@@ -228,7 +228,7 @@ public class AsyncTask {
             for (TXinyiForecastComparison tXinyiForecastComparison : tXinyiForecastComparisons1) {
                 BigDecimal hsForecastOne = tXinyiForecastComparison.getHsForecastOne();
                 BigDecimal yyForecastOne = tXinyiForecastComparison.getYyForecastOne();
-                if("cod".equals(tXinyiForecastComparison.getCategory())){
+                if(BusinessEnum.BigModelForecastEnum.COD.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealOne(csCod);
                     if(!Objects.isNull(csCod) && csCod.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastOne)){
@@ -243,7 +243,7 @@ public class AsyncTask {
                         }
                     }
                 }
-                if("ss".equals(tXinyiForecastComparison.getCategory())){
+                if(BusinessEnum.BigModelForecastEnum.SS.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealOne(csSs);
                     if(!Objects.isNull(csSs) && csSs.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastOne)){
@@ -259,7 +259,7 @@ public class AsyncTask {
                     }
                 }
                 //2024年6月21日16:28:56 tn总氮的预测用xsy1和xsy2计算 并从化验库获取
-                /*if("tn".equals(tXinyiForecastComparison.getCategory())){
+                /*if(TN.equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealOne(csTn);
                     if(!Objects.isNull(csTn) && csTn.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastOne))
@@ -269,14 +269,14 @@ public class AsyncTask {
                     }
                 }*/
                 //2024年6月20日11:16:55 出水总磷的真实值从化验室获取
-                /*if("tp".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("nh3".equals(tXinyiForecastComparison.getCategory())){
+                if(BusinessEnum.BigModelForecastEnum.NH3.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealOne(csNh3);
                     if(!Objects.isNull(csNh3) && csNh3.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastOne)){
@@ -300,7 +300,7 @@ public class AsyncTask {
             for (TXinyiForecastComparison tXinyiForecastComparison : tXinyiForecastComparisons2) {
                 BigDecimal hsForecastTwo = tXinyiForecastComparison.getHsForecastTwo();
                 BigDecimal yyForecastTwo = tXinyiForecastComparison.getYyForecastTwo();
-                if("cod".equals(tXinyiForecastComparison.getCategory())){
+                if(BusinessEnum.BigModelForecastEnum.COD.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealTwo(csCod);
                     if(!Objects.isNull(csCod) && csCod.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastTwo)){
@@ -315,7 +315,7 @@ public class AsyncTask {
                         }
                     }
                 }
-                if("ss".equals(tXinyiForecastComparison.getCategory())){
+                if(BusinessEnum.BigModelForecastEnum.SS.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealTwo(csSs);
                     if(!Objects.isNull(csSs) && csSs.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastTwo)){
@@ -330,7 +330,7 @@ public class AsyncTask {
                         }
                     }
                 }
-                /*if("tn".equals(tXinyiForecastComparison.getCategory())){
+                /*if(TN.equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealTwo(csTn);
                     if(!Objects.isNull(csTn) && csTn.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastTwo))
@@ -340,14 +340,14 @@ public class AsyncTask {
                     }
                 }*/
                 //2024年6月20日11:16:55 出水总磷的真实值从化验室获取
-                /*if("tp".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("nh3".equals(tXinyiForecastComparison.getCategory())){
+                if(BusinessEnum.BigModelForecastEnum.NH3.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealTwo(csNh3);
                     if(!Objects.isNull(csNh3) && csNh3.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastTwo)){
@@ -371,7 +371,7 @@ public class AsyncTask {
             for (TXinyiForecastComparison tXinyiForecastComparison : tXinyiForecastComparisons3) {
                 BigDecimal hsForecastThree = tXinyiForecastComparison.getHsForecastThree();
                 BigDecimal yyForecastThree = tXinyiForecastComparison.getYyForecastThree();
-                if("cod".equals(tXinyiForecastComparison.getCategory())){
+                if(BusinessEnum.BigModelForecastEnum.COD.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealThree(csCod);
                     if(!Objects.isNull(csCod) && csCod.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastThree)){
@@ -386,7 +386,7 @@ public class AsyncTask {
                         }
                     }
                 }
-                if("ss".equals(tXinyiForecastComparison.getCategory())){
+                if(BusinessEnum.BigModelForecastEnum.SS.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealThree(csSs);
                     if(!Objects.isNull(csSs) && csSs.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastThree)){
@@ -401,7 +401,7 @@ public class AsyncTask {
                         }
                     }
                 }
-                /*if("tn".equals(tXinyiForecastComparison.getCategory())){
+                /*if(TN.equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealThree(csTn);
                     if(!Objects.isNull(csTn) && csTn.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastThree))
@@ -411,14 +411,14 @@ public class AsyncTask {
                     }
                 }*/
                 //2024年6月20日11:16:55 出水总磷的真实值从化验室获取
-                /*if("tp".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("nh3".equals(tXinyiForecastComparison.getCategory())){
+                if(BusinessEnum.BigModelForecastEnum.NH3.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealThree(csNh3);
                     if(!Objects.isNull(csNh3) && csNh3.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastThree)){
@@ -466,7 +466,7 @@ public class AsyncTask {
             for (TXinyiForecastComparison tXinyiForecastComparison : tXinyiForecastComparisons1) {
                 BigDecimal hsForecastOne = tXinyiForecastComparison.getHsForecastOne();
                 BigDecimal yyForecastOne = tXinyiForecastComparison.getYyForecastOne();
-                /*if("xsy1".equals(tXinyiForecastComparison.getCategory())){
+                /*if(XSY1.equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealOne(no3Hlj1Jqr);
                     if(!Objects.isNull(no3Hlj1Jqr) && no3Hlj1Jqr.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastOne))
@@ -475,7 +475,7 @@ public class AsyncTask {
                             tXinyiForecastComparison.setYyErrorRateOne((no3Hlj1Jqr.subtract(yyForecastOne)).divide(no3Hlj1Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                     }
                 }
-                if("xsy2".equals(tXinyiForecastComparison.getCategory())){
+                if(XSY2.equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealOne(no3Hlj2Jqr);
                     if(!Objects.isNull(no3Hlj2Jqr) && no3Hlj2Jqr.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastOne))
@@ -484,8 +484,11 @@ public class AsyncTask {
                             tXinyiForecastComparison.setYyErrorRateOne((no3Hlj2Jqr.subtract(yyForecastOne)).divide(no3Hlj2Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                     }
                 }*/
-                //2024年6月21日17:04:01  总磷的真实值也从化验室获取
-                if("tn".equals(tXinyiForecastComparison.getCategory())){
+                //2024年6月21日17:04:01  总氮的真实值也从化验室获取
+                //2024年7月12日10:31:29  tn又改成xsy1和xsy2了。。。
+                if(BusinessEnum.BigModelForecastEnum.TN.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())
+                    || BusinessEnum.BigModelForecastEnum.XSY1.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())
+                        || BusinessEnum.BigModelForecastEnum.XSY2.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealOne(csTn);
                     if(!Objects.isNull(csTn) && csTn.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastOne)){
@@ -503,8 +506,8 @@ public class AsyncTask {
 
                 //2024年6月20日11:14:42  总磷的真实值也从化验室获取
                 //2024年7月11日17:08:51 tp改名字了。。。
-                if("tp".equalsIgnoreCase(tXinyiForecastComparison.getCategory())
-                    || ZLSY.equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
+                if(BusinessEnum.BigModelForecastEnum.TP.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())
+                    || BusinessEnum.BigModelForecastEnum.ZLSY.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealOne(csTp);
                     if(!Objects.isNull(csTp) && csTp.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastOne)){
@@ -528,7 +531,7 @@ public class AsyncTask {
             for (TXinyiForecastComparison tXinyiForecastComparison : tXinyiForecastComparisons2) {
                 BigDecimal hsForecastTwo = tXinyiForecastComparison.getHsForecastTwo();
                 BigDecimal yyForecastTwo = tXinyiForecastComparison.getYyForecastTwo();
-                /*if("xsy1".equals(tXinyiForecastComparison.getCategory())){
+                /*if(XSY1.equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealTwo(no3Hlj1Jqr);
                     if(!Objects.isNull(no3Hlj1Jqr) && no3Hlj1Jqr.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastTwo))
@@ -537,7 +540,7 @@ public class AsyncTask {
                             tXinyiForecastComparison.setYyErrorRateTwo((no3Hlj1Jqr.subtract(yyForecastTwo)).divide(no3Hlj1Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                     }
                 }
-                if("xsy2".equals(tXinyiForecastComparison.getCategory())){
+                if(XSY2.equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealTwo(no3Hlj2Jqr);
                     if(!Objects.isNull(no3Hlj2Jqr) && no3Hlj2Jqr.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastTwo))
@@ -546,8 +549,11 @@ public class AsyncTask {
                             tXinyiForecastComparison.setYyErrorRateTwo((no3Hlj2Jqr.subtract(yyForecastTwo)).divide(no3Hlj2Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                     }
                 }*/
-                //2024年6月21日17:04:01  总磷的真实值也从化验室获取
-                if("tn".equals(tXinyiForecastComparison.getCategory())){
+                //2024年6月21日17:04:01  总氮的真实值也从化验室获取
+                //2024年7月12日10:31:29  tn又改成xsy1和xsy2了。。。
+                if(BusinessEnum.BigModelForecastEnum.TN.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())
+                        || BusinessEnum.BigModelForecastEnum.XSY1.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())
+                        || BusinessEnum.BigModelForecastEnum.XSY2.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealTwo(csTn);
                     if(!Objects.isNull(csTn) && csTn.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastTwo)){
@@ -565,8 +571,8 @@ public class AsyncTask {
 
                 //2024年6月20日11:14:42  总磷的真实值也从化验室获取
                 //2024年7月11日17:08:51 tp改名字了。。。
-                if("tp".equalsIgnoreCase(tXinyiForecastComparison.getCategory())
-                        || ZLSY.equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
+                if(BusinessEnum.BigModelForecastEnum.TP.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())
+                        || BusinessEnum.BigModelForecastEnum.ZLSY.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealTwo(csTp);
                     if(!Objects.isNull(csTp) && csTp.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastTwo)){
@@ -590,7 +596,7 @@ public class AsyncTask {
             for (TXinyiForecastComparison tXinyiForecastComparison : tXinyiForecastComparisons3) {
                 BigDecimal hsForecastThree = tXinyiForecastComparison.getHsForecastThree();
                 BigDecimal yyForecastThree = tXinyiForecastComparison.getYyForecastThree();
-                /*if("xsy1".equals(tXinyiForecastComparison.getCategory())){
+                /*if(XSY1.equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealThree(no3Hlj1Jqr);
                     if(!Objects.isNull(no3Hlj1Jqr) && no3Hlj1Jqr.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastThree))
@@ -599,7 +605,7 @@ public class AsyncTask {
                             tXinyiForecastComparison.setYyErrorRateThree((no3Hlj1Jqr.subtract(yyForecastThree)).divide(no3Hlj1Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                     }
                 }
-                if("xsy2".equals(tXinyiForecastComparison.getCategory())){
+                if(XSY2.equals(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealThree(no3Hlj2Jqr);
                     if(!Objects.isNull(no3Hlj2Jqr) && no3Hlj2Jqr.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastThree))
@@ -608,8 +614,11 @@ public class AsyncTask {
                             tXinyiForecastComparison.setYyErrorRateThree((no3Hlj2Jqr.subtract(yyForecastThree)).divide(no3Hlj2Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
                     }
                 }*/
-                //2024年6月21日17:04:01  总磷的真实值也从化验室获取
-                if("tn".equals(tXinyiForecastComparison.getCategory())){
+                //2024年6月21日17:04:01  总氮的真实值也从化验室获取
+                //2024年7月12日10:31:29  tn又改成xsy1和xsy2了。。。
+                if(BusinessEnum.BigModelForecastEnum.TN.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())
+                        || BusinessEnum.BigModelForecastEnum.XSY1.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())
+                        || BusinessEnum.BigModelForecastEnum.XSY2.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealThree(csTn);
                     if(!Objects.isNull(csTn) && csTn.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastThree)){
@@ -627,8 +636,8 @@ public class AsyncTask {
 
                 //2024年6月20日11:14:42  总磷的真实值也从化验室获取
                 //2024年7月11日17:08:51 tp改名字了。。。
-                if("tp".equalsIgnoreCase(tXinyiForecastComparison.getCategory())
-                        || ZLSY.equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
+                if(BusinessEnum.BigModelForecastEnum.TP.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())
+                        || BusinessEnum.BigModelForecastEnum.ZLSY.getCode().equalsIgnoreCase(tXinyiForecastComparison.getCategory())){
                     tXinyiForecastComparison.setRealThree(csTp);
                     if(!Objects.isNull(csTp) && csTp.compareTo(BigDecimal.ZERO) > 0){
                         if(!Objects.isNull(hsForecastThree)){
@@ -1383,7 +1392,7 @@ public class AsyncTask {
             showValueSHBasic.setH("预测");
 //                showValueCSBasic.setF(tXinyiWarningRecord.getLevel());
         }else {//机器人化验室报警（特殊的 水质报警）
-            showValueSHBasic.setH("化验室");
+            showValueSHBasic.setH("连续监测");
             showValueSHBasic.setF(tXinyiWarningRecord.getLevel());
         }*/
         //生化报警固定了
@@ -1441,7 +1450,7 @@ public class AsyncTask {
                 showValueCSBasic.setH("预测");
 //                showValueCSBasic.setF(tXinyiWarningRecord.getLevel());
             }else {//机器人化验室报警（特殊的水质报警）
-                showValueCSBasic.setH("化验室");
+                showValueCSBasic.setH("连续监测");
                 showValueCSBasic.setF(tXinyiWarningRecord.getLevel());
             }
             //通用的
@@ -1468,7 +1477,7 @@ public class AsyncTask {
                 showValueJSBasic.setH("预测");
 //                showValueCSBasic.setF(tXinyiWarningRecord.getLevel());
             }else {//机器人化验室报警（特殊的 水质报警）
-                showValueJSBasic.setH("化验室");
+                showValueJSBasic.setH("连续监测");
                 showValueJSBasic.setF(tXinyiWarningRecord.getLevel());
             }
             //通用的

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

@@ -433,7 +433,7 @@ public class RyTask
         }else if("2".equals(remark)){//预测报错
             showValueChartBasic.setH("预测");
         }else {//机器人化验室报警
-            showValueChartBasic.setH("化验室");
+            showValueChartBasic.setH("连续监测");
         }*/
         //通用的
         //        showValueBasic.setA(tXinyiWarningRecord.getReason());
@@ -901,7 +901,7 @@ public class RyTask
         //2024年6月18日10:36:49 增加预测记录，预测准确度计算等
         TXinyiForecastComparison tXinyiForecastComparison = new TXinyiForecastComparison();
         //2024年7月11日17:04:11 TP改为zlsy
-        tXinyiForecastComparison.setCategory("tp".equalsIgnoreCase(task) ? ZLSY : task);
+        tXinyiForecastComparison.setCategory(BusinessEnum.BigModelForecastEnum.TP.getCode().equalsIgnoreCase(task) ? BusinessEnum.BigModelForecastEnum.ZLSY.getCode() : task);
         tXinyiForecastComparison.setForecastTimeOne(dates[0].replaceAll("-", "/") + " " + hours[0]);
         tXinyiForecastComparison.setForecastTimeTwo(dates[1].replaceAll("-", "/") + " " + hours[1]);
         tXinyiForecastComparison.setForecastTimeThree(dates[2].replaceAll("-", "/") + " " + hours[2]);
@@ -956,15 +956,18 @@ public class RyTask
                 ChartBasic chartBasic = new ChartBasic();
                 chartBasic.setTime(tXinyiIndustryTemp.getTestHour().substring(11));
                 //2024年6月25日10:10:38 bug修改，需要判断类型赋不同的值
-                if("tn".equals(category))//这种情况没有了
+                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("cod".equals(category))
+                if(BusinessEnum.BigModelForecastEnum.COD.getCode().equalsIgnoreCase(category))
                     chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiIndustryTemp.getCsCod(), INT_2));
-                if("ss".equals(category))
+                if(BusinessEnum.BigModelForecastEnum.SS.getCode().equalsIgnoreCase(category))
                     chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiIndustryTemp.getCsSs(), INT_2));
-                if("tp".equals(category))
+                if(BusinessEnum.BigModelForecastEnum.TP.getCode().equalsIgnoreCase(category)
+                    || BusinessEnum.BigModelForecastEnum.ZLSY.getCode().equalsIgnoreCase(category))
                     chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiIndustryTemp.getCsTp(), INT_2));
-                if("nh3".equals(category))
+                if(BusinessEnum.BigModelForecastEnum.NH3.getCode().equalsIgnoreCase(category))
                     chartBasic.setVal(DecimalUtils.getAbsAndScale(tXinyiIndustryTemp.getCsNh3(), INT_2));
                 chartsDataList.add(chartBasic);
             }