处理 机理模型预测

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

@@ -450,4 +450,40 @@ public class BusinessEnum {
             return msg;
         }
     }
+
+
+    /**
+     *
+     * 机理模型预测类型枚举
+     *
+     */
+    public enum JLModelPredictEnum
+    {
+        COD(0, "出水COD"),
+        NH3(1, "出水氨氮"),
+        TN(2, "出水总氮"),
+        TP(3, "出水正磷盐"),
+        AD(4, "缺氧氨氮"),
+        XSY(5, "缺氧硝酸盐"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        JLModelPredictEnum(Integer code, String msg)
+        {
+            this.code = code;
+            this.msg = msg;
+        }
+
+        public Integer getCode()
+        {
+            return code;
+        }
+
+        public String getMsg()
+        {
+            return msg;
+        }
+    }
 }

slibra-common/src/main/java/com/slibra/common/utils/DateUtils.java

@@ -228,6 +228,20 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     }
 
 
+    public static Date plusHour(int hour, Date current)
+    {
+
+        // 创建一个Calendar实例，并将日期设置为今天
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(current);
+        // 将日期设置为前一天
+        calendar.add(Calendar.HOUR, hour);
+
+        // 转换
+        return calendar.getTime();
+    }
+
+
     public static List<String> getAllDatesBetween(LocalDate startDate, LocalDate endDate) {
         List<String> dates = new ArrayList<>();
         LocalDate currentDate = startDate;
@@ -253,11 +267,12 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 
 
     public static void main(String[] args) {
-        Date nowDate = DateUtils.getNowDate();
+        /*Date nowDate = DateUtils.getNowDate();
         Date date = plusDate(1, nowDate);
         Date date1 = plusDate(-1, nowDate);
         System.out.println(date);
         System.out.println(date1);
-        System.out.println(getMonthsBefore("2024-02", 2));
+        System.out.println(getMonthsBefore("2024-02", 2));*/
+        System.out.println(plusHour(-1, getNowDate()));
     }
 }

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

@@ -133,6 +133,9 @@ public class RyTask
     @Autowired
     private TXinyiCalculateMapper xinyiCalculateMapper;
 
+    @Autowired
+    private TPredictConfMapper tpredictConfMapper;
+
     /** 使用的是哪个环境 */
     @Value("${spring.profiles.active}")
     private String environment;
@@ -1359,6 +1362,12 @@ public class RyTask
             } catch (Exception e) {
                 log.error("调用跃渊的预测接口出现异常，异常信息为{}", e.getMessage());
             }
+            //2025年02月11日15:48:07 额外记录基地模型预测的值
+            try {
+                this.updateJDModelPredict(tXinyiForecastComparison);
+            } catch (Exception e) {
+                log.error("处理 基地模型预测的值的时候出现异常，异常信息为{}", e.getMessage());
+            }
             // this.xinyiForecastComparisonService.insertTXinyiForecastComparison(tXinyiForecastComparison);
             BigDecimal cscodBzz = normConfig.getCscodBzz();
             BigDecimal cscodGkz = normConfig.getCscodGkz();
@@ -1730,6 +1739,66 @@ public class RyTask
             this.xinyiForecastComparisonService.insertTXinyiForecastComparison(tXinyiForecastComparison);
     }
 
