From b1384c4959a4486d391369c4e7a58c4b4b0e9b9c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 13 十一月 2024 17:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml | 98 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 93 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
index 48a02fb..60f1766 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
@@ -8,10 +8,13 @@
<result column="task_id" jdbcType="BIGINT" property="taskId" />
<result column="controller_id" jdbcType="BIGINT" property="controllerId" />
<result column="rtu_addr" jdbcType="VARCHAR" property="rtuAddr" />
+ <result column="is_over" jdbcType="TINYINT" property="isOver" />
+ <result column="ug_state" jdbcType="INTEGER" property="ugState" />
+ <result column="over_dt" jdbcType="TIMESTAMP" property="overDt" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, task_id, controller_id, rtu_addr
+ id, task_id, controller_id, rtu_addr, is_over, ug_state, over_dt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -50,7 +53,7 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鎺у埗鍣ㄨ褰�-->
<select id="selectControllers" resultType="com.dy.pipIrrGlobal.voPr.VoController">
SELECT
- CAST(con.id AS char) AS id,
+ CAST(rc.id AS char) AS id,
con.rtuAddr AS rtuAddr,
inta.name AS intakeName,
con.protocol,
@@ -117,17 +120,62 @@
</where>
</select>
+
+ <select id="selectControllerUpgradeResultsCount" resultType="java.lang.Long">
+ <!--@mbg.generated-->
+ select
+ count(*)
+ from ug_rtu_controller
+ <where>
+ <if test="taskId != null">
+ AND task_id = #{taskId,jdbcType=BIGINT}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectControllerUpgradeResults" resultType="com.dy.pipIrrGlobal.voUg.VoUgResult">
+ <!--@mbg.generated-->
+ select
+ ctb.id as id,
+ inTb.name as intakeNum,
+ ctb.rtu_addr as rtuAddr,
+ ctb.is_over as isOver,
+ ctb.ug_state as ugState,
+ ctb.over_dt as overDt
+ from ug_rtu_controller ctb
+ inner join pr_intake inTb on ctb.task_id = inTb.id
+ <where>
+ <if test="taskId != null">
+ AND ctb.task_id = #{taskId,jdbcType=BIGINT}
+ </if>
+ </where>
+ ORDER BY ctb.id ASC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+
+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from ug_rtu_controller
where id = #{id,jdbcType=BIGINT}
</delete>
+ <delete id="deleteByTaskId" parameterType="java.lang.Long">
+ delete from ug_rtu_controller
+ where task_id = #{taskId,jdbcType=BIGINT}
+ </delete>
+
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
<!--@mbg.generated-->
insert into ug_rtu_controller (id, task_id, controller_id,
rtu_addr)
- values (#{id,jdbcType=BIGINT}, #{taskId,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT},
- #{rtuAddr,jdbcType=VARCHAR})
+ values (#{id,jdbcType=BIGINT}, #{taskId,jdbcType=BIGINT},
+ #{controllerId,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR},
+ #{isOver,jdbcType=TINYINT}, #{ugState,jdbcType=INTEGER},
+ #{overDt,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
<!--@mbg.generated-->
@@ -145,6 +193,15 @@
<if test="rtuAddr != null">
rtu_addr,
</if>
+ <if test="isOver != null">
+ is_over,
+ </if>
+ <if test="ugState != null">
+ ug_state,
+ </if>
+ <if test="overDt != null">
+ over_dt,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -158,6 +215,15 @@
</if>
<if test="rtuAddr != null">
#{rtuAddr,jdbcType=VARCHAR},
+ </if>
+ <if test="isOver != null">
+ #{isOver,jdbcType=TINYINT},
+ </if>
+ <if test="ugState != null">
+ #{ugState,jdbcType=INTEGER},
+ </if>
+ <if test="overDt != null">
+ #{overDt,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
@@ -174,6 +240,15 @@
<if test="rtuAddr != null">
rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
</if>
+ <if test="isOver != null">
+ is_over = #{isOver,jdbcType=TINYINT},
+ </if>
+ <if test="ugState != null">
+ ug_state = #{isOver,jdbcType=INTEGER},
+ </if>
+ <if test="overDt != null">
+ over_dt = #{isOver,jdbcType=TIMESTAMP},
+ </if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@@ -182,7 +257,20 @@
update ug_rtu_controller
set task_id = #{taskId,jdbcType=BIGINT},
controller_id = #{controllerId,jdbcType=BIGINT},
- rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
+ rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
+ is_over = #{isOver,jdbcType=TINYINT},
+ ug_state = #{ugState,jdbcType=INTEGER},
+ over_dt = #{overDt,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=BIGINT}
</update>
+ <update id="updateRtuUpgradeState" >
+ <!--@mbg.generated-->
+ update ug_rtu_controller
+ set is_over = #{isOver,jdbcType=TINYINT},
+ ug_state = #{state,jdbcType=INTEGER},
+ over_dt = #{overDt,jdbcType=TIMESTAMP}
+ where task_id = #{taskId,jdbcType=BIGINT}
+ and rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
+ </update>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0