预测对应的类型描述枚举调整 判断大模型返回改用枚举

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

@@ -39,13 +39,13 @@ public class BusinessEnum {
         HYQDO_ONE("好氧区DO#1", "好氧区DO#1"),
         HYQDO_TWO("好氧区DO#2", "好氧区DO#2"),
         QSB("气水比", "气水比"),
-        CS_COD_YC("cod", "cod"),
-        CS_SS_YC("ss", "ss"),
+        CS_COD_YC("出水COD", "出水COD"),
+        CS_SS_YC("出水SS", "出水SS"),
         CS_TN_YC("出水总氮", "出水总氮"),
         CS_TP_YC("二沉池正磷酸盐", "二沉池正磷酸盐 "),
-        CS_AD_YC("氨氮", "氨氮"),
-        CS_XSY_1_YC("#1好氧硝酸盐", "#1好氧硝酸盐"),
-        CS_XSY_2_YC("#2好氧硝酸盐", "#2好氧硝酸盐"),
+        CS_AD_YC("出水氨氮", "出水氨氮"),
+        CS_XSY_1_YC("1号好氧池硝酸盐", "1号好氧池硝酸盐"),
+        CS_XSY_2_YC("2号好氧池硝酸盐", "2号好氧池硝酸盐"),
         WNND_MLSS_1("污泥浓度MLSS#1", "污泥浓度MLSS#1"),
         WNND_MLSS_2("污泥浓度MLSS#2", "污泥浓度MLSS#2"),
         HFXWNNDZB("挥发性污泥浓度占比（MLVSS/MLSS）", "挥发性污泥浓度占比（MLVSS/MLSS）"),

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

@@ -934,7 +934,7 @@ public class RyTask
         //获取最新的工业库的数据
         TXinyiIndustry tXinyiIndustry = this.xinyiIndustryMapper.selectTXinyiIndustryNewest();
         List<ChartBasic> chartsDataList = new ArrayList<>(9);
-        if("cod".equals(task)){
+        if(BusinessEnum.BigModelForecastEnum.COD.getCode().equals(task)){
             //同时调用跃渊的预测接口 保存记录值
             try {
                 String result = HttpUtil.get("http://10.0.3.52:10003/system/forecast?type=2&time=" + DateUtil.format(DateUtils.getNowDate(), DateUtils.YYYY_MM_DD_HH), INT_10000);
@@ -979,7 +979,7 @@ public class RyTask
                 chartsDataList.add(chartBasic);
             }
             handleXinYiWarningsYC(cscodBzz, split, cscodGkz, BusinessEnum.WarningCategoryEnum.CS_COD_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
-        }else if("ss".equals(task)){
+        }else if(BusinessEnum.BigModelForecastEnum.SS.getCode().equals(task)){
             //同时调用跃渊的预测接口 保存记录值
             try {
                 String result = HttpUtil.get("http://10.0.3.52:10003/system/forecast?type=5&time=" + DateUtil.format(DateUtils.getNowDate(), DateUtils.YYYY_MM_DD_HH), INT_10000);
@@ -1011,7 +1011,7 @@ public class RyTask
                 chartsDataList.add(chartBasic);
             }
             handleXinYiWarningsYC(csSSBzz, split, csssGkz, BusinessEnum.WarningCategoryEnum.CS_SS_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsSs(), tXinyiIndustry, chartsDataList, date);
-        }/*else if("tn".equals(task)){
+        }/*else if(BusinessEnum.BigModelForecastEnum.TN.getCode().equals(task)){
             //同时调用跃渊的预测接口 保存记录值
             try {
                 String result = HttpUtil.get("http://10.0.3.52:10003/system/forecast?type=3&time=" + DateUtil.format(DateUtils.getNowDate(), DateUtils.YYYY_MM_DD_HH), INT_10);
@@ -1043,7 +1043,7 @@ public class RyTask
                 chartsDataList.add(chartBasic);
             }
             handleXinYiWarningsYC(cszzBzz, split, cszzGkz, BusinessEnum.WarningCategoryEnum.CS_TN_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
-        }*/else if("tp".equals(task)){
+        }*/else if(BusinessEnum.BigModelForecastEnum.TP.getCode().equals(task)){
             //同时调用跃渊的预测接口 保存记录值
             try {
                 String result = HttpUtil.get("http://10.0.3.52:10003/system/forecast?type=1&time=" + DateUtil.format(DateUtils.getNowDate(), DateUtils.YYYY_MM_DD_HH), INT_10000);
@@ -1075,7 +1075,7 @@ public class RyTask
                 chartsDataList.add(chartBasic);
             }
             handleXinYiWarningsYC(cszlBzz, split, cszlGkz, BusinessEnum.WarningCategoryEnum.CS_TP_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsTp(), tXinyiIndustry, chartsDataList, date);
-        }else if("nh3".equals(task)){
+        }else if(BusinessEnum.BigModelForecastEnum.NH3.getCode().equals(task)){
             //同时调用跃渊的预测接口 保存记录值
             try {
                 String result = HttpUtil.get("http://10.0.3.52:10003/system/forecast?type=4&time=" + DateUtil.format(DateUtils.getNowDate(), DateUtils.YYYY_MM_DD_HH), INT_10000);
@@ -1107,7 +1107,7 @@ public class RyTask
                 chartsDataList.add(chartBasic);
             }
             handleXinYiWarningsYC(csadBzz, split, csadGkz, BusinessEnum.WarningCategoryEnum.CS_AD_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsNh3(), tXinyiIndustry, chartsDataList, date);
-        }else if("xsy1".equals(task)){
+        }else if(BusinessEnum.BigModelForecastEnum.XSY1.getCode().equals(task)){
             //2024年6月21日14:57:02 红杉的出水总氮预测改成 不用工业库的，用化验科的两个xsy 相关指标
             //同时调用跃渊的预测接口 保存记录值
             try {
@@ -1143,7 +1143,7 @@ public class RyTask
                 chartsDataList.add(chartBasic);
             }
             handleXinYiWarningsYC(cszzBzz, split, cszzGkz, BusinessEnum.WarningCategoryEnum.CS_XSY_1_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
-        }else if("xsy2".equals(task)){
+        }else if(BusinessEnum.BigModelForecastEnum.XSY2.getCode().equals(task)){
             //同时调用跃渊的预测接口 保存记录值
             try {
                 String result = HttpUtil.get("http://10.0.3.52:10003/system/forecast?type=3&time=" + DateUtil.format(DateUtils.getNowDate(), DateUtils.YYYY_MM_DD_HH), INT_10000);