5个表新增字段 相关的xml和实体bean处理

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

@@ -708,6 +708,9 @@ public class TXinyiBigTableDay extends BaseEntity
     @Excel(name = "计算表-外回流比")
     private BigDecimal jsWhlb;
 
+    @Excel(name = "计算表-外回流比-新的计算方式")
+    private BigDecimal jsWhlbRN;
+
     /** 计算表-内回流比 */
     @Excel(name = "计算表-内回流比")
     private BigDecimal jsNhlb;

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

@@ -713,6 +713,10 @@ public class TXinyiBigTableHour extends BaseEntity
     @Excel(name = "计算表-外回流比")
     private BigDecimal jsWhlb;
 
+    /** 计算表-外回流比-新的计算方式 */
+    @Excel(name = "计算表-外回流比-新的计算方式")
+    private BigDecimal jsWhlbRN;
+
     /** 计算表-内回流比 */
     @Excel(name = "计算表-内回流比")
     private BigDecimal jsNhlb;

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

@@ -708,6 +708,10 @@ public class TXinyiBigTableMonth extends BaseEntity
     @Excel(name = "计算表-外回流比")
     private BigDecimal jsWhlb;
 
+    /** 计算表-外回流比-新的计算方式 */
+    @Excel(name = "计算表-外回流比-新的计算方式")
+    private BigDecimal jsWhlbRN;
+
     /** 计算表-内回流比 */
     @Excel(name = "计算表-内回流比")
     private BigDecimal jsNhlb;

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

@@ -129,6 +129,9 @@ public class TXinyiCalculate extends BaseEntity
     @Excel(name = "外回流比")
     private BigDecimal WHLB;
 
+    @Excel(name = "外回流比，新的计算方式")
+    private BigDecimal whlRN;
+
     /** 内回流比 */
     @Excel(name = "内回流比")
     private BigDecimal NHLB;

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

@@ -56,6 +56,10 @@ public class TXinyiForecastComparison extends BaseEntity
     /** 红杉值1误差率 */
     private BigDecimal hsErrorRateOne;
 
+    /** 红杉预测1差值 */
+    @Excel(name = "TFT预测1小时差值")
+    private BigDecimal hsOneSubtract;
+
     @Excel(name = "TFT预测1小时误差")
     private String hsErrorRateOneStr;
 
@@ -66,6 +70,10 @@ public class TXinyiForecastComparison extends BaseEntity
     /** 跃渊值1误差率 */
     private BigDecimal yyErrorRateOne;
 
+    /** 跃渊预测1差值 */
+    @Excel(name = "LSTM预测1差值")
+    private BigDecimal yyOneSubtract;
+
     @Excel(name = "LSTM预测1小时误差")
     private String yyErrorRateOneStr;
 
@@ -84,6 +92,10 @@ public class TXinyiForecastComparison extends BaseEntity
     /** 红杉值2误差率 */
     private BigDecimal hsErrorRateTwo;
 
+    /** 红杉预测2差值 */
+    @Excel(name = "TFT预测2差值")
+    private BigDecimal hsTwoSubtract;
+
     @Excel(name = "TFT预测2小时误差")
     private String hsErrorRateTwoStr;
 
@@ -94,6 +106,10 @@ public class TXinyiForecastComparison extends BaseEntity
     /** 跃渊值2误差率 */
     private BigDecimal yyErrorRateTwo;
 
+    /** 跃渊预测2差值 */
+    @Excel(name = "LSTM预测2差值")
+    private BigDecimal yyTwoSubtract;
+
     @Excel(name = "LSTM预测2小时误差")
     private String yyErrorRateTwoStr;
 
@@ -112,6 +128,10 @@ public class TXinyiForecastComparison extends BaseEntity
     /** 红杉值3误差率 */
     private BigDecimal hsErrorRateThree;
 
+    /** 红杉预测3差值 */
+    @Excel(name = "TFT预测3差值")
+    private BigDecimal hsThreeSubtract;
+
     @Excel(name = "TFT预测3小时误差")
     private String hsErrorRateThreeStr;
 
@@ -122,6 +142,10 @@ public class TXinyiForecastComparison extends BaseEntity
     /** 跃渊值3误差率 */
     private BigDecimal yyErrorRateThree;
 