+    private void updateJDModelPredict(TXinyiForecastComparison tXinyiForecastComparison) {
+        //现获取基地模型的配置 如果没有执行返回
+        TPredictConf tPredictConfReq = new TPredictConf();
+        tPredictConfReq.setType(BusinessEnum.JLModelPredictEnum.COD.getCode());
+        List<TPredictConf> tPredictConfs = this.tpredictConfMapper.selectTPredictConfList(tPredictConfReq);
+        if(CollectionUtils.isEmpty(tPredictConfs)){
+            log.error("获取cod机理模型预测参数配置失败，无法处理");
+            return;
+        }
+        if(tPredictConfs.size() > 1){
+            log.error("获取cod机理模型预测参数配置查询多条配置信息，无法处理");
+            return;
+        }
+        //配置的值
+        TPredictConf tPredictConf = tPredictConfs.get(0);
+        BigDecimal a = Objects.isNull(tPredictConf.getA()) ? BigDecimal.valueOf(30) : tPredictConf.getA();
+        BigDecimal b = Objects.isNull(tPredictConf.getB()) ? BigDecimal.valueOf(55.14) : tPredictConf.getB();
+        Integer xMin = Objects.isNull(tPredictConf.getxMin()) ? 12 : tPredictConf.getxMin();
+        Integer xMax = Objects.isNull(tPredictConf.getxMax()) ? 18 : tPredictConf.getxMax();
+        Integer y1Min = Objects.isNull(tPredictConf.getY1Min()) ? 6 : tPredictConf.getY1Min();
+        Integer y1Max = Objects.isNull(tPredictConf.getY1Max()) ? 12 : tPredictConf.getY1Max();
+        BigDecimal x1 = Objects.isNull(tPredictConf.getX1()) ? BigDecimal.valueOf(91.85) : tPredictConf.getX1();
+        //计算第一个值逻辑处理
+        //计算X的值
+        Date nowDate = DateUtils.getNowDate();
+        BigDecimal x = this.xinyiIndustryMapper.getAvgJSCodByDate(DateUtil.format(DateUtils.plusDate(-xMax, nowDate), DateUtils.YYYYMMDDHH_TS), DateUtil.format(DateUtils.plusDate(-xMin, nowDate), DateUtils.YYYYMMDDHH_TS));
+        //计算y1
+        BigDecimal y1 = this.xinyiIndustryMapper.getAvgCSCodByDate(DateUtil.format(DateUtils.plusDate(-y1Max, nowDate), DateUtils.YYYYMMDDHH_TS), DateUtil.format(DateUtils.plusDate(-y1Min, nowDate), DateUtils.YYYYMMDDHH_TS));
+        if(x.compareTo(x1) <= 0){//直接用  当前时间前12小时-6小时的出水COD均值 （时间段位配置的值）
+            tXinyiForecastComparison.setJlForecastOne(y1);
+        }else{//按照公式计算
+            tXinyiForecastComparison.setJlForecastOne(y1.add(a.multiply(x.subtract(x1).divide(b,NUMBER_SCALE_2, RoundingMode.HALF_UP))));
+        }
+
+        //计算第二个值逻辑处理
+        //计算X的值
+        nowDate = DateUtils.plusHour(1, nowDate);
+        x = this.xinyiIndustryMapper.getAvgJSCodByDate(DateUtil.format(DateUtils.plusDate(-xMax, nowDate), DateUtils.YYYYMMDDHH_TS), DateUtil.format(DateUtils.plusDate(-xMin, nowDate), DateUtils.YYYYMMDDHH_TS));
+        //计算y1
+        y1 = this.xinyiIndustryMapper.getAvgCSCodByDate(DateUtil.format(DateUtils.plusDate(-y1Max, nowDate), DateUtils.YYYYMMDDHH_TS), DateUtil.format(DateUtils.plusDate(-y1Min, nowDate), DateUtils.YYYYMMDDHH_TS));
+        if(x.compareTo(x1) <= 0){//直接用  当前时间前12小时-6小时的出水COD均值 （时间段位配置的值）
+            tXinyiForecastComparison.setJlForecastTwo(y1);
+        }else{//按照公式计算
+            tXinyiForecastComparison.setJlForecastTwo(y1.add(a.multiply(x.subtract(x1).divide(b,NUMBER_SCALE_2, RoundingMode.HALF_UP))));
+        }
+
+
+        //计算第三个值逻辑处理
+        //计算X的值
+        nowDate = DateUtils.plusHour(1, nowDate);
+        x = this.xinyiIndustryMapper.getAvgJSCodByDate(DateUtil.format(DateUtils.plusDate(-xMax, nowDate), DateUtils.YYYYMMDDHH_TS), DateUtil.format(DateUtils.plusDate(-xMin, nowDate), DateUtils.YYYYMMDDHH_TS));
+        //计算y1
+        y1 = this.xinyiIndustryMapper.getAvgCSCodByDate(DateUtil.format(DateUtils.plusDate(-y1Max, nowDate), DateUtils.YYYYMMDDHH_TS), DateUtil.format(DateUtils.plusDate(-y1Min, nowDate), DateUtils.YYYYMMDDHH_TS));
+        if(x.compareTo(x1) <= 0){//直接用  当前时间前12小时-6小时的出水COD均值 （时间段位配置的值）
+            tXinyiForecastComparison.setJlForecastThree(y1);
+        }else{//按照公式计算
+            tXinyiForecastComparison.setJlForecastThree(y1.add(a.multiply(x.subtract(x1).divide(b,NUMBER_SCALE_2, RoundingMode.HALF_UP))));
+        }
+    }
+
     public void handleXinYiWarningsYC(BigDecimal csBzz, String[] split, BigDecimal csGkz, String category, String hour, TXinyiNormConfig normConfig, BigDecimal currentVal, TXinyiIndustry tXinyiIndustry, List<ChartBasic> chartsDataList, String date) {
         BigDecimal multiply = csBzz.multiply(new BigDecimal(MyConstants.SCALE_VALUE));
         TXinyiWarningRecord tXinyiWarningRecord = null;

slibra-system/src/main/java/com/slibra/business/domain/TPredictConf.java

@@ -21,23 +21,23 @@ public class TPredictConf extends BaseEntity
 
     /** 预测类型（0出水COD 1出水氨氮 2出水总氮 3出水正磷盐 4缺氧氨氮 5缺氧硝酸盐 ） */
     @Excel(name = "预测类型", readConverterExp = "0=出水COD,1=出水氨氮,2=出水总氮,3=出水正磷盐,4=缺氧氨氮,5=缺氧硝酸盐")
-    private Long type;
+    private Integer type;
 
     /** Y1 可选择时间起始小时-最小值 */
     @Excel(name = "Y1 可选择时间起始小时-最小值")
-    private Long y1Min;
+    private Integer y1Min;
 
     /** Y1 可选择时间起始小时-最大值 */
     @Excel(name = "Y1 可选择时间起始小时-最大值")
-    private Long y1Max;
+    private Integer y1Max;
 
     /** X 可选择时间起始小时时间-最小值 */
     @Excel(name = "X 可选择时间起始小时时间-最小值")
-    private Long xMin;
+    private Integer xMin;
 
     /** X 可选择时间起始小时时间-最大值 */
     @Excel(name = "X 可选择时间起始小时时间-最大值")
-    private Long xMax;
+    private Integer xMax;
 
     /** 进水COD限定值或者其他业务变量限定值 */
     @Excel(name = "进水COD限定值或者其他业务变量限定值")
@@ -67,48 +67,48 @@ public class TPredictConf extends BaseEntity
     {
         return id;
     }
-    public void setType(Long type) 
+    public void setType(Integer type)
     {
         this.type = type;
     }
 
-    public Long getType() 
+    public Integer getType()
     {
         return type;
     }
-    public void setY1Min(Long y1Min) 
+    public void setY1Min(Integer y1Min)
     {
         this.y1Min = y1Min;
     }
 
-    public Long getY1Min() 
+    public Integer getY1Min()
     {
         return y1Min;
     }
-    public void setY1Max(Long y1Max) 
+    public void setY1Max(Integer y1Max)
     {
         this.y1Max = y1Max;
     }
 
-    public Long getY1Max() 
+    public Integer getY1Max()
     {
         return y1Max;
     }
-    public void setxMin(Long xMin) 
+    public void setxMin(Integer xMin)
     {
         this.xMin = xMin;
     }
 
-    public Long getxMin() 
+    public Integer getxMin()
     {
         return xMin;
     }
-    public void setxMax(Long xMax) 
+    public void setxMax(Integer xMax)
     {
         this.xMax = xMax;
     }
 
-    public Long getxMax() 
+    public Integer getxMax()
     {
         return xMax;
     }

slibra-system/src/main/java/com/slibra/business/mapper/TXinyiIndustryMapper.java

@@ -1,6 +1,7 @@
 package com.slibra.business.mapper;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -8,6 +9,7 @@ import com.slibra.business.domain.TXinyiIndustry;
 import com.slibra.business.res.ChartBasic;
 import com.slibra.common.core.domain.DecisionReq;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 信义工业数据Mapper接口
@@ -104,4 +106,8 @@ public interface TXinyiIndustryMapper
     List<ChartBasic> selectTytzjlByDate(@Param("start") String dayBefore3Str, @Param("end") String nowDateStr);
 
     BigDecimal getTotalTodayCSL(String date);
+
+    BigDecimal getAvgJSCodByDate(@RequestParam("dateBegin") String dateBegin, @RequestParam("dateEnd") String dateEnd);
+
+    BigDecimal getAvgCSCodByDate(@RequestParam("dateBegin") String dateBegin, @RequestParam("dateEnd") String dateEnd);
 }

slibra-system/src/main/resources/mapper/business/TXinyiIndustryMapper.xml

@@ -267,7 +267,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <!-- 下面是新增的 -->
+    <!-- 下面是新增的 不允许删除或者覆盖-->
     <select id="getUniqueTXinyiIndustry" resultMap="TXinyiIndustryResult">
         <include refid="selectTXinyiIndustryVo"/>
         where TEST_TIME = #{testTime}
@@ -597,4 +597,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getTotalTodayCSL" resultType="java.math.BigDecimal">
         SELECT SUM(CS_SLQC) FROM t_xinyi_industry WHERE TEST_DATE = #{date}
     </select>
+
+    <select id="getAvgJSCodByDate" resultType="java.math.BigDecimal">
+        SELECT
+            avg( temp.val )
+        FROM
+            ( SELECT JS_SLQ * JS_COD / 2 / 10000 val FROM t_xinyi_industry WHERE TEST_HOUR BETWEEN #{dateBegin} AND #{dateEnd} ) temp
+    </select>
+
+
+    <select id="getAvgCSCodByDate" resultType="java.math.BigDecimal">
+        SELECT
+            AVG( CS_COD )
+        FROM
+            t_xinyi_industry
+        WHERE
+            TEST_HOUR BETWEEN #{dateBegin}
+                AND  #{dateEnd}
+    </select>
 </mapper>