From 3b58972c757734f0dc4b1ff29a0a179ed564ab64 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 17 七月 2024 11:47:42 +0800
Subject: [PATCH] 2024-07-17 朱宝民 重构命令日志表，返回结果改为text类型

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml |   48 +++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
index 2056c59..b24461d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
@@ -25,13 +25,16 @@
     <result column="alarm_ele_exceed" jdbcType="TINYINT" property="alarmEleExceed" />
     <result column="alarm_ele_low_volt" jdbcType="TINYINT" property="alarmEleLowVolt" />
     <result column="state_ic_enable" jdbcType="TINYINT" property="stateIcEnable" />
+    <result column="alarm_battery_volt" jdbcType="TINYINT" property="alarmBatteryVolt" />
+    <result column="alarm_valve" jdbcType="TINYINT" property="alarmValve" />
+    <result column="power_type" jdbcType="TINYINT" property="alarmValve" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, controller_id, intake_id, rtu_addr, dt, rtu_dt, valve_state, alarm_remain_water,
     alarm0_water_remain, alarm_exceed_year, alarm_water_meter_fault, alarm_loss, alarm_water_meter_break,
     alarm_ele_meter_fault, alarm0_money_remain, alarm_inner_door, alarm_outer_door, alarm_ele_miss, 
-    alarm_ele_exceed, alarm_ele_low_volt, state_ic_enable
+    alarm_ele_exceed, alarm_ele_low_volt, state_ic_enable,alarm_battery_volt,alarm_valve,power_type
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -40,12 +43,12 @@
     from rm_alarm_state_last
     where id = #{id,jdbcType=BIGINT}
   </select>
-  <select id="selectByRtuAddr" parameterType="java.lang.String" resultMap="BaseResultMap">
+  <select id="selectByIntakeId" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
     select
     <include refid="Base_Column_List" />
     from rm_alarm_state_last
-    where rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
+    where intake_id = #{intakeId,jdbcType=BIGINT}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--@mbg.generated-->
@@ -61,15 +64,16 @@
       alarm_loss, alarm_water_meter_break, alarm_ele_meter_fault, 
       alarm0_money_remain, alarm_inner_door, alarm_outer_door, 
       alarm_ele_miss, alarm_ele_exceed, alarm_ele_low_volt, 
-      state_ic_enable)
+      state_ic_enable,alarm_battery_volt,alarm_valve,power_type)
     values (#{id,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT}, 
       #{rtuAddr,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{rtuDt,jdbcType=TIMESTAMP}, 
       #{valveState,jdbcType=TINYINT}, #{alarmRemainWater,jdbcType=TINYINT}, #{alarm0WaterRemain,jdbcType=TINYINT}, 
       #{alarmExceedYear,jdbcType=TINYINT}, #{alarmWaterMeterFault,jdbcType=TINYINT}, 
       #{alarmLoss,jdbcType=TINYINT}, #{alarmWaterMeterBreak,jdbcType=TINYINT}, #{alarmEleMeterFault,jdbcType=TINYINT}, 
       #{alarm0MoneyRemain,jdbcType=TINYINT}, #{alarmInnerDoor,jdbcType=TINYINT}, #{alarmOuterDoor,jdbcType=TINYINT}, 
-      #{alarmEleMiss,jdbcType=TINYINT}, #{alarmEleExceed,jdbcType=TINYINT}, #{alarmEleLowVolt,jdbcType=TINYINT}, 
-      #{stateIcEnable,jdbcType=TINYINT})
+      #{alarmEleMiss,jdbcType=TINYINT}, #{alarmEleExceed,jdbcType=TINYINT}, #{alarmEleLowVolt,jdbcType=TINYINT},
+      #{stateIcEnable,jdbcType=TINYINT}, #{alarmBatteryVolt,jdbcType=TINYINT}, #{alarmValve,jdbcType=TINYINT},
+      #{powerType,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAlarmStateLast">
     <!--@mbg.generated-->
@@ -138,6 +142,15 @@
       <if test="stateIcEnable != null">
         state_ic_enable,
       </if>
+      <if test="alarmBatteryVolt != null">
+        alarm_battery_volt,
+      </if>
+     <if test="alarmValve != null">
+        alarm_valve,
+      </if>
+     <if test="powerType != null">
+        power_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -202,6 +215,15 @@
       </if>
       <if test="stateIcEnable != null">
         #{stateIcEnable,jdbcType=TINYINT},
+      </if>
+      <if test="alarmBatteryVolt != null">
+        #{alarmBatteryVolt,jdbcType=TINYINT},
+      </if>
+     <if test="alarmValve != null">
+        #{alarmValve,jdbcType=TINYINT},
+      </if>
+     <if test="powerType != null">
+        #{powerType,jdbcType=TINYINT},
       </if>
     </trim>
   </insert>
@@ -269,6 +291,15 @@
       <if test="stateIcEnable != null">
         state_ic_enable = #{stateIcEnable,jdbcType=TINYINT},
       </if>
+      <if test="alarmBatteryVolt != null">
+        alarm_battery_volt = #{alarmBatteryVolt,jdbcType=TINYINT},
+      </if>
+      <if test="alarmValve != null">
+        alarm_valve = #{alarmValve,jdbcType=TINYINT},
+      </if>
+      <if test="powerType != null">
+        power_type = #{powerType,jdbcType=TINYINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -294,7 +325,10 @@
       alarm_ele_miss = #{alarmEleMiss,jdbcType=TINYINT},
       alarm_ele_exceed = #{alarmEleExceed,jdbcType=TINYINT},
       alarm_ele_low_volt = #{alarmEleLowVolt,jdbcType=TINYINT},
-      state_ic_enable = #{stateIcEnable,jdbcType=TINYINT}
+      state_ic_enable = #{stateIcEnable,jdbcType=TINYINT},
+      alarm_battery_volt = #{alarmBatteryVolt,jdbcType=TINYINT},
+      alarm_valve = #{alarmValve,jdbcType=TINYINT},
+      power_type = #{powerType,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0