From 4783fc799e4416c4c90e07afd00e733502f0bba8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 16:09:11 +0800
Subject: [PATCH] 1、更新日漏损最新记录有bug（新生成了记录，应该是更新老记录），修改之 ； 2、CommonV1_0_0中获取开关阀类型名称时，对于null返回空字符串。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 c4fab1e..a40bbe2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
@@ -35,6 +35,10 @@
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,
@@ -116,7 +120,7 @@
<!--鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨祦娴帶鍒跺櫒淇℃伅-->
<select id="getTrampControllerInfo" resultMap="BaseResultMap">
- SELECT rtuAddr, protocol, findDt FROM pr_controller_tramp WHERE id = ${controllerId}
+ SELECT rtuAddr, protocol, findDt, orgTag FROM pr_controller_tramp WHERE id = #{controllerId}
</select>
<!-- 鏍规嵁鏉′欢鑾峰彇娴佹氮鎺у埗鍣ㄤ俊鎭�-->
@@ -132,13 +136,19 @@
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>
</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
--
Gitblit v1.8.0