表结构调整

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

@@ -229,8 +229,9 @@ public class RyTask
                     } else if ("信义污水厂升级出水SS".equals(type)) {
                         industry.setCsSs(value);
                     } else if ("信义污水厂升级出水TN".equals(type)) {
-//                        log.info("************----------真实的出水总氮的值为{}\n时间为{}", value, k);
-                        industry.setCsTn(value);
+                        log.info("************----------真实的出水总氮的值为{}\n时间为{}", value, k);
+                        //todo 后面演示完要去掉
+                        industry.setCsTn(new BigDecimal(17));
                     } else if ("信义污水厂升级出水TP".equals(type)) {
                         industry.setCsTp(value);
                     } else if ("信义污水厂升级出水氨氮".equals(type)) {

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

@@ -281,4 +281,44 @@ public class TXinyiDaily extends BaseEntity
     @Excel(name = "干污泥量(m³)")
     private BigDecimal GWNL;
 
+    /** 电费 */
+    @Excel(name = "电费")
+    private BigDecimal DF;
+
+    /** 絮凝剂费 */
+    @Excel(name = "絮凝剂费")
+    private BigDecimal XNJF;
+
+    /** 除磷费 */
+    @Excel(name = "除磷费")
+    private BigDecimal CLF;
+
+    /** 碳源费 */
+    @Excel(name = "碳源费")
+    private BigDecimal TYF;
+
+    /** 消毒剂费 */
+    @Excel(name = "消毒剂费")
+    private BigDecimal XDJF;
+
+    /** 其他药剂费 */
+    @Excel(name = "其他药剂费")
+    private BigDecimal QTYJF;
+
+    /** 采暖费 */
+    @Excel(name = "采暖费")
+    private BigDecimal CNF;
+
+    /** 自来水费 */
+    @Excel(name = "自来水费")
+    private BigDecimal ZLSF;
+
+    /** 直接成本 */
+    @Excel(name = "直接成本")
+    private BigDecimal ZJCB;
+
+    /** 单位成本 */
+    @Excel(name = "单位成本")
+    private BigDecimal DWCB;
+
 }

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

@@ -62,6 +62,11 @@ public class TXinyiWarningRecord extends BaseEntity
     @Excel(name = "预测值")
     private BigDecimal forecastVal;
 
+
+    /** 算法来源（0红杉自研  1跃渊） */
+    @Excel(name = "算法来源", readConverterExp = "0=红杉自研,1=跃渊")
+    private Long functionWay;
+
     /** 报警级别 */
     @Excel(name = "报警级别")
     private String level;

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

@@ -69,10 +69,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="CHUNILIANG"    column="CHUNILIANG"    />
         <result property="CNHSL"    column="CNHSL"    />
         <result property="GWNL"    column="GWNL"    />
+        <result property="DF"    column="DF"    />
+        <result property="XNJF"    column="XNJF"    />
+        <result property="CLF"    column="CLF"    />
+        <result property="TYF"    column="TYF"    />
+        <result property="XDJF"    column="XDJF"    />
+        <result property="QTYJF"    column="QTYJF"    />
+        <result property="CNF"    column="CNF"    />
+        <result property="ZLSF"    column="ZLSF"    />
+        <result property="ZJCB"    column="ZJCB"    />
+        <result property="DWCB"    column="DWCB"    />
     </resultMap>
 
     <sql id="selectTXinyiDailyVo">
