报警相关表结构调整

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

@@ -98,6 +98,22 @@ public class TXinyiWarningRecord extends BaseEntity
     @Excel(name = "是否使用了大模型推送的决策方案", readConverterExp = "0=否,1=是")
     private Integer useRecommend;
 
+    /** 进出水类型：0进水  1出水 */
+    @Excel(name = "进出水类型：0进水  1出水")
+    private Integer waterType;
+
+    /** 报警类型：0超标准值、 1超管控值、 2仪表故障（断点、连续）、 3数据异常（突变、异常） */
+    @Excel(name = "报警类型：0超标准值、 1超管控值、 2仪表故障", readConverterExp = "断=点、连续")
+    private Integer symbol;
+
+    /** 超污染物限制：计算公式为：当前氨氮/氨氮设计值 或者 当前氨氮/氨氮管控值（智能工单使用） */
+    @Excel(name = "超污染物限制：计算公式为：当前氨氮/氨氮设计值 或者 当前氨氮/氨氮管控值", readConverterExp = "智=能工单使用")
+    private BigDecimal cwrwxz;
+
+    /** 超污染物负荷值：计算公式为：当前水量与氨氮乘积  /  设计水量与设计进水氨氮的乘积（智能工单使用） */
+    @Excel(name = "超污染物负荷值：计算公式为：当前水量与氨氮乘积  /  设计水量与设计进水氨氮的乘积", readConverterExp = "智=能工单使用")
+    private BigDecimal cwrwfhz;
+
     /** 删除标志（0代表存在 2代表删除） */
     private Integer delFlag;
 

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

@@ -22,6 +22,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="operator"    column="operator"    />
         <result property="review"    column="review"    />
         <result property="useRecommend"    column="use_recommend"    />
+        <result property="waterType"    column="water_type"    />
+        <result property="symbol"    column="symbol"    />
+        <result property="cwrwxz"    column="cwrwxz"    />
+        <result property="cwrwfhz"    column="cwrwfhz"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="revision"    column="revision"    />
         <result property="createBy"    column="create_by"    />
@@ -32,7 +36,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, 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
+        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, water_type, symbol, cwrwxz, cwrwfhz, 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">
@@ -55,6 +59,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operator != null  and operator != ''"> and operator = #{operator}</if>
             <if test="review != null  and review != ''"> and review = #{review}</if>
             <if test="useRecommend != null "> and use_recommend = #{useRecommend}</if>
+            <if test="waterType != null "> and water_type = #{waterType}</if>
+            <if test="symbol != null "> and symbol = #{symbol}</if>
+            <if test="cwrwxz != null "> and cwrwxz = #{cwrwxz}</if>
+            <if test="cwrwfhz != null "> and cwrwfhz = #{cwrwfhz}</if>
             <if test="revision != null "> and revision = #{revision}</if>
             <if test="warningStatus != null ">
                 <choose>
@@ -94,6 +102,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operator != null">operator,</if>
             <if test="review != null">review,</if>
             <if test="useRecommend != null">use_recommend,</if>
+            <if test="waterType != null">water_type,</if>
+            <if test="symbol != null">symbol,</if>
+            <if test="cwrwxz != null">cwrwxz,</if>
+            <if test="cwrwfhz != null">cwrwfhz,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="revision != null">revision,</if>
             <if test="createBy != null">create_by,</if>
@@ -119,6 +131,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operator != null">#{operator},</if>
             <if test="review != null">#{review},</if>
             <if test="useRecommend != null">#{useRecommend},</if>
+            <if test="waterType != null">#{waterType},</if>
+            <if test="symbol != null">#{symbol},</if>
+            <if test="cwrwxz != null">#{cwrwxz},</if>
+            <if test="cwrwfhz != null">#{cwrwfhz},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="revision != null">#{revision},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -148,6 +164,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operator != null">operator = #{operator},</if>
             <if test="review != null">review = #{review},</if>
             <if test="useRecommend != null">use_recommend = #{useRecommend},</if>
+            <if test="waterType != null">water_type = #{waterType},</if>
+            <if test="symbol != null">symbol = #{symbol},</if>
+            <if test="cwrwxz != null">cwrwxz = #{cwrwxz},</if>
+            <if test="cwrwfhz != null">cwrwfhz = #{cwrwfhz},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="revision != null">revision = #{revision},</if>
             <if test="createBy != null">create_by = #{createBy},</if>