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 | 63 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 12 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 877c01d..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,11 +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
+ id, rtuAddr, protocol, protocol_version, findDt, orgTag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -34,12 +36,16 @@
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=TIMESTAMP})
+ 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-->
@@ -54,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=",">
@@ -68,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=TIMESTAMP},
+ </if>
+ <if test="orgTag != null">
+ #{orgTag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
@@ -83,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=TIMESTAMP},
+ </if>
+ <if test="orgTag != null">
+ orgTag = #{orgTag,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
@@ -94,7 +118,9 @@
update pr_controller_tramp
set rtuAddr = #{rtuAddr,jdbcType=VARCHAR},
protocol = #{protocol,jdbcType=VARCHAR},
- findDt = #{findDt,jdbcType=TIMESTAMP}
+ protocol_version = #{protocolVersion,jdbcType=INTEGER},
+ findDt = #{findDt,jdbcType=TIMESTAMP},
+ orgTag = #{orgTag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
@@ -105,7 +131,7 @@
<!--鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨祦娴帶鍒跺櫒淇℃伅-->
<select id="getTrampControllerInfo" resultMap="BaseResultMap">
- SELECT rtuAddr, protocol, findDt FROM pr_controller_tramp WHERE id = ${controllerId}
+ SELECT rtuAddr, protocol,protocol_version, findDt, orgTag FROM pr_controller_tramp WHERE id = #{controllerId}
</select>
<!-- 鏍规嵁鏉′欢鑾峰彇娴佹氮鎺у埗鍣ㄤ俊鎭�-->
@@ -113,21 +139,31 @@
select CAST(id AS char)AS id,
rtuAddr,
protocol,
- findDt
+ 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}
+ 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>
- </select>
+ 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
@@ -143,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