From 62a7f3228c94db41bf57858a6549eb0db033bf1e Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 29 五月 2024 11:44:17 +0800
Subject: [PATCH] 2024-05-29 朱宝民

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml |  296 +++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 196 insertions(+), 100 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
index 4c29926..e9ea639 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
@@ -5,23 +5,33 @@
     <!--@mbg.generated-->
     <!--@Table rm_alarm_state_history-->
     <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="controllerId" jdbcType="BIGINT" property="controllerid" />
-    <result column="intakeId" jdbcType="BIGINT" property="intakeid" />
-    <result column="rtuAddr" jdbcType="VARCHAR" property="rtuaddr" />
+    <result column="controller_id" jdbcType="BIGINT" property="controllerId" />
+    <result column="intake_id" jdbcType="BIGINT" property="intakeId" />
+    <result column="rtu_addr" jdbcType="VARCHAR" property="rtuAddr" />
     <result column="dt" jdbcType="TIMESTAMP" property="dt" />
-    <result column="rtuDt" jdbcType="TIMESTAMP" property="rtudt" />
-    <result column="bateryVolt" jdbcType="TINYINT" property="bateryvolt" />
-    <result column="loss" jdbcType="TINYINT" property="loss" />
-    <result column="meter" jdbcType="TINYINT" property="meter" />
-    <result column="valve" jdbcType="TINYINT" property="valve" />
-    <result column="icCard" jdbcType="TINYINT" property="iccard" />
-    <result column="working" jdbcType="TINYINT" property="working" />
-    <result column="valveState" jdbcType="TINYINT" property="valvestate" />
+    <result column="rtu_dt" jdbcType="TIMESTAMP" property="rtuDt" />
+    <result column="valve_state" jdbcType="TINYINT" property="valveState" />
+    <result column="alarm_remain_water" jdbcType="TINYINT" property="alarmRemainWater" />
+    <result column="alarm0_water_remain" jdbcType="TINYINT" property="alarm0WaterRemain" />
+    <result column="alarm_exceed_year" jdbcType="TINYINT" property="alarmExceedYear" />
+    <result column="alarm_water_meter_fault" jdbcType="TINYINT" property="alarmWaterMeterFault" />
+    <result column="alarm_loss" jdbcType="TINYINT" property="alarmLoss" />
+    <result column="alarm_water_meter_break" jdbcType="TINYINT" property="alarmWaterMeterBreak" />
+    <result column="alarm_ele_meter_fault" jdbcType="TINYINT" property="alarmEleMeterFault" />
+    <result column="alarm0_money_remain" jdbcType="TINYINT" property="alarm0MoneyRemain" />
+    <result column="alarm_inner_door" jdbcType="TINYINT" property="alarmInnerDoor" />
+    <result column="alarm_outer_door" jdbcType="TINYINT" property="alarmOuterDoor" />
+    <result column="alarm_ele_miss" jdbcType="TINYINT" property="alarmEleMiss" />
+    <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" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, controllerId, intakeId, rtuAddr, dt, rtuDt, bateryVolt, loss, meter, valve, icCard,
-    working, valveState
+    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
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -37,16 +47,22 @@
   </delete>
   <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory">
     <!--@mbg.generated-->
-    insert into rm_alarm_state_history (id, controllerId, intakeId, 
-      rtuAddr, dt, rtuDt, bateryVolt,
-      loss, meter, valve, 
-      icCard, working, valveState
-      )
-    values (#{id,jdbcType=BIGINT}, #{controllerid,jdbcType=BIGINT}, #{intakeid,jdbcType=BIGINT}, 
-      #{rtuaddr,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{rtudt,jdbcType=TIMESTAMP}, #{bateryvolt,jdbcType=TINYINT},
-      #{loss,jdbcType=TINYINT}, #{meter,jdbcType=TINYINT}, #{valve,jdbcType=TINYINT}, 
-      #{iccard,jdbcType=TINYINT}, #{working,jdbcType=TINYINT}, #{valvestate,jdbcType=TINYINT}
-      )
+    insert into rm_alarm_state_history (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)
+    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})
   </insert>
   <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory">
     <!--@mbg.generated-->
@@ -55,82 +71,130 @@
       <if test="id != null">
         id,
       </if>
-      <if test="controllerid != null">
-        controllerId,
+      <if test="controllerId != null">
+        controller_id,
       </if>
-      <if test="intakeid != null">
-        intakeId,
+      <if test="intakeId != null">
+        intake_id,
       </if>
-      <if test="rtuaddr != null">
-        rtuAddr,
+      <if test="rtuAddr != null">
+        rtu_addr,
       </if>
       <if test="dt != null">
         dt,
       </if>
-      <if test="rtudt != null">
-        rtuDt,
+      <if test="rtuDt != null">
+        rtu_dt,
       </if>
-      <if test="bateryvolt != null">
-        bateryVolt,
+      <if test="valveState != null">
+        valve_state,
       </if>
-      <if test="loss != null">
-        loss,
+      <if test="alarmRemainWater != null">
+        alarm_remain_water,
       </if>
-      <if test="meter != null">
-        meter,
+      <if test="alarm0WaterRemain != null">
+        alarm0_water_remain,
       </if>
-      <if test="valve != null">
-        valve,
+      <if test="alarmExceedYear != null">
+        alarm_exceed_year,
       </if>
-      <if test="iccard != null">
-        icCard,
+      <if test="alarmWaterMeterFault != null">
+        alarm_water_meter_fault,
       </if>
-      <if test="working != null">
-        working,
+      <if test="alarmLoss != null">
+        alarm_loss,
       </if>
-      <if test="valvestate != null">
-        valveState,
+      <if test="alarmWaterMeterBreak != null">
+        alarm_water_meter_break,
+      </if>
+      <if test="alarmEleMeterFault != null">
+        alarm_ele_meter_fault,
+      </if>
+      <if test="alarm0MoneyRemain != null">
+        alarm0_money_remain,
+      </if>
+      <if test="alarmInnerDoor != null">
+        alarm_inner_door,
+      </if>
+      <if test="alarmOuterDoor != null">
+        alarm_outer_door,
+      </if>
+      <if test="alarmEleMiss != null">
+        alarm_ele_miss,
+      </if>
+      <if test="alarmEleExceed != null">
+        alarm_ele_exceed,
+      </if>
+      <if test="alarmEleLowVolt != null">
+        alarm_ele_low_volt,
+      </if>
+      <if test="stateIcEnable != null">
+        state_ic_enable,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
         #{id,jdbcType=BIGINT},
       </if>
-      <if test="controllerid != null">
-        #{controllerid,jdbcType=BIGINT},
+      <if test="controllerId != null">
+        #{controllerId,jdbcType=BIGINT},
       </if>
-      <if test="intakeid != null">
-        #{intakeid,jdbcType=BIGINT},
+      <if test="intakeId != null">
+        #{intakeId,jdbcType=BIGINT},
       </if>
-      <if test="rtuaddr != null">
-        #{rtuaddr,jdbcType=VARCHAR},
+      <if test="rtuAddr != null">
+        #{rtuAddr,jdbcType=VARCHAR},
       </if>
       <if test="dt != null">
         #{dt,jdbcType=TIMESTAMP},
       </if>
-      <if test="rtudt != null">
-        #{rtudt,jdbcType=TIMESTAMP},
+      <if test="rtuDt != null">
+        #{rtuDt,jdbcType=TIMESTAMP},
       </if>
-      <if test="bateryvolt != null">
-        #{bateryvolt,jdbcType=TINYINT},
+      <if test="valveState != null">
+        #{valveState,jdbcType=TINYINT},
       </if>
-      <if test="loss != null">
-        #{loss,jdbcType=TINYINT},
+      <if test="alarmRemainWater != null">
+        #{alarmRemainWater,jdbcType=TINYINT},
       </if>
-      <if test="meter != null">
-        #{meter,jdbcType=TINYINT},
+      <if test="alarm0WaterRemain != null">
+        #{alarm0WaterRemain,jdbcType=TINYINT},
       </if>
-      <if test="valve != null">
-        #{valve,jdbcType=TINYINT},
+      <if test="alarmExceedYear != null">
+        #{alarmExceedYear,jdbcType=TINYINT},
       </if>
-      <if test="iccard != null">
-        #{iccard,jdbcType=TINYINT},
+      <if test="alarmWaterMeterFault != null">
+        #{alarmWaterMeterFault,jdbcType=TINYINT},
       </if>
-      <if test="working != null">
-        #{working,jdbcType=TINYINT},
+      <if test="alarmLoss != null">
+        #{alarmLoss,jdbcType=TINYINT},
       </if>
-      <if test="valvestate != null">
-        #{valvestate,jdbcType=TINYINT},
+      <if test="alarmWaterMeterBreak != null">
+        #{alarmWaterMeterBreak,jdbcType=TINYINT},
+      </if>
+      <if test="alarmEleMeterFault != null">
+        #{alarmEleMeterFault,jdbcType=TINYINT},
+      </if>
+      <if test="alarm0MoneyRemain != null">
+        #{alarm0MoneyRemain,jdbcType=TINYINT},
+      </if>
+      <if test="alarmInnerDoor != null">
+        #{alarmInnerDoor,jdbcType=TINYINT},
+      </if>
+      <if test="alarmOuterDoor != null">
+        #{alarmOuterDoor,jdbcType=TINYINT},
+      </if>
+      <if test="alarmEleMiss != null">
+        #{alarmEleMiss,jdbcType=TINYINT},
+      </if>
+      <if test="alarmEleExceed != null">
+        #{alarmEleExceed,jdbcType=TINYINT},
+      </if>
+      <if test="alarmEleLowVolt != null">
+        #{alarmEleLowVolt,jdbcType=TINYINT},
+      </if>
+      <if test="stateIcEnable != null">
+        #{stateIcEnable,jdbcType=TINYINT},
       </if>
     </trim>
   </insert>
@@ -138,41 +202,65 @@
     <!--@mbg.generated-->
     update rm_alarm_state_history
     <set>
-      <if test="controllerid != null">
-        controllerId = #{controllerid,jdbcType=BIGINT},
+      <if test="controllerId != null">
+        controller_id = #{controllerId,jdbcType=BIGINT},
       </if>
-      <if test="intakeid != null">
-        intakeId = #{intakeid,jdbcType=BIGINT},
+      <if test="intakeId != null">
+        intake_id = #{intakeId,jdbcType=BIGINT},
       </if>
-      <if test="rtuaddr != null">
-        rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
+      <if test="rtuAddr != null">
+        rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
       </if>
       <if test="dt != null">
         dt = #{dt,jdbcType=TIMESTAMP},
       </if>
-     <if test="rtudt != null">
-       rtuDt = #{rtudt,jdbcType=TIMESTAMP},
+      <if test="rtuDt != null">
+        rtu_dt = #{rtuDt,jdbcType=TIMESTAMP},
       </if>
-      <if test="bateryvolt != null">
-        bateryVolt = #{bateryvolt,jdbcType=TINYINT},
+      <if test="valveState != null">
+        valve_state = #{valveState,jdbcType=TINYINT},
       </if>
-      <if test="loss != null">
-        loss = #{loss,jdbcType=TINYINT},
+      <if test="alarmRemainWater != null">
+        alarm_remain_water = #{alarmRemainWater,jdbcType=TINYINT},
       </if>
-      <if test="meter != null">
-        meter = #{meter,jdbcType=TINYINT},
+      <if test="alarm0WaterRemain != null">
+        alarm0_water_remain = #{alarm0WaterRemain,jdbcType=TINYINT},
       </if>
-      <if test="valve != null">
-        valve = #{valve,jdbcType=TINYINT},
+      <if test="alarmExceedYear != null">
+        alarm_exceed_year = #{alarmExceedYear,jdbcType=TINYINT},
       </if>
-      <if test="iccard != null">
-        icCard = #{iccard,jdbcType=TINYINT},
+      <if test="alarmWaterMeterFault != null">
+        alarm_water_meter_fault = #{alarmWaterMeterFault,jdbcType=TINYINT},
       </if>
-      <if test="working != null">
-        working = #{working,jdbcType=TINYINT},
+      <if test="alarmLoss != null">
+        alarm_loss = #{alarmLoss,jdbcType=TINYINT},
       </if>
-      <if test="valvestate != null">
-        valveState = #{valvestate,jdbcType=TINYINT},
+      <if test="alarmWaterMeterBreak != null">
+        alarm_water_meter_break = #{alarmWaterMeterBreak,jdbcType=TINYINT},
+      </if>
+      <if test="alarmEleMeterFault != null">
+        alarm_ele_meter_fault = #{alarmEleMeterFault,jdbcType=TINYINT},
+      </if>
+      <if test="alarm0MoneyRemain != null">
+        alarm0_money_remain = #{alarm0MoneyRemain,jdbcType=TINYINT},
+      </if>
+      <if test="alarmInnerDoor != null">
+        alarm_inner_door = #{alarmInnerDoor,jdbcType=TINYINT},
+      </if>
+      <if test="alarmOuterDoor != null">
+        alarm_outer_door = #{alarmOuterDoor,jdbcType=TINYINT},
+      </if>
+      <if test="alarmEleMiss != null">
+        alarm_ele_miss = #{alarmEleMiss,jdbcType=TINYINT},
+      </if>
+      <if test="alarmEleExceed != null">
+        alarm_ele_exceed = #{alarmEleExceed,jdbcType=TINYINT},
+      </if>
+      <if test="alarmEleLowVolt != null">
+        alarm_ele_low_volt = #{alarmEleLowVolt,jdbcType=TINYINT},
+      </if>
+      <if test="stateIcEnable != null">
+        state_ic_enable = #{stateIcEnable,jdbcType=TINYINT},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
@@ -180,18 +268,26 @@
   <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory">
     <!--@mbg.generated-->
     update rm_alarm_state_history
-    set controllerId = #{controllerid,jdbcType=BIGINT},
-      intakeId = #{intakeid,jdbcType=BIGINT},
-      rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
+    set controller_id = #{controllerId,jdbcType=BIGINT},
+      intake_id = #{intakeId,jdbcType=BIGINT},
+      rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
       dt = #{dt,jdbcType=TIMESTAMP},
-      rtuDt = #{rtudt,jdbcType=TIMESTAMP},
-      bateryVolt = #{bateryvolt,jdbcType=TINYINT},
-      loss = #{loss,jdbcType=TINYINT},
-      meter = #{meter,jdbcType=TINYINT},
-      valve = #{valve,jdbcType=TINYINT},
-      icCard = #{iccard,jdbcType=TINYINT},
-      working = #{working,jdbcType=TINYINT},
-      valveState = #{valvestate,jdbcType=TINYINT}
+      rtu_dt = #{rtuDt,jdbcType=TIMESTAMP},
+      valve_state = #{valveState,jdbcType=TINYINT},
+      alarm_remain_water = #{alarmRemainWater,jdbcType=TINYINT},
+      alarm0_water_remain = #{alarm0WaterRemain,jdbcType=TINYINT},
+      alarm_exceed_year = #{alarmExceedYear,jdbcType=TINYINT},
+      alarm_water_meter_fault = #{alarmWaterMeterFault,jdbcType=TINYINT},
+      alarm_loss = #{alarmLoss,jdbcType=TINYINT},
+      alarm_water_meter_break = #{alarmWaterMeterBreak,jdbcType=TINYINT},
+      alarm_ele_meter_fault = #{alarmEleMeterFault,jdbcType=TINYINT},
+      alarm0_money_remain = #{alarm0MoneyRemain,jdbcType=TINYINT},
+      alarm_inner_door = #{alarmInnerDoor,jdbcType=TINYINT},
+      alarm_outer_door = #{alarmOuterDoor,jdbcType=TINYINT},
+      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}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0