+    /** 跃渊预测3差值 */
+    @Excel(name = "LSTM预测3差值")
+    private BigDecimal yyThreeSubtract;
+
     @Excel(name = "LSTM预测3小时误差")
     private String yyErrorRateThreeStr;
 

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.slibra.business.mapper.TXinyiCalculateMapper">
-
+    
     <resultMap type="TXinyiCalculate" id="TXinyiCalculateResult">
         <result property="id"    column="id"    />
         <result property="testDate"    column="TEST_DATE"    />
@@ -31,6 +31,7 @@
         <result property="clsnJcsj"    column="CLSN_JCSJ"    />
         <result property="xgcdcQsqSsls"    column="XGCDC_QSQ_SSLS"    />
         <result property="WHLB"    column="WHLB"    />
+        <result property="whlRN"    column="WHL_R_N"    />
         <result property="NHLB"    column="NHLB"    />
         <result property="WDSCNL"    column="WDSCNL"    />
         <result property="QSB"    column="QSB"    />
@@ -46,7 +47,7 @@
     </resultMap>
 
     <sql id="selectTXinyiCalculateVo">
-        select id, TEST_DATE, TEST_HOUR, TEST_TIME, JS_TDB, JS_TLB, JS_BOD_B_COD, YYQ_HRT, QYQ_HRT, HYQ_HRT, HFXWNNDZB, F_M, GSLS, GSLS_ONE, GSLS_TWO, XGS_GSLS, XLCSC_BMFH, XLCSC_HRT, CCCDC_BMFH, CCCDC_HRT, ECC_BMFH, ECC_HRT, ECC_GTFH, CLSN_JCSJ, XGCDC_QSQ_SSLS, WHLB, NHLB, WDSCNL, QSB, FCXSL, FCXSLBL, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_calculate
+        select id, TEST_DATE, TEST_HOUR, TEST_TIME, JS_TDB, JS_TLB, JS_BOD_B_COD, YYQ_HRT, QYQ_HRT, HYQ_HRT, HFXWNNDZB, F_M, GSLS, GSLS_ONE, GSLS_TWO, XGS_GSLS, XLCSC_BMFH, XLCSC_HRT, CCCDC_BMFH, CCCDC_HRT, ECC_BMFH, ECC_HRT, ECC_GTFH, CLSN_JCSJ, XGCDC_QSQ_SSLS, WHLB, WHL_R_N, NHLB, WDSCNL, QSB, FCXSL, FCXSLBL, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_calculate
     </sql>
 
     <select id="selectTXinyiCalculateList" parameterType="TXinyiCalculate" resultMap="TXinyiCalculateResult">
@@ -78,6 +79,7 @@
             <if test="clsnJcsj != null "> and CLSN_JCSJ = #{clsnJcsj}</if>
             <if test="xgcdcQsqSsls != null "> and XGCDC_QSQ_SSLS = #{xgcdcQsqSsls}</if>
             <if test="WHLB != null "> and WHLB = #{WHLB}</if>
+            <if test="whlRN != null "> and WHL_R_N = #{whlRN}</if>
             <if test="NHLB != null "> and NHLB = #{NHLB}</if>
             <if test="WDSCNL != null "> and WDSCNL = #{WDSCNL}</if>
             <if test="QSB != null "> and QSB = #{QSB}</if>
@@ -87,12 +89,12 @@
         </where>
         and del_flag = 0 order by id desc
     </select>
-
+    
     <select id="selectTXinyiCalculateById" parameterType="Long" resultMap="TXinyiCalculateResult">
         <include refid="selectTXinyiCalculateVo"/>
         where id = #{id} and del_flag = 0
     </select>
-
+        
     <insert id="insertTXinyiCalculate" parameterType="TXinyiCalculate" useGeneratedKeys="true" keyProperty="id">
         insert into t_xinyi_calculate
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -121,6 +123,7 @@
             <if test="clsnJcsj != null">CLSN_JCSJ,</if>
             <if test="xgcdcQsqSsls != null">XGCDC_QSQ_SSLS,</if>
             <if test="WHLB != null">WHLB,</if>
+            <if test="whlRN != null">WHL_R_N,</if>
             <if test="NHLB != null">NHLB,</if>
             <if test="WDSCNL != null">WDSCNL,</if>
             <if test="QSB != null">QSB,</if>
@@ -133,7 +136,7 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-        </trim>
+         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="testDate != null">#{testDate},</if>
             <if test="testHour != null">#{testHour},</if>
@@ -160,6 +163,7 @@
             <if test="clsnJcsj != null">#{clsnJcsj},</if>
             <if test="xgcdcQsqSsls != null">#{xgcdcQsqSsls},</if>
             <if test="WHLB != null">#{WHLB},</if>
