预测相关的showval字段展示处理

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

@@ -864,11 +864,11 @@ public class RyTask
         JSONObject result = new JSONObject();
 //        JSONObject basic = new JSONObject();
         Integer status = tXinyiWarningRecord.getStatus();
-        Date warningTime = tXinyiWarningRecord.getTime();
+        /*Date warningTime = tXinyiWarningRecord.getTime();
         String remark = tXinyiWarningRecord.getRemark();
-        int count = DateUtils.differentHoursByMillisecond(warningTime, DateUtils.getNowDate()) + 1;
+        int count = DateUtils.differentHoursByMillisecond(warningTime, DateUtils.getNowDate()) + 1;*/
         ShowValueChartBasic showValueChartBasic = new ShowValueChartBasic();
-        if("0".equals(remark)){//水质报警
+        /*if("0".equals(remark)){//水质报警
             showValueChartBasic.setH("在线仪表");
         }else if("1".equals(remark)){//生化报警
             showValueChartBasic.setH("在线仪表");
@@ -876,10 +876,11 @@ public class RyTask
             showValueChartBasic.setH("预测");
         }else {//机器人化验室报警
             showValueChartBasic.setH("化验室");
-        }
+        }*/
         //通用的
         //        showValueBasic.setA(tXinyiWarningRecord.getReason());
-        showValueChartBasic.setB(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM ,warningTime));
+        //2024年6月23日17:01:30 预警时间改成当前时间
+        showValueChartBasic.setB(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM ,DateUtils.getNowDate()));
         showValueChartBasic.setC(date + " " + yjHour);//预计超标时间
         showValueChartBasic.setD(tXinyiWarningRecord.getWarningVal());
         showValueChartBasic.setE(tXinyiWarningRecord.getForecastVal());
@@ -1437,7 +1438,7 @@ public class RyTask
                 chartBasic.setVal(new BigDecimal(val));
                 chartsDataList.add(chartBasic);
             }
-            handleXinYiWarningsYC(cscodBzz, split, cscodGkz, BusinessEnum.WarningCategoryEnum.CS_TN_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
+            handleXinYiWarningsYC(cscodBzz, split, cscodGkz, BusinessEnum.WarningCategoryEnum.CS_TN_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsTn(), tXinyiIndustry, chartsDataList, date);
         //插入到数据库
         //2024年6月21日14:18:55  如果红杉预测和跃渊预测都有数据再保存
         if(Objects.isNull(tXinyiForecastComparison.getHsForecastOne()) || Objects.isNull(tXinyiForecastComparison.getHsForecastTwo()) ||Objects.isNull(tXinyiForecastComparison.getHsForecastThree())
@@ -1549,7 +1550,7 @@ public class RyTask
                 chartBasic.setVal(new BigDecimal(val));
                 chartsDataList.add(chartBasic);
             }
-            handleXinYiWarningsYC(csSSBzz, split, csssGkz, BusinessEnum.WarningCategoryEnum.CS_SS_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
+            handleXinYiWarningsYC(csSSBzz, split, csssGkz, BusinessEnum.WarningCategoryEnum.CS_SS_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsSs(), tXinyiIndustry, chartsDataList, date);
         }/*else if("tn".equals(task)){
             //同时调用跃渊的预测接口 保存记录值
             try {
@@ -1613,7 +1614,7 @@ public class RyTask
                 chartBasic.setVal(new BigDecimal(val));
                 chartsDataList.add(chartBasic);
             }
-            handleXinYiWarningsYC(cszlBzz, split, cszlGkz, BusinessEnum.WarningCategoryEnum.CS_TP_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
+            handleXinYiWarningsYC(cszlBzz, split, cszlGkz, BusinessEnum.WarningCategoryEnum.CS_TP_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsTp(), tXinyiIndustry, chartsDataList, date);
         }else if("nh3".equals(task)){
             //同时调用跃渊的预测接口 保存记录值
             try {
@@ -1645,7 +1646,7 @@ public class RyTask
                 chartBasic.setVal(new BigDecimal(val));
                 chartsDataList.add(chartBasic);
             }
-            handleXinYiWarningsYC(csadBzz, split, csadGkz, BusinessEnum.WarningCategoryEnum.CS_AD_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
+            handleXinYiWarningsYC(csadBzz, split, csadGkz, BusinessEnum.WarningCategoryEnum.CS_AD_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsNh3(), tXinyiIndustry, chartsDataList, date);
         }/*else if("xsy1".equals(task)){
             //2024年6月21日14:57:02 红杉的出水总氮预测改成 不用工业库的，用化验科的两个xsy 相关指标
             //同时调用跃渊的预测接口 保存记录值

slibra-system/src/main/java/com/slibra/business/res/ShowValueChartBasic.java

@@ -31,14 +31,14 @@ public class ShowValueChartBasic {
     @JSONField(ordinal = 5, name = "预测值")
     private BigDecimal e;
 
-    @JSONField(ordinal = 6, name = "管控制")
+    @JSONField(ordinal = 6, name = "管控值")
     private BigDecimal f;
 
     @JSONField(ordinal = 7, name = "标准值")
     private BigDecimal g;
 
-    @JSONField(ordinal = 8, name = "数据来源")
-    private String h;
+    /*@JSONField(ordinal = 8, name = "数据来源")
+    private String h;*/
 
     @JSONField(ordinal = 9, name = "状态")
     private String i;

slibra-system/src/main/java/com/slibra/business/res/XinyiIndustrySimple.java

@@ -160,7 +160,7 @@ public class XinyiIndustrySimple {
 
 
 
-    //管控制
+    //管控值
     /** 进水COD设计值 */
     @Excel(name = "进水COD设计值")
     private BigDecimal jscodSjz;