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/PrControllerTrampMapper.xml | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 101 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
index 029d01a..84e3c9e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
@@ -7,37 +7,45 @@
<id column="id" jdbcType="BIGINT" property="id" />
<result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
<result column="protocol" jdbcType="VARCHAR" property="protocol" />
- <result column="findDt" jdbcType="VARCHAR" property="findDt" />
+ <result column="protocol_version" jdbcType="INTEGER" property="protocolVersion" />
+ <result column="findDt" jdbcType="TIMESTAMP" property="findDt" />
+ <result column="orgTag" jdbcType="VARCHAR" property="orgTag" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, rtuAddr, protocol, findDt
+ id, rtuAddr, protocol, protocol_version, findDt, orgTag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
- select
+ select
<include refid="Base_Column_List" />
from pr_controller_tramp
where id = #{id,jdbcType=BIGINT}
</select>
- <select id="selectPrControllerTrampByRtuAddr" parameterType="java.lang.String" resultMap="BaseResultMap">
+
+ <select id="getPrControllerTrampByRtuAddr" parameterType="java.lang.String" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
<include refid="Base_Column_List" />
from pr_controller_tramp
where rtuAddr = #{rtuAddr,jdbcType=VARCHAR}
</select>
+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from pr_controller_tramp
where id = #{id,jdbcType=BIGINT}
</delete>
+ <!--娓呯┖娴佹氮鎺у埗鍣ㄨ〃-->
+ <delete id="emptyTrampController">
+ delete from pr_controller_tramp
+ </delete>
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoPr.PrControllerTramp">
<!--@mbg.generated-->
- insert into pr_controller_tramp (id, rtuAddr, protocol,
- findDt)
- values (#{id,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR},
- #{findDt,jdbcType=VARCHAR})
+ insert into pr_controller_tramp (id, rtuAddr, protocol, protocol_version,
+ findDt, orgTag)
+ values (#{id,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR}, #{protocolVersion,jdbcType=INTEGER},
+ #{findDt,jdbcType=TIMESTAMP},#{orgTag,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoPr.PrControllerTramp">
<!--@mbg.generated-->
@@ -52,8 +60,14 @@
<if test="protocol != null">
protocol,
</if>
+ <if test="protocolVersion != null">
+ protocol_version,
+ </if>
<if test="findDt != null">
findDt,
+ </if>
+ <if test="orgTag != null">
+ orgTag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -66,8 +80,14 @@
<if test="protocol != null">
#{protocol,jdbcType=VARCHAR},
</if>
+ <if test="protocolVersion != null">
+ #{protocolVersion,jdbcType=INTEGER},
+ </if>
<if test="findDt != null">
- #{findDt,jdbcType=VARCHAR},
+ #{findDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="orgTag != null">
+ #{orgTag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
@@ -81,8 +101,14 @@
<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=VARCHAR},
+ findDt = #{findDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="orgTag != null">
+ orgTag = #{orgTag,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
@@ -92,7 +118,71 @@
update pr_controller_tramp
set rtuAddr = #{rtuAddr,jdbcType=VARCHAR},
protocol = #{protocol,jdbcType=VARCHAR},
- findDt = #{findDt,jdbcType=VARCHAR}
+ protocol_version = #{protocolVersion,jdbcType=INTEGER},
+ findDt = #{findDt,jdbcType=TIMESTAMP},
+ orgTag = #{orgTag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
+
+ <!--鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨祦娴帶鍒跺櫒鍦板潃-->
+<!-- <select id="getTrampRtuAddr" resultType="java.lang.String">-->
+<!-- SELECT rtuAddr FROM pr_controller_tramp WHERE id = ${controllerId}-->
+<!-- </select>-->
+
+ <!--鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨祦娴帶鍒跺櫒淇℃伅-->
+ <select id="getTrampControllerInfo" resultMap="BaseResultMap">
+ SELECT rtuAddr, protocol,protocol_version, findDt, orgTag FROM pr_controller_tramp WHERE id = #{controllerId}
+ </select>
+
+ <!-- 鏍规嵁鏉′欢鑾峰彇娴佹氮鎺у埗鍣ㄤ俊鎭�-->
+ <select id="getTrampControllers" resultMap="BaseResultMap">
+ select CAST(id AS char)AS id,
+ rtuAddr,
+ protocol,
+ protocol_version,
+ findDt,
+ orgTag
+ FROM pr_controller_tramp
+ <where>
+ <if test="id != null and id !=''">
+ id = #{id,jdbcType=VARCHAR}
+ </if>
+ <if test="rtuAddr != null and rtuAddr != ''">
+ AND rtuAddr = #{rtuAddr,jdbcType=VARCHAR}
+ </if>
+ <if test="protocol != null and protocol != ''">
+ AND protocol = #{protocol,jdbcType=VARCHAR}
+ </if>
+ <if test="protocolVersion != null">
+ AND protocol_version = #{protocolVersion,jdbcType=INTEGER}
+ </if>
+ </where>
+ order by id desc
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+</select>
+ <!-- 鏍规嵁鏉′欢鑾峰彇娴佹氮鎺у埗鍣ㄦ暟閲�-->
+ <select id="getTrampControllersCount" resultType="java.lang.Long">
+ select
+ COUNT(*) AS recordCount
+ FROM pr_controller_tramp
+ <where>
+ <if test="id != null and id !=''">
+ id = #{id,jdbcType=VARCHAR}
+ </if>
+ <if test="rtuAddr != null and rtuAddr != ''">
+ AND rtuAddr = #{rtuAddr,jdbcType=VARCHAR}
+ </if>
+ <if test="protocol != null and protocol != ''">
+ AND protocol = #{protocol,jdbcType=VARCHAR}
+ </if>
+ <if test="protocolVersion != null">
+ AND protocol_version = #{protocolVersion,jdbcType=VARCHAR}
+ </if>
+
+ </where>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0