-        select ID, TEST_DATE, TEST_HOUR, TEST_TIME, SORT, JS_COD, JS_PH, JS_BOD5, JS_SS, JS_NH3, JS_TN, JS_TP, JS_DCGJ, CS_COD, CS_PH, CS_BOD5, CS_SS, CS_NH3, CS_TN, CS_TP, CS_DCGJ, JS_SW, CS_SW, SHC_ONE_PH, SHC_TWO_PH, SHC_HY_ONE_SV, SHC_HY_TWO_SV, SHC_HY_ONE_SVI, SHC_HY_TWO_SVI, SHC_HY_ONE_MLSS, SHC_HY_TWO_MLSS, SHC_HY_ONE_MLVSS, SHC_HY_TWO_MLVSS, SHC_YY_ONE_DO, SHC_YY_TWO_DO, SHC_QY_ONE_DO, SHC_QY_TWO_DO, SHC_HY_ONE_DO, SHC_HY_TWO_DO, JSL, CSL, SDCLCXSL, QSB, F_M, YY_HRT, HY_HRT, QY_HRT, NHL_R, WHL_R, SRT, CNL, TYQ_BOD5_TN, TYH_BOD5_TN, HYC_RJY_ALL, HYC_WNND_ALL, YYC_RJY_ALL, QYC_RJY_ALL, WNCJB_ALL, WNTJZS_ALL, HFXWNND_ALL, CREATED_TIME, CHUNILIANG, CNHSL, GWNL from t_xinyi_daily
+        select ID, TEST_DATE, TEST_HOUR, TEST_TIME, SORT, JS_COD, JS_PH, JS_BOD5, JS_SS, JS_NH3, JS_TN, JS_TP, JS_DCGJ, CS_COD, CS_PH, CS_BOD5, CS_SS, CS_NH3, CS_TN, CS_TP, CS_DCGJ, JS_SW, CS_SW, SHC_ONE_PH, SHC_TWO_PH, SHC_HY_ONE_SV, SHC_HY_TWO_SV, SHC_HY_ONE_SVI, SHC_HY_TWO_SVI, SHC_HY_ONE_MLSS, SHC_HY_TWO_MLSS, SHC_HY_ONE_MLVSS, SHC_HY_TWO_MLVSS, SHC_YY_ONE_DO, SHC_YY_TWO_DO, SHC_QY_ONE_DO, SHC_QY_TWO_DO, SHC_HY_ONE_DO, SHC_HY_TWO_DO, JSL, CSL, SDCLCXSL, QSB, F_M, YY_HRT, HY_HRT, QY_HRT, NHL_R, WHL_R, SRT, CNL, TYQ_BOD5_TN, TYH_BOD5_TN, HYC_RJY_ALL, HYC_WNND_ALL, YYC_RJY_ALL, QYC_RJY_ALL, WNCJB_ALL, WNTJZS_ALL, HFXWNND_ALL, CREATED_TIME, CHUNILIANG, CNHSL, GWNL, DF, XNJF, CLF, TYF, XDJF, QTYJF, CNF, ZLSF, ZJCB, DWCB from t_xinyi_daily
     </sql>
 
     <select id="selectTXinyiDailyList" parameterType="TXinyiDaily" resultMap="TXinyiDailyResult">
@@ -141,6 +151,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CHUNILIANG != null "> and CHUNILIANG = #{CHUNILIANG}</if>
             <if test="CNHSL != null "> and CNHSL = #{CNHSL}</if>
             <if test="GWNL != null "> and GWNL = #{GWNL}</if>
+            <if test="DF != null "> and DF = #{DF}</if>
+            <if test="XNJF != null "> and XNJF = #{XNJF}</if>
+            <if test="CLF != null "> and CLF = #{CLF}</if>
+            <if test="TYF != null "> and TYF = #{TYF}</if>
+            <if test="XDJF != null "> and XDJF = #{XDJF}</if>
+            <if test="QTYJF != null "> and QTYJF = #{QTYJF}</if>
+            <if test="CNF != null "> and CNF = #{CNF}</if>
+            <if test="ZLSF != null "> and ZLSF = #{ZLSF}</if>
+            <if test="ZJCB != null "> and ZJCB = #{ZJCB}</if>
+            <if test="DWCB != null "> and DWCB = #{DWCB}</if>
         </where>
         order by id desc
     </select>
@@ -216,6 +236,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CHUNILIANG != null">CHUNILIANG,</if>
             <if test="CNHSL != null">CNHSL,</if>
             <if test="GWNL != null">GWNL,</if>
+            <if test="DF != null">DF,</if>
+            <if test="XNJF != null">XNJF,</if>
+            <if test="CLF != null">CLF,</if>
+            <if test="TYF != null">TYF,</if>
+            <if test="XDJF != null">XDJF,</if>
+            <if test="QTYJF != null">QTYJF,</if>
+            <if test="CNF != null">CNF,</if>
+            <if test="ZLSF != null">ZLSF,</if>
+            <if test="ZJCB != null">ZJCB,</if>
+            <if test="DWCB != null">DWCB,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="testDate != null">#{testDate},</if>
@@ -281,6 +311,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CHUNILIANG != null">#{CHUNILIANG},</if>
             <if test="CNHSL != null">#{CNHSL},</if>
             <if test="GWNL != null">#{GWNL},</if>
+            <if test="DF != null">#{DF},</if>
+            <if test="XNJF != null">#{XNJF},</if>
+            <if test="CLF != null">#{CLF},</if>
+            <if test="TYF != null">#{TYF},</if>
+            <if test="XDJF != null">#{XDJF},</if>
+            <if test="QTYJF != null">#{QTYJF},</if>
+            <if test="CNF != null">#{CNF},</if>
+            <if test="ZLSF != null">#{ZLSF},</if>
+            <if test="ZJCB != null">#{ZJCB},</if>
+            <if test="DWCB != null">#{DWCB},</if>
         </trim>
     </insert>
 
@@ -350,6 +390,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CHUNILIANG != null">CHUNILIANG = #{CHUNILIANG},</if>
             <if test="CNHSL != null">CNHSL = #{CNHSL},</if>
             <if test="GWNL != null">GWNL = #{GWNL},</if>
+            <if test="DF != null">DF = #{DF},</if>
+            <if test="XNJF != null">XNJF = #{XNJF},</if>
+            <if test="CLF != null">CLF = #{CLF},</if>
+            <if test="TYF != null">TYF = #{TYF},</if>
+            <if test="XDJF != null">XDJF = #{XDJF},</if>
+            <if test="QTYJF != null">QTYJF = #{QTYJF},</if>
+            <if test="CNF != null">CNF = #{CNF},</if>
+            <if test="ZLSF != null">ZLSF = #{ZLSF},</if>
+            <if test="ZJCB != null">ZJCB = #{ZJCB},</if>
+            <if test="DWCB != null">DWCB = #{DWCB},</if>
         </trim>
         where ID = #{ID}
     </update>

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

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="designVal"    column="design_val"    />
         <result property="controlVal"    column="control_val"    />
         <result property="forecastVal"    column="forecast_val"    />
+        <result property="functionWay"    column="function_way"    />
         <result property="level"    column="level"    />
         <result property="status"    column="status"    />
         <result property="isEmergency"    column="is_emergency"    />
@@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTXinyiWarningRecordVo">
-        select id, type, category, time, reason, warning_val, design_val, control_val, forecast_val, level, status, is_emergency, off_time, operator, review, use_recommend, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_warning_record
+        select id, type, category, time, reason, warning_val, design_val, control_val, forecast_val, function_way, level, status, is_emergency, off_time, operator, review, use_recommend, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_warning_record
     </sql>
 
     <select id="selectTXinyiWarningRecordList" parameterType="TXinyiWarningRecord" resultMap="TXinyiWarningRecordResult">
@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="designVal != null "> and design_val = #{designVal}</if>
             <if test="controlVal != null "> and control_val = #{controlVal}</if>
             <if test="forecastVal != null "> and forecast_val = #{forecastVal}</if>
+            <if test="functionWay != null "> and function_way = #{functionWay}</if>
             <if test="level != null  and level != ''"> and level = #{level}</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="isEmergency != null "> and is_emergency = #{isEmergency}</if>
@@ -84,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="designVal != null">design_val,</if>
             <if test="controlVal != null">control_val,</if>
             <if test="forecastVal != null">forecast_val,</if>
+            <if test="functionWay != null">function_way,</if>
             <if test="level != null">level,</if>
             <if test="status != null">status,</if>
             <if test="isEmergency != null">is_emergency,</if>
@@ -108,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="designVal != null">#{designVal},</if>
             <if test="controlVal != null">#{controlVal},</if>
             <if test="forecastVal != null">#{forecastVal},</if>
+            <if test="functionWay != null">#{functionWay},</if>
             <if test="level != null">#{level},</if>
             <if test="status != null">#{status},</if>
             <if test="isEmergency != null">#{isEmergency},</if>
@@ -136,6 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="designVal != null">design_val = #{designVal},</if>
             <if test="controlVal != null">control_val = #{controlVal},</if>
             <if test="forecastVal != null">forecast_val = #{forecastVal},</if>
+            <if test="functionWay != null">function_way = #{functionWay},</if>
             <if test="level != null">level = #{level},</if>
             <if test="status != null">status = #{status},</if>
             <if test="isEmergency != null">is_emergency = #{isEmergency},</if>