测试环境临时把预测打开 方便调试 其他优化

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

@@ -16,6 +16,7 @@ public class MyConstants {
     //2024年12月17日16:45:56  调整规则：目前只需要等保服务器[新生产服务器]报警，原[192.168.9.54]配置的是prod环境，也不需要再报警了，所以下面改个不等于prod的值就可以不报警了
     public static final String PROD_ENVIRONMENT = "prod-abandon";
     public static final String DENGBAO_ENVIRONMENT = "dengbao";
+    public static final String DEV_ENVIRONMENT = "dev";
 
 
     public static final String INDUSTRY_INTERFACE_ADDR = "http://192.168.40.23:4568/api/v1/khquerydata";

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

@@ -777,7 +777,8 @@ public class RyTask
 //                    handleXinYiWarningsYC(cscodBzz, split, cscodGkz, BusinessEnum.WarningCategoryEnum.CS_COD_YC.getCode(), hour, normConfig);
                     continue;
                 }
-                if(PROD_ENVIRONMENT.equalsIgnoreCase(environment) || DENGBAO_ENVIRONMENT.equalsIgnoreCase(environment)){
+                if(PROD_ENVIRONMENT.equalsIgnoreCase(environment) || DENGBAO_ENVIRONMENT.equalsIgnoreCase(environment)
+                    || DEV_ENVIRONMENT.equalsIgnoreCase(environment)){
                     //解析数据 处理报警 调研prompt 保存等
                     this.handlePredictorWarning(split, hour, task, tXinyiIndustries6, tXinyiRobots6, date);
                 }

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

@@ -18,7 +18,7 @@ import static com.slibra.common.constant.MyConstants.SORT_DESC;
 
 /**
  * 信义预测对比对象 t_xinyi_forecast_comparison
- * 
+ *
  * @author slibra
  * @date 2024-06-18
  */
@@ -34,42 +34,50 @@ public class TXinyiForecastComparison extends BaseEntity
     /** 主键 */
     private Long id;
 
+    /** 时间 */
+    @Excel(name = "时间")
+    private String remark;
+
     /** 预测类型 */
     @Excel(name = "预测类型")
     private String category;
 
     /** 预测时间1 */
-    @Excel(name = "预测时间1")
+    @Excel(name = "预测1时间")
     private String forecastTimeOne;
 
     /** 实际值1 */
-    @Excel(name = "实际值1")
+    @Excel(name = "实际1小时值")
     private BigDecimal realOne;
 
     /** 红杉预测值1 */
-    @Excel(name = "红杉预测值1")
+    @Excel(name = "TFT预测1小时值")
     private BigDecimal hsForecastOne;
 
     /** 红杉值1误差率 */
-    @Excel(name = "红杉值1误差率")
     private BigDecimal hsErrorRateOne;
 
     /** 红杉预测1差值 */
-    @Excel(name = "红杉预测1差值")
+    @Excel(name = "TFT预测1小时误差值")
     private BigDecimal hsOneSubtract;
 
+    @Excel(name = "TFT预测1小时百分比误差")
+    private String hsErrorRateOneStr;
+
     /** 跃渊预测值1 */
-    @Excel(name = "跃渊预测值1")
+    @Excel(name = "LSTM预测1小时值")
     private BigDecimal yyForecastOne;
 
     /** 跃渊值1误差率 */
-    @Excel(name = "跃渊值1误差率")
     private BigDecimal yyErrorRateOne;
 
     /** 跃渊预测1差值 */
-    @Excel(name = "跃渊预测1差值")
+    @Excel(name = "LSTM预测1小时误差值")
     private BigDecimal yyOneSubtract;
 
+    @Excel(name = "LSTM预测1小时百分比误差")
+    private String yyErrorRateOneStr;
+
     /** 机理模型预测值1 */
     @Excel(name = "机理模型预测值1")
     private BigDecimal jlForecastOne;
@@ -83,37 +91,41 @@ public class TXinyiForecastComparison extends BaseEntity
     private BigDecimal jlOneSubtract;
 
     /** 预测时间2 */
-    @Excel(name = "预测时间2")
+    @Excel(name = "预测2时间")
     private String forecastTimeTwo;
 
     /** 实际值2 */
-    @Excel(name = "实际值2")
+    @Excel(name = "实际2小时值")
     private BigDecimal realTwo;
 
     /** 红杉预测值2 */
-    @Excel(name = "红杉预测值2")
+    @Excel(name = "TFT预测2小时值")
     private BigDecimal hsForecastTwo;
 
     /** 红杉值2误差率 */
-    @Excel(name = "红杉值2误差率")
     private BigDecimal hsErrorRateTwo;
 
     /** 红杉预测2差值 */
-    @Excel(name = "红杉预测2差值")
+    @Excel(name = "TFT预测2小时误差值")
     private BigDecimal hsTwoSubtract;
 
+    @Excel(name = "TFT预测2小时百分比误差")
+    private String hsErrorRateTwoStr;
+
     /** 跃渊预测值2 */
-    @Excel(name = "跃渊预测值2")
+    @Excel(name = "LSTM预测2小时值")
     private BigDecimal yyForecastTwo;
 
     /** 跃渊值2误差率 */
-    @Excel(name = "跃渊值2误差率")
     private BigDecimal yyErrorRateTwo;
 
     /** 跃渊预测2差值 */
-    @Excel(name = "跃渊预测2差值")
+    @Excel(name = "LSTM预测2小时误差值")
     private BigDecimal yyTwoSubtract;
 
+    @Excel(name = "LSTM预测2小时百分比误差")
+    private String yyErrorRateTwoStr;
+
     /** 机理模型预测值1 */
     @Excel(name = "机理模型预测值1")
     private BigDecimal jlForecastTwo;
@@ -127,37 +139,41 @@ public class TXinyiForecastComparison extends BaseEntity
     private BigDecimal jlTwoSubtract;
 
     /** 预测时间3 */
-    @Excel(name = "预测时间3")
+    @Excel(name = "预测3时间")
     private String forecastTimeThree;
 
     /** 实际值3 */
-    @Excel(name = "实际值3")
+    @Excel(name = "实际3小时值")
     private BigDecimal realThree;
 
     /** 红杉预测值3 */
-    @Excel(name = "红杉预测值3")
+    @Excel(name = "TFT预测3小时值")
     private BigDecimal hsForecastThree;
 
     /** 红杉值3误差率 */
-    @Excel(name = "红杉值3误差率")
     private BigDecimal hsErrorRateThree;
 
     /** 红杉预测3差值 */
-    @Excel(name = "红杉预测3差值")
+    @Excel(name = "TFT预测3小时误差值")
     private BigDecimal hsThreeSubtract;
 
+    @Excel(name = "TFT预测3小时百分比误差")
+    private String hsErrorRateThreeStr;
+
     /** 跃渊预测值3 */
-    @Excel(name = "跃渊预测值3")
+    @Excel(name = "LSTM预测3小时值")
     private BigDecimal yyForecastThree;
 
     /** 跃渊值3误差率 */
-    @Excel(name = "跃渊值3误差率")
     private BigDecimal yyErrorRateThree;
 
     /** 跃渊预测3差值 */
-    @Excel(name = "跃渊预测3差值")
+    @Excel(name = "LSTM预测3小时误差值")
     private BigDecimal yyThreeSubtract;
 
+    @Excel(name = "LSTM预测3小时百分比误差")
+    private String yyErrorRateThreeStr;
+
     /** 机理模型预测值1 */
     @Excel(name = "机理模型预测值1")
     private BigDecimal jlForecastThree;
@@ -174,7 +190,7 @@ public class TXinyiForecastComparison extends BaseEntity
     private Long delFlag;
 
     /** 乐观锁 */
-    @Excel(name = "乐观锁")
+//    @Excel(name = "乐观锁")
     private Long revision;