From e5c29d6ac2b210a9385723598d79a42ae5a9679e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 23 四月 2025 15:20:13 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 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 c9e5208..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,12 +7,13 @@
<id column="id" jdbcType="BIGINT" property="id" />
<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" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, rtuAddr, protocol, findDt, orgTag
+ id, rtuAddr, protocol, protocol_version, findDt, orgTag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -41,9 +42,9 @@
</delete>
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoPr.PrControllerTramp">
<!--@mbg.generated-->
- insert into pr_controller_tramp (id, rtuAddr, protocol,
+ insert into pr_controller_tramp (id, rtuAddr, protocol, protocol_version,
findDt, orgTag)
- values (#{id,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR},
+ 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">
@@ -58,6 +59,9 @@
</if>
<if test="protocol != null">
protocol,
+ </if>
+ <if test="protocolVersion != null">
+ protocol_version,
</if>
<if test="findDt != null">
findDt,
@@ -75,6 +79,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},
@@ -94,6 +101,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>
@@ -108,6 +118,7 @@
update pr_controller_tramp
set rtuAddr = #{rtuAddr,jdbcType=VARCHAR},
protocol = #{protocol,jdbcType=VARCHAR},
+ protocol_version = #{protocolVersion,jdbcType=INTEGER},
findDt = #{findDt,jdbcType=TIMESTAMP},
orgTag = #{orgTag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
@@ -120,7 +131,7 @@
<!--鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨祦娴帶鍒跺櫒淇℃伅-->
<select id="getTrampControllerInfo" resultMap="BaseResultMap">
- SELECT rtuAddr, protocol, findDt, orgTag FROM pr_controller_tramp WHERE id = #{controllerId}
+ SELECT rtuAddr, protocol,protocol_version, findDt, orgTag FROM pr_controller_tramp WHERE id = #{controllerId}
</select>
<!-- 鏍规嵁鏉′欢鑾峰彇娴佹氮鎺у埗鍣ㄤ俊鎭�-->
@@ -128,6 +139,7 @@
select CAST(id AS char)AS id,
rtuAddr,
protocol,
+ protocol_version,
findDt,
orgTag
FROM pr_controller_tramp
@@ -136,13 +148,16 @@
id = #{id,jdbcType=VARCHAR}
</if>
<if test="rtuAddr != null and rtuAddr != ''">
- AND rtuAddr = #{rtuAddr,jdbcType=VARCHAR}
+ AND rtuAddr = #{rtuAddr,jdbcType=VARCHAR}
</if>
<if test="protocol != null and protocol != ''">
- AND protocol = #{protocol,jdbcType=VARCHAR}
+ AND protocol = #{protocol,jdbcType=VARCHAR}
+ </if>
+ <if test="protocolVersion != null">
+ AND protocol_version = #{protocolVersion,jdbcType=INTEGER}
</if>
</where>
- order by rtuAddr desc
+ order by id desc
<trim prefix="limit " >
<if test="start != null and count != null">
#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
@@ -164,6 +179,9 @@
<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>
--
Gitblit v1.8.0