From 5ee942699758ba6c75575b63fb24647bcda4fdb8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 15 一月 2024 17:24:17 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml | 99 +++++++++++++++++++++++--------------------------
1 files changed, 46 insertions(+), 53 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
index ef5aef9..d1e61b0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -5,7 +5,7 @@
<!--@mbg.generated-->
<!--@Table pr_controller-->
<id column="id" jdbcType="BIGINT" property="id" />
- <result column="code" jdbcType="VARCHAR" property="code" />
+ <result column="rtuAddr" jdbcType="VARCHAR" property="rtuaddr" />
<result column="protocol" jdbcType="VARCHAR" property="protocol" />
<result column="onlineState" jdbcType="TINYINT" property="onlinestate" />
<result column="reportTime" jdbcType="TIMESTAMP" property="reporttime" />
@@ -16,7 +16,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, code, protocol, onlineState, reportTime, addWays, `operator`, operateDt, deleted
+ id, rtuAddr, protocol, onlineState, reportTime, addWays, `operator`, operateDt, deleted
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -30,19 +30,17 @@
delete from pr_controller
where id = #{id,jdbcType=BIGINT}
</delete>
-
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoPr.PrController">
<!--@mbg.generated-->
- insert into pr_controller (id, code, protocol,
+ insert into pr_controller (id, rtuAddr, protocol,
onlineState, reportTime, addWays,
`operator`, operateDt, deleted
)
- values (#{id,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR},
+ values (#{id,jdbcType=BIGINT}, #{rtuaddr,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR},
#{onlinestate,jdbcType=TINYINT}, #{reporttime,jdbcType=TIMESTAMP}, #{addways,jdbcType=TINYINT},
#{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}, #{deleted,jdbcType=TINYINT}
)
</insert>
-
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoPr.PrController">
<!--@mbg.generated-->
insert into pr_controller
@@ -50,8 +48,8 @@
<if test="id != null">
id,
</if>
- <if test="code != null">
- code,
+ <if test="rtuaddr != null">
+ rtuAddr,
</if>
<if test="protocol != null">
protocol,
@@ -79,8 +77,8 @@
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
- <if test="code != null">
- #{code,jdbcType=VARCHAR},
+ <if test="rtuaddr != null">
+ #{rtuaddr,jdbcType=VARCHAR},
</if>
<if test="protocol != null">
#{protocol,jdbcType=VARCHAR},
@@ -109,8 +107,8 @@
<!--@mbg.generated-->
update pr_controller
<set>
- <if test="code != null">
- code = #{code,jdbcType=VARCHAR},
+ <if test="rtuaddr != null">
+ rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
</if>
<if test="protocol != null">
protocol = #{protocol,jdbcType=VARCHAR},
@@ -139,7 +137,7 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoPr.PrController">
<!--@mbg.generated-->
update pr_controller
- set code = #{code,jdbcType=VARCHAR},
+ set rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
protocol = #{protocol,jdbcType=VARCHAR},
onlineState = #{onlinestate,jdbcType=TINYINT},
reportTime = #{reporttime,jdbcType=TIMESTAMP},
@@ -153,11 +151,10 @@
<!--鏍规嵁鎸囧畾鑾峰彇鎺у埗鍣ㄨ褰曟暟-->
<select id="getRecordCount" resultType="java.lang.Long">
SELECT
- COUNT(*) AS recordCount
+ COUNT(*) AS recordCount
FROM pr_controller con
INNER JOIN pr_intake_controller ic ON ic.controllerId = con.id
INNER JOIN pr_intake inta ON ic.intakeId = inta.id
- , (SELECT @i:=0) AS itable
<where>
AND ic.operateType = 1
@@ -165,8 +162,8 @@
AND con.id = ${id}
</if>
- <if test = "controllerCode != null and controllerCode !=''">
- AND con.code like CONCAT('%',#{controllerCode},'%')
+ <if test = "rtuAddr != null and rtuAddr !=''">
+ AND con.rtuAddr like CONCAT('%',#{rtuAddr},'%')
</if>
<if test = "onlineState != null and onlineState > 0">
@@ -182,50 +179,46 @@
<!--鏍规嵁鎸囧畾鑾峰彇鎺у埗鍣ㄨ褰�-->
<select id="getControllers" resultType="com.dy.pipIrrGlobal.voPr.VoController">
SELECT
- (@i:=@i+1) AS id,
- t.* FROM(
- SELECT
- con.code AS controllerCode,
- (CASE
- WHEN con.onlineState = 1 THEN "鍦ㄧ嚎"
- WHEN con.onlineState = 2 THEN "绂荤嚎"
- END) AS onlineState,
- inta.name AS intakeName,
- (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) AS bindNumber,
- con.reportTime
- FROM pr_controller con
- INNER JOIN pr_intake_controller ic ON ic.controllerId = con.id
- INNER JOIN pr_intake inta ON ic.intakeId = inta.id
- <where>
- AND ic.operateType = 1
+ con.rtuAddr AS rtuAddr,
+ (CASE
+ WHEN con.onlineState = 1 THEN "鍦ㄧ嚎"
+ WHEN con.onlineState = 2 THEN "绂荤嚎"
+ END) AS onlineState,
+ inta.name AS intakeName,
+ (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) AS bindNumber,
+ con.reportTime
+ FROM pr_controller con
+ INNER JOIN pr_intake_controller ic ON ic.controllerId = con.id
+ INNER JOIN pr_intake inta ON ic.intakeId = inta.id
+ <where>
+ AND ic.operateType = 1
- <if test = "id != null and id > 0">
- AND con.id = ${id}
- </if>
+ <if test = "id != null and id > 0">
+ AND con.id = ${id}
+ </if>
- <if test = "controllerCode != null and controllerCode !=''">
- AND con.code like CONCAT('%',#{controllerCode},'%')
- </if>
+ <if test = "rtuAddr != null and rtuAddr !=''">
+ AND con.rtuAddr like CONCAT('%',#{rtuAddr},'%')
+ </if>
- <if test = "onlineState != null and onlineState > 0">
- AND con.onlineState = ${onlineState}
- </if>
+ <if test = "onlineState != null and onlineState > 0">
+ AND con.onlineState = ${onlineState}
+ </if>
- <if test = "bindNumber != null and bindNumber > 0">
- AND (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) = ${bindNumber}
- </if>
- </where>
- ORDER BY con.operateDt DESC
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
- ) t
- , (SELECT @i:=0) AS itable
+ <if test = "bindNumber != null and bindNumber > 0">
+ AND (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) = ${bindNumber}
+ </if>
+ </where>
+ ORDER BY con.operateDt DESC
+ <if test="pageCurr != null and pageSize != null">
+ LIMIT ${pageCurr}, ${pageSize}
+ </if>
+
</select>
<!--鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨帶鍒跺櫒鍒楄〃-->
<select id="getControllersByCode" resultType="java.util.Map">
- SELECT id, code FROM pr_controller WHERE code LIKE CONCAT('%',#{controllerCode},'%')
+ SELECT id, rtuAddr FROM pr_controller WHERE rtuAddr LIKE CONCAT('%',#{rtuAddr},'%')
</select>
<!--鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗-->
--
Gitblit v1.8.0