From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议版本号字段； 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
index cbab066..b25dfc9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -8,6 +8,7 @@
<result column="intakeId" jdbcType="BIGINT" property="intakeId" />
<result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
<result column="protocol" jdbcType="VARCHAR" property="protocol" />
+ <result column="protocol_version" jdbcType="INTEGER" property="protocolVersion" />
<result column="findDt" jdbcType="TIMESTAMP" property="findDt" />
<result column="orgTag" jdbcType="VARCHAR" property="orgTag" />
<result column="addWays" jdbcType="TINYINT" property="addWays" />
@@ -23,7 +24,7 @@
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, intakeId, rtuAddr, protocol, findDt, orgTag, addWays, `operator`, operateDt, deleted
+ id, intakeId, rtuAddr, protocol, protocol_version, findDt, orgTag, addWays, `operator`, operateDt, deleted
</sql>
<sql id="Part_Column_List">
<!--@mbg.generated-->
@@ -44,11 +45,11 @@
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoPr.PrController">
<!--@mbg.generated-->
insert into pr_controller (id, intakeId, rtuAddr,
- protocol, findDt, orgTag, addWays,
+ protocol, protocol_version, findDt, orgTag, addWays,
`operator`, operateDt, deleted
)
values (#{id,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR},
- #{protocol,jdbcType=VARCHAR}, #{findDt,jdbcType=TIMESTAMP}, #{orgTag,jdbcType=VARCHAR},
+ #{protocol,jdbcType=VARCHAR}, #{protocolVersion,jdbcType=INTEGER}, #{findDt,jdbcType=TIMESTAMP}, #{orgTag,jdbcType=VARCHAR},
#{addWays,jdbcType=TINYINT}, #{operator,jdbcType=BIGINT}, #{operateDt,jdbcType=TIMESTAMP},
#{deleted,jdbcType=TINYINT}
)
@@ -68,6 +69,9 @@
</if>
<if test="protocol != null">
protocol,
+ </if>
+ <if test="protocolVersion != null">
+ protocol_version,
</if>
<if test="findDt != null">
findDt,
@@ -100,6 +104,9 @@
</if>
<if test="protocol != null">
#{protocol,jdbcType=VARCHAR},
+ </if>
+ <if test="protocolVersion != null">
+ #{protocolVersion,jdbcType=INTEGER},
</if>
<if test="findDt != null">
#{findDt,jdbcType=TIMESTAMP},
@@ -134,6 +141,9 @@
<if test="protocol != null">
protocol = #{protocol,jdbcType=VARCHAR},
</if>
+ <if test="protocolVersion != null">
+ protocol_version = #{protocolVersion,jdbcType=INTEGER},
+ </if>
<if test="findDt != null">
findDt = #{findDt,jdbcType=TIMESTAMP},
</if>
@@ -161,6 +171,7 @@
set intakeId = #{intakeId,jdbcType=BIGINT},
rtuAddr = #{rtuAddr,jdbcType=VARCHAR},
protocol = #{protocol,jdbcType=VARCHAR},
+ protocol_version = #{protocolVersion,jdbcType=INTEGER},
findDt = #{findDt,jdbcType=TIMESTAMP},
orgTag = #{orgTag,jdbcType=VARCHAR},
addWays = #{addWays,jdbcType=TINYINT},
@@ -172,7 +183,7 @@
<!--鏍规嵁鎺у埗鍣ㄧ紪鍙峰垹闄ゅ彇姘村彛缂栧彿-->
<update id="deleteIntakeId">
- UPDATE pr_controller SET intakeId = null WHERE id = ${controllerId}
+ UPDATE pr_controller SET intakeId = null WHERE id = #{controllerId}
</update>
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鎺у埗鍣ㄨ褰曟暟-->
@@ -194,7 +205,7 @@
AND con.deleted = 0
<if test = "id != null and id > 0">
- AND con.id = ${id}
+ AND con.id = #{id}
</if>
<if test = "rtuAddr != null and rtuAddr !=''">
AND con.rtuAddr like CONCAT('%',#{rtuAddr},'%')
@@ -203,7 +214,7 @@
AND rtus.isOnLine = #{isOnLine}
</if>
<if test = "bindNumber != null and bindNumber > 0">
- AND (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) = ${bindNumber}
+ AND (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) = #{bindNumber}
</if>
</where>
</select>
@@ -215,6 +226,7 @@
con.rtuAddr AS rtuAddr,
inta.name AS intakeName,
con.protocol,
+ con.protocol_version,
inta.remarks,
rtus.isOnLine,
(SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND operateType = 1) AS bindNumber,
@@ -234,7 +246,7 @@
AND con.deleted = 0
<if test = "id != null and id > 0">
- AND con.id = ${id}
+ AND con.id = #{id}
</if>
<if test = "rtuAddr != null and rtuAddr !=''">
AND con.rtuAddr like CONCAT('%',#{rtuAddr},'%')
@@ -243,7 +255,7 @@
AND rtus.isOnLine = #{isOnLine}
</if>
<if test = "bindNumber != null and bindNumber > 0">
- AND (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND operateType = 1) = ${bindNumber}
+ AND (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND operateType = 1) = #{bindNumber}
</if>
</where>
ORDER BY con.operateDt DESC
@@ -265,6 +277,7 @@
tb.rtuAddr rtuAddr,
tb.intakeId intakeId,
tb.findDt findDt,
+ tb.operateDt operateDt,
itb.name intakeName
FROM pr_controller tb
INNER JOIN pr_intake itb on tb.intakeId = itb.id
@@ -273,17 +286,17 @@
<!--鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗-->
<update id="deleteControllerById">
- UPDATE pr_controller SET deleted = 1 WHERE id = ${controllerId}
+ UPDATE pr_controller SET deleted = 1 WHERE id = #{controllerId}
</update>
<!--鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨湭鍒犻櫎鐨勬帶鍒跺櫒鏁伴噺-->
<select id="getRecordCountOfController" resultType="java.lang.Integer">
- SELECT COUNT(*) AS recordCount FROM pr_controller WHERE deleted = 0 AND id = ${controllerId}
+ SELECT COUNT(*) AS recordCount FROM pr_controller WHERE deleted = 0 AND id = #{controllerId}
</select>
<!--鏍规嵁娴佹氮鎺у埗鍣ㄧ紪鍙疯幏鍙栧凡缁戝畾璁板綍鏁�-->
<select id="getBindedCount" resultType="java.lang.Integer">
- SELECT COUNT(*) AS recordCount FROM pr_controller WHERE rtuAddr = (SELECT rtuAddr FROM pr_controller_tramp WHERE id = ${controllerId}) AND intakeId IS NOT NULL
+ SELECT COUNT(*) AS recordCount FROM pr_controller WHERE rtuAddr = (SELECT rtuAddr FROM pr_controller_tramp WHERE id = #{controllerId}) AND intakeId IS NOT NULL
</select>
<!--鏍规嵁鍙栨按鍙D鎴栭榾鎺у櫒鍦板潃鑾峰彇闃�鎺у櫒瀵硅薄-->
--
Gitblit v1.8.0