From f8cb69b9e1b0e8443942e13bbd3f46b9d4203269 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 28 四月 2024 08:54:08 +0800
Subject: [PATCH] 靳总离职前，应元谋二期项目要求（慧图），做了通信协议修改，在他离职后，从韩月处得到最新协议，并做了部分协议软件实现修改，发现新协议中有一些协议定义有重复，也有错误的，所以这版本协议未全部实现，但实现的部分可以用来测试测控一体阀（与段志强一起测试过）。目前情况下，这版本协议实现不能应用于实际项目中，如果必须实现，还需要结合硬件协议具体实现内容再实现通信中间件的协议解析与构造部分，还需要实现上行数据处理任务树部分。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 e62a0b0..4c29926 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
@@ -8,7 +8,8 @@
<result column="controllerId" jdbcType="BIGINT" property="controllerid" />
<result column="intakeId" jdbcType="BIGINT" property="intakeid" />
<result column="rtuAddr" jdbcType="VARCHAR" property="rtuaddr" />
- <result column="dt" jdbcType="DATE" property="dt" />
+ <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" />
@@ -19,7 +20,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, controllerId, intakeId, rtuAddr, dt, bateryVolt, loss, meter, valve, icCard,
+ id, controllerId, intakeId, rtuAddr, dt, rtuDt, bateryVolt, loss, meter, valve, icCard,
working, valveState
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -37,12 +38,12 @@
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory">
<!--@mbg.generated-->
insert into rm_alarm_state_history (id, controllerId, intakeId,
- rtuAddr, dt, bateryVolt,
+ 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=DATE}, #{bateryvolt,jdbcType=TINYINT},
+ #{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}
)
@@ -65,6 +66,9 @@
</if>
<if test="dt != null">
dt,
+ </if>
+ <if test="rtudt != null">
+ rtuDt,
</if>
<if test="bateryvolt != null">
bateryVolt,
@@ -102,7 +106,10 @@
#{rtuaddr,jdbcType=VARCHAR},
</if>
<if test="dt != null">
- #{dt,jdbcType=DATE},
+ #{dt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="rtudt != null">
+ #{rtudt,jdbcType=TIMESTAMP},
</if>
<if test="bateryvolt != null">
#{bateryvolt,jdbcType=TINYINT},
@@ -141,7 +148,10 @@
rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
</if>
<if test="dt != null">
- dt = #{dt,jdbcType=DATE},
+ dt = #{dt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="rtudt != null">
+ rtuDt = #{rtudt,jdbcType=TIMESTAMP},
</if>
<if test="bateryvolt != null">
bateryVolt = #{bateryvolt,jdbcType=TINYINT},
@@ -173,7 +183,8 @@
set controllerId = #{controllerid,jdbcType=BIGINT},
intakeId = #{intakeid,jdbcType=BIGINT},
rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
- dt = #{dt,jdbcType=DATE},
+ dt = #{dt,jdbcType=TIMESTAMP},
+ rtuDt = #{rtudt,jdbcType=TIMESTAMP},
bateryVolt = #{bateryvolt,jdbcType=TINYINT},
loss = #{loss,jdbcType=TINYINT},
meter = #{meter,jdbcType=TINYINT},
--
Gitblit v1.8.0