From c4d56f4a2c7687739f3bf0f43bcc1f35c9bbeb8b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 14 五月 2025 15:18:44 +0800
Subject: [PATCH] 1、表阀一体协议解析同步新版本；2、默认设备是表阀一体（0x02）
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml | 311 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 311 insertions(+), 0 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
new file mode 100644
index 0000000..fd8a25f
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.daoRm.UgRtuControllerMapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
+ <!--@mbg.generated-->
+ <!--@Table ug_rtu_controller-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <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, is_over, ug_state, over_dt
+ </sql>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from ug_rtu_controller
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鎺у埗鍣ㄨ褰曟暟-->
+ <select id="selectRecordCount" resultType="java.lang.Long">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM pr_controller con
+ INNER JOIN ug_rtu_controller rc ON rc.controller_id = con.id
+ INNER JOIN pr_intake inta ON con.intakeId = inta.id
+ <where>
+ <if test = "taskId != null and taskId > 0">
+ AND rc.task_id = #{taskId}
+ </if>
+ <if test = "rtuAddr != null and rtuAddr !=''">
+ AND con.rtuAddr = #{rtuAddr}
+ </if>
+ <if test = "intakeNum != null and intakeNum !=''">
+ AND inta.name like CONCAT('%',#{intakeNum},'%')
+ </if>
+ <if test = "protocolName != null and protocolName !=''">
+ AND con.protocol = #{protocolName}
+ </if>
+ <if test = "protocolVersion != null">
+ AND con.protocol_version = #{protocolVersion}
+ </if>
+ </where>
+ </select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鎺у埗鍣ㄨ褰�-->
+ <select id="selectControllers" resultType="com.dy.pipIrrGlobal.voPr.VoController">
+ SELECT
+ CAST(rc.id AS char) AS id,
+ con.rtuAddr AS rtuAddr,
+ inta.name AS intakeName,
+ con.protocol,
+ con.protocol_version,
+ inta.remarks,
+ con.findDt AS findDt
+ FROM pr_controller con
+ INNER JOIN ug_rtu_controller rc ON rc.controller_id = con.id
+ INNER JOIN pr_intake inta ON con.intakeId = inta.id
+ <where>
+ AND con.deleted = 0
+ <if test = "taskId != null and taskId > 0">
+ AND rc.task_id = #{taskId}
+ </if>
+ <if test = "rtuAddr != null and rtuAddr !=''">
+ AND con.rtuAddr like CONCAT('%',#{rtuAddr},'%')
+ </if>
+ <if test = "intakeNum != null and intakeNum !=''">
+ AND inta.name like CONCAT('%',#{intakeNum},'%')
+ </if>
+ <if test = "protocolName != null and protocolName !=''">
+ AND con.protocol = #{protocolName}
+ </if>
+ <if test = "protocolVersion != null">
+ AND con.protocol_version = #{protocolVersion}
+ </if>
+ </where>
+ ORDER BY con.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="selectAllConByTask" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from ug_rtu_controller
+ where task_id = #{taskId,jdbcType=BIGINT}
+ </select>
+
+ <select id="selectAllRtuAddrByTask" parameterType="java.lang.Long" resultType="java.lang.String">
+ <!--@mbg.generated-->
+ select
+ rtu_addr
+ from ug_rtu_controller
+ where task_id = #{taskId,jdbcType=BIGINT}
+ </select>
+
+ <select id="selectCountByTaskAndCon" resultType="java.lang.Long">
+ <!--@mbg.generated-->
+ select
+ count(*)
+ from ug_rtu_controller
+ <where>
+ <if test="taskId != null">
+ AND task_id = #{taskId,jdbcType=BIGINT}
+ </if>
+ <if test="conId != null">
+ AND controller_id = #{conId,jdbcType=BIGINT}
+ </if>
+ </where>
+ </select>
+
+
+ <select id="selectControllerUpgradeResultsCount" resultType="java.lang.Long">
+ <!--@mbg.generated-->
+ select
+ count(*)
+ from ug_rtu_controller ugCon
+ inner join ug_rtu_task ugTask on ugCon.task_id = ugTask.id
+ inner join pr_controller con on ugCon.controller_id = con.id
+ inner join pr_intake inta on con.intakeId = inta.id
+ <where>
+ <if test="taskId != null">
+ AND ugCon.task_id = #{taskId,jdbcType=BIGINT}
+ </if>
+ <if test="intakeNum != null and intakeNum != ''">
+ AND inta.name = #{intakeNum,jdbcType=VARCHAR}
+ </if>
+ <if test="rtuAddr != null and rtuAddr != ''">
+ AND ugCon.rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
+ </if>
+ <if test="state != null and state == 1">
+ AND ugCon.ug_state = 1
+ </if>
+ <if test="state != null and state == 0">
+ AND ugCon.ug_state != 1
+ </if>
+ <if test="fail != null">
+ AND ugCon.ug_state = #{fail,jdbcType=INTEGER}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectControllerUpgradeResults" resultType="com.dy.pipIrrGlobal.voUg.VoUgResult">
+ <!--@mbg.generated-->
+ select
+ ugCon.id as id,
+ inta.name as intakeNum,
+ ugCon.rtu_addr as rtuAddr,
+ ugCon.is_over as isOver,
+ ugCon.ug_state as ugState,
+ ugCon.over_dt as overDt
+ from ug_rtu_controller ugCon
+ inner join ug_rtu_task ugTask on ugCon.task_id = ugTask.id
+ inner join pr_controller con on ugCon.controller_id = con.id
+ inner join pr_intake inta on con.intakeId = inta.id
+ <where>
+ <if test="taskId != null">
+ AND ugCon.task_id = #{taskId,jdbcType=BIGINT}
+ </if>
+ <if test="intakeNum != null and intakeNum != ''">
+ AND inta.name = #{intakeNum,jdbcType=VARCHAR}
+ </if>
+ <if test="rtuAddr != null and rtuAddr != ''">
+ AND ugCon.rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
+ </if>
+ <if test="state != null and state == 1">
+ AND ugCon.ug_state = 1
+ </if>
+ <if test="state != null and state == 0">
+ AND ugCon.ug_state != 1
+ </if>
+ <if test="fail != null">
+ AND ugCon.ug_state = #{fail,jdbcType=INTEGER}
+ </if>
+ </where>
+ ORDER BY ugCon.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.pojoUg.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},
+ #{isOver,jdbcType=TINYINT}, #{ugState,jdbcType=INTEGER},
+ #{overDt,jdbcType=TIMESTAMP})
+ </insert>
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
+ <!--@mbg.generated-->
+ insert into ug_rtu_controller
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="taskId != null">
+ task_id,
+ </if>
+ <if test="controllerId != null">
+ controller_id,
+ </if>
+ <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">
+ #{id,jdbcType=BIGINT},
+ </if>
+ <if test="taskId != null">
+ #{taskId,jdbcType=BIGINT},
+ </if>
+ <if test="controllerId != null">
+ #{controllerId,jdbcType=BIGINT},
+ </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>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
+ <!--@mbg.generated-->
+ update ug_rtu_controller
+ <set>
+ <if test="taskId != null">
+ task_id = #{taskId,jdbcType=BIGINT},
+ </if>
+ <if test="controllerId != null">
+ controller_id = #{controllerId,jdbcType=BIGINT},
+ </if>
+ <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>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
+ <!--@mbg.generated-->
+ update ug_rtu_controller
+ set task_id = #{taskId,jdbcType=BIGINT},
+ controller_id = #{controllerId,jdbcType=BIGINT},
+ 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