+            <if test="whlRN != null">#{whlRN},</if>
             <if test="NHLB != null">#{NHLB},</if>
             <if test="WDSCNL != null">#{WDSCNL},</if>
             <if test="QSB != null">#{QSB},</if>
@@ -172,7 +176,7 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-        </trim>
+         </trim>
     </insert>
 
     <update id="updateTXinyiCalculate" parameterType="TXinyiCalculate">
@@ -203,6 +207,7 @@
             <if test="clsnJcsj != null">CLSN_JCSJ = #{clsnJcsj},</if>
             <if test="xgcdcQsqSsls != null">XGCDC_QSQ_SSLS = #{xgcdcQsqSsls},</if>
             <if test="WHLB != null">WHLB = #{WHLB},</if>
+            <if test="whlRN != null">WHL_R_N = #{whlRN},</if>
             <if test="NHLB != null">NHLB = #{NHLB},</if>
             <if test="WDSCNL != null">WDSCNL = #{WDSCNL},</if>
             <if test="QSB != null">QSB = #{QSB},</if>
@@ -220,7 +225,7 @@
         where id = #{id}
     </update>
 
-
+    
 
     <delete id="deleteTXinyiCalculateById" parameterType="Long">
         update t_xinyi_calculate set del_flag = 2,revision = revision + 1 where del_flag = 0 and id = #{id}

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

@@ -11,20 +11,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="realOne"    column="real_one"    />
         <result property="hsForecastOne"    column="hs_forecast_one"    />
         <result property="hsErrorRateOne"    column="hs_error_rate_one"    />
+        <result property="hsOneSubtract"    column="hs_one_subtract"    />
         <result property="yyForecastOne"    column="yy_forecast_one"    />
         <result property="yyErrorRateOne"    column="yy_error_rate_one"    />
+        <result property="yyOneSubtract"    column="yy_one_subtract"    />
         <result property="forecastTimeTwo"    column="forecast_time_two"    />
         <result property="realTwo"    column="real_two"    />
         <result property="hsForecastTwo"    column="hs_forecast_two"    />
         <result property="hsErrorRateTwo"    column="hs_error_rate_two"    />
+        <result property="hsTwoSubtract"    column="hs_two_subtract"    />
         <result property="yyForecastTwo"    column="yy_forecast_two"    />
         <result property="yyErrorRateTwo"    column="yy_error_rate_two"    />
+        <result property="yyTwoSubtract"    column="yy_two_subtract"    />
         <result property="forecastTimeThree"    column="forecast_time_three"    />
         <result property="realThree"    column="real_three"    />
         <result property="hsForecastThree"    column="hs_forecast_three"    />
         <result property="hsErrorRateThree"    column="hs_error_rate_three"    />
+        <result property="hsThreeSubtract"    column="hs_three_subtract"    />
         <result property="yyForecastThree"    column="yy_forecast_three"    />
         <result property="yyErrorRateThree"    column="yy_error_rate_three"    />
+        <result property="yyThreeSubtract"    column="yy_three_subtract"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="revision"    column="revision"    />
         <result property="createBy"    column="create_by"    />
@@ -35,36 +41,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTXinyiForecastComparisonVo">
-        select id, category, forecast_time_one, real_one, hs_forecast_one, hs_error_rate_one, yy_forecast_one, yy_error_rate_one, forecast_time_two, real_two, hs_forecast_two, hs_error_rate_two, yy_forecast_two, yy_error_rate_two, forecast_time_three, real_three, hs_forecast_three, hs_error_rate_three, yy_forecast_three, yy_error_rate_three, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_forecast_comparison
+        select id, category, forecast_time_one, real_one, hs_forecast_one, hs_error_rate_one, hs_one_subtract, yy_forecast_one, yy_error_rate_one, yy_one_subtract, forecast_time_two, real_two, hs_forecast_two, hs_error_rate_two, hs_two_subtract, yy_forecast_two, yy_error_rate_two, yy_two_subtract, forecast_time_three, real_three, hs_forecast_three, hs_error_rate_three, hs_three_subtract, yy_forecast_three, yy_error_rate_three, yy_three_subtract, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_forecast_comparison
     </sql>
 
     <select id="selectTXinyiForecastComparisonList" parameterType="TXinyiForecastComparison" resultMap="TXinyiForecastComparisonResult">
         <include refid="selectTXinyiForecastComparisonVo"/>
         <where>
-            1 = 1 and category != 'xsy1' and category != 'xsy2'
+            1 = 1
             <if test="category != null  and category != ''"> and category = #{category}</if>
             <if test="forecastTimeOne != null  and forecastTimeOne != ''"> and forecast_time_one = #{forecastTimeOne}</if>
             <if test="realOne != null "> and real_one = #{realOne}</if>
             <if test="hsForecastOne != null "> and hs_forecast_one = #{hsForecastOne}</if>
             <if test="hsErrorRateOne != null "> and hs_error_rate_one = #{hsErrorRateOne}</if>
+            <if test="hsOneSubtract != null "> and hs_one_subtract = #{hsOneSubtract}</if>
             <if test="yyForecastOne != null "> and yy_forecast_one = #{yyForecastOne}</if>
             <if test="yyErrorRateOne != null "> and yy_error_rate_one = #{yyErrorRateOne}</if>
+            <if test="yyOneSubtract != null "> and yy_one_subtract = #{yyOneSubtract}</if>
             <if test="forecastTimeTwo != null  and forecastTimeTwo != ''"> and forecast_time_two = #{forecastTimeTwo}</if>
             <if test="realTwo != null "> and real_two = #{realTwo}</if>
             <if test="hsForecastTwo != null "> and hs_forecast_two = #{hsForecastTwo}</if>
             <if test="hsErrorRateTwo != null "> and hs_error_rate_two = #{hsErrorRateTwo}</if>
+            <if test="hsTwoSubtract != null "> and hs_two_subtract = #{hsTwoSubtract}</if>
             <if test="yyForecastTwo != null "> and yy_forecast_two = #{yyForecastTwo}</if>
             <if test="yyErrorRateTwo != null "> and yy_error_rate_two = #{yyErrorRateTwo}</if>
+            <if test="yyTwoSubtract != null "> and yy_two_subtract = #{yyTwoSubtract}</if>
             <if test="forecastTimeThree != null  and forecastTimeThree != ''"> and forecast_time_three = #{forecastTimeThree}</if>
             <if test="realThree != null "> and real_three = #{realThree}</if>
             <if test="hsForecastThree != null "> and hs_forecast_three = #{hsForecastThree}</if>
             <if test="hsErrorRateThree != null "> and hs_error_rate_three = #{hsErrorRateThree}</if>
+            <if test="hsThreeSubtract != null "> and hs_three_subtract = #{hsThreeSubtract}</if>
             <if test="yyForecastThree != null "> and yy_forecast_three = #{yyForecastThree}</if>
             <if test="yyErrorRateThree != null "> and yy_error_rate_three = #{yyErrorRateThree}</if>
+            <if test="yyThreeSubtract != null "> and yy_three_subtract = #{yyThreeSubtract}</if>
             <if test="revision != null "> and revision = #{revision}</if>
-            <if test="timeBegin != null  and timeBegin != ''"> and remark &gt;= #{timeBegin}</if>
-            <if test="timeEnd != null  and timeEnd != ''"> and remark &lt;= #{timeEnd}</if>
-            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
         </where>
         and del_flag = 0 order by id desc
     </select>
@@ -82,20 +91,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="realOne != null">real_one,</if>
             <if test="hsForecastOne != null">hs_forecast_one,</if>
             <if test="hsErrorRateOne != null">hs_error_rate_one,</if>
+            <if test="hsOneSubtract != null">hs_one_subtract,</if>
             <if test="yyForecastOne != null">yy_forecast_one,</if>
             <if test="yyErrorRateOne != null">yy_error_rate_one,</if>
+            <if test="yyOneSubtract != null">yy_one_subtract,</if>
             <if test="forecastTimeTwo != null">forecast_time_two,</if>
             <if test="realTwo != null">real_two,</if>
             <if test="hsForecastTwo != null">hs_forecast_two,</if>
             <if test="hsErrorRateTwo != null">hs_error_rate_two,</if>
+            <if test="hsTwoSubtract != null">hs_two_subtract,</if>
             <if test="yyForecastTwo != null">yy_forecast_two,</if>
             <if test="yyErrorRateTwo != null">yy_error_rate_two,</if>
+            <if test="yyTwoSubtract != null">yy_two_subtract,</if>
             <if test="forecastTimeThree != null">forecast_time_three,</if>
             <if test="realThree != null">real_three,</if>
             <if test="hsForecastThree != null">hs_forecast_three,</if>
             <if test="hsErrorRateThree != null">hs_error_rate_three,</if>
+            <if test="hsThreeSubtract != null">hs_three_subtract,</if>
             <if test="yyForecastThree != null">yy_forecast_three,</if>
             <if test="yyErrorRateThree != null">yy_error_rate_three,</if>
+            <if test="yyThreeSubtract != null">yy_three_subtract,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="revision != null">revision,</if>
             <if test="createBy != null">create_by,</if>
@@ -110,20 +125,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="realOne != null">#{realOne},</if>
             <if test="hsForecastOne != null">#{hsForecastOne},</if>
             <if test="hsErrorRateOne != null">#{hsErrorRateOne},</if>
+            <if test="hsOneSubtract != null">#{hsOneSubtract},</if>
             <if test="yyForecastOne != null">#{yyForecastOne},</if>
             <if test="yyErrorRateOne != null">#{yyErrorRateOne},</if>
+            <if test="yyOneSubtract != null">#{yyOneSubtract},</if>
             <if test="forecastTimeTwo != null">#{forecastTimeTwo},</if>
             <if test="realTwo != null">#{realTwo},</if>
             <if test="hsForecastTwo != null">#{hsForecastTwo},</if>
             <if test="hsErrorRateTwo != null">#{hsErrorRateTwo},</if>
+            <if test="hsTwoSubtract != null">#{hsTwoSubtract},</if>
             <if test="yyForecastTwo != null">#{yyForecastTwo},</if>
             <if test="yyErrorRateTwo != null">#{yyErrorRateTwo},</if>
+            <if test="yyTwoSubtract != null">#{yyTwoSubtract},</if>
             <if test="forecastTimeThree != null">#{forecastTimeThree},</if>
             <if test="realThree != null">#{realThree},</if>
             <if test="hsForecastThree != null">#{hsForecastThree},</if>
             <if test="hsErrorRateThree != null">#{hsErrorRateThree},</if>
+            <if test="hsThreeSubtract != null">#{hsThreeSubtract},</if>
             <if test="yyForecastThree != null">#{yyForecastThree},</if>
             <if test="yyErrorRateThree != null">#{yyErrorRateThree},</if>
+            <if test="yyThreeSubtract != null">#{yyThreeSubtract},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="revision != null">#{revision},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -142,20 +163,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="realOne != null">real_one = #{realOne},</if>
             <if test="hsForecastOne != null">hs_forecast_one = #{hsForecastOne},</if>
             <if test="hsErrorRateOne != null">hs_error_rate_one = #{hsErrorRateOne},</if>
+            <if test="hsOneSubtract != null">hs_one_subtract = #{hsOneSubtract},</if>
             <if test="yyForecastOne != null">yy_forecast_one = #{yyForecastOne},</if>
             <if test="yyErrorRateOne != null">yy_error_rate_one = #{yyErrorRateOne},</if>
+            <if test="yyOneSubtract != null">yy_one_subtract = #{yyOneSubtract},</if>
             <if test="forecastTimeTwo != null">forecast_time_two = #{forecastTimeTwo},</if>
             <if test="realTwo != null">real_two = #{realTwo},</if>
             <if test="hsForecastTwo != null">hs_forecast_two = #{hsForecastTwo},</if>
             <if test="hsErrorRateTwo != null">hs_error_rate_two = #{hsErrorRateTwo},</if>
+            <if test="hsTwoSubtract != null">hs_two_subtract = #{hsTwoSubtract},</if>
             <if test="yyForecastTwo != null">yy_forecast_two = #{yyForecastTwo},</if>
             <if test="yyErrorRateTwo != null">yy_error_rate_two = #{yyErrorRateTwo},</if>
+            <if test="yyTwoSubtract != null">yy_two_subtract = #{yyTwoSubtract},</if>
             <if test="forecastTimeThree != null">forecast_time_three = #{forecastTimeThree},</if>
             <if test="realThree != null">real_three = #{realThree},</if>
             <if test="hsForecastThree != null">hs_forecast_three = #{hsForecastThree},</if>
             <if test="hsErrorRateThree != null">hs_error_rate_three = #{hsErrorRateThree},</if>
+            <if test="hsThreeSubtract != null">hs_three_subtract = #{hsThreeSubtract},</if>
             <if test="yyForecastThree != null">yy_forecast_three = #{yyForecastThree},</if>
             <if test="yyErrorRateThree != null">yy_error_rate_three = #{yyErrorRateThree},</if>
+            <if test="yyThreeSubtract != null">yy_three_subtract = #{yyThreeSubtract},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="revision != null">revision = #{revision},</if>
             <if test="createBy != null">create_by = #{createBy},</if>