From 9281643d18bc2e0aaffed3c5f216d1df12d68424 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 18 一月 2024 09:44:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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..3753a1b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
@@ -7,7 +7,7 @@
<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="findDt" jdbcType="TIMESTAMP" property="findDt" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
@@ -20,13 +20,15 @@
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
@@ -37,7 +39,7 @@
insert into pr_controller_tramp (id, rtuAddr, protocol,
findDt)
values (#{id,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR},
- #{findDt,jdbcType=VARCHAR})
+ #{findDt,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoPr.PrControllerTramp">
<!--@mbg.generated-->
@@ -67,7 +69,7 @@
#{protocol,jdbcType=VARCHAR},
</if>
<if test="findDt != null">
- #{findDt,jdbcType=VARCHAR},
+ #{findDt,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
@@ -82,7 +84,7 @@
protocol = #{protocol,jdbcType=VARCHAR},
</if>
<if test="findDt != null">
- findDt = #{findDt,jdbcType=VARCHAR},
+ findDt = #{findDt,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
@@ -92,7 +94,17 @@
update pr_controller_tramp
set rtuAddr = #{rtuAddr,jdbcType=VARCHAR},
protocol = #{protocol,jdbcType=VARCHAR},
- findDt = #{findDt,jdbcType=VARCHAR}
+ findDt = #{findDt,jdbcType=TIMESTAMP}
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, findDt FROM pr_controller_tramp WHERE id = ${controllerId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0