From 540b3f4dbfd9eaed86b5f843be12a06b912de5ef Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 11 六月 2024 20:11:34 +0800
Subject: [PATCH] 1、完善靳总协议的控制器报警及状态处理； 2、报警及状态数据库表（最新+历史）增加字段电池电压报警、阀门报警。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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 e9ea639..6f610a5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
@@ -25,13 +25,15 @@
<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" />
</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
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -54,7 +56,7 @@
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)
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},
@@ -62,7 +64,7 @@
#{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})
+ #{stateIcEnable,jdbcType=TINYINT}, #{alarmBatteryVolt,jdbcType=TINYINT}, #{alarmValve,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory">
<!--@mbg.generated-->
@@ -131,6 +133,12 @@
<if test="stateIcEnable != null">
state_ic_enable,
</if>
+ <if test="alarmBatteryVolt != null">
+ alarm_battery_volt,
+ </if>
+ <if test="alarmValve != null">
+ alarm_valve,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -195,6 +203,12 @@
</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>
</trim>
</insert>
@@ -262,6 +276,12 @@
<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>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@@ -287,7 +307,9 @@
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},
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0