From 80a4c2dee40aa6ed9ee750ebc431c0b4a3d8758f Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 16 一月 2024 16:08:12 +0800
Subject: [PATCH] 2024-01-16 朱宝民 重构流浪控制器表和控制器表
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml | 151 ++++++++++++++++++++++++++-----------------------
1 files changed, 80 insertions(+), 71 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 df83fbb..9227924 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -5,18 +5,18 @@
<!--@mbg.generated-->
<!--@Table pr_controller-->
<id column="id" jdbcType="BIGINT" property="id" />
- <result column="code" jdbcType="VARCHAR" property="code" />
+ <result column="intakeId" jdbcType="BIGINT" property="intakeId" />
+ <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" />
- <result column="addWays" jdbcType="TINYINT" property="addways" />
+ <result column="findDt" jdbcType="TIMESTAMP" property="findDt" />
+ <result column="addWays" jdbcType="TINYINT" property="addWays" />
<result column="operator" jdbcType="BIGINT" property="operator" />
- <result column="operateDt" jdbcType="TIMESTAMP" property="operatedt" />
+ <result column="operateDt" jdbcType="TIMESTAMP" property="operateDt" />
<result column="deleted" jdbcType="TINYINT" property="deleted" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, code, protocol, onlineState, reportTime, addWays, `operator`, operateDt, deleted
+ id, intakeId, rtuAddr, protocol, findDt, 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,
- onlineState, reportTime, addWays,
+ insert into pr_controller (id, intakeId, rtuAddr,
+ protocol, findDt, addWays,
`operator`, operateDt, deleted
)
- values (#{id,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR},
- #{onlinestate,jdbcType=TINYINT}, #{reporttime,jdbcType=TIMESTAMP}, #{addways,jdbcType=TINYINT},
- #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}, #{deleted,jdbcType=TINYINT}
+ values (#{id,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR},
+ #{protocol,jdbcType=VARCHAR}, #{findDt,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,25 +48,25 @@
<if test="id != null">
id,
</if>
- <if test="code != null">
- code,
+ <if test="intakeId != null">
+ intakeId,
+ </if>
+ <if test="rtuAddr != null">
+ rtuAddr,
</if>
<if test="protocol != null">
protocol,
</if>
- <if test="onlinestate != null">
- onlineState,
+ <if test="findDt != null">
+ findDt,
</if>
- <if test="reporttime != null">
- reportTime,
- </if>
- <if test="addways != null">
+ <if test="addWays != null">
addWays,
</if>
<if test="operator != null">
`operator`,
</if>
- <if test="operatedt != null">
+ <if test="operateDt != null">
operateDt,
</if>
<if test="deleted != null">
@@ -79,26 +77,26 @@
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
- <if test="code != null">
- #{code,jdbcType=VARCHAR},
+ <if test="intakeId != null">
+ #{intakeId,jdbcType=BIGINT},
+ </if>
+ <if test="rtuAddr != null">
+ #{rtuAddr,jdbcType=VARCHAR},
</if>
<if test="protocol != null">
#{protocol,jdbcType=VARCHAR},
</if>
- <if test="onlinestate != null">
- #{onlinestate,jdbcType=TINYINT},
+ <if test="findDt != null">
+ #{findDt,jdbcType=TIMESTAMP},
</if>
- <if test="reporttime != null">
- #{reporttime,jdbcType=TIMESTAMP},
- </if>
- <if test="addways != null">
- #{addways,jdbcType=TINYINT},
+ <if test="addWays != null">
+ #{addWays,jdbcType=TINYINT},
</if>
<if test="operator != null">
#{operator,jdbcType=BIGINT},
</if>
- <if test="operatedt != null">
- #{operatedt,jdbcType=TIMESTAMP},
+ <if test="operateDt != null">
+ #{operateDt,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
#{deleted,jdbcType=TINYINT},
@@ -109,26 +107,26 @@
<!--@mbg.generated-->
update pr_controller
<set>
- <if test="code != null">
- code = #{code,jdbcType=VARCHAR},
+ <if test="intakeId != null">
+ intakeId = #{intakeId,jdbcType=BIGINT},
+ </if>
+ <if test="rtuAddr != null">
+ rtuAddr = #{rtuAddr,jdbcType=VARCHAR},
</if>
<if test="protocol != null">
protocol = #{protocol,jdbcType=VARCHAR},
</if>
- <if test="onlinestate != null">
- onlineState = #{onlinestate,jdbcType=TINYINT},
+ <if test="findDt != null">
+ findDt = #{findDt,jdbcType=TIMESTAMP},
</if>
- <if test="reporttime != null">
- reportTime = #{reporttime,jdbcType=TIMESTAMP},
- </if>
- <if test="addways != null">
- addWays = #{addways,jdbcType=TINYINT},
+ <if test="addWays != null">
+ addWays = #{addWays,jdbcType=TINYINT},
</if>
<if test="operator != null">
`operator` = #{operator,jdbcType=BIGINT},
</if>
- <if test="operatedt != null">
- operateDt = #{operatedt,jdbcType=TIMESTAMP},
+ <if test="operateDt != null">
+ operateDt = #{operateDt,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
deleted = #{deleted,jdbcType=TINYINT},
@@ -139,33 +137,34 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoPr.PrController">
<!--@mbg.generated-->
update pr_controller
- set code = #{code,jdbcType=VARCHAR},
+ set intakeId = #{intakeId,jdbcType=BIGINT},
+ rtuAddr = #{rtuAddr,jdbcType=VARCHAR},
protocol = #{protocol,jdbcType=VARCHAR},
- onlineState = #{onlinestate,jdbcType=TINYINT},
- reportTime = #{reporttime,jdbcType=TIMESTAMP},
- addWays = #{addways,jdbcType=TINYINT},
+ findDt = #{findDt,jdbcType=TIMESTAMP},
+ addWays = #{addWays,jdbcType=TINYINT},
`operator` = #{operator,jdbcType=BIGINT},
- operateDt = #{operatedt,jdbcType=TIMESTAMP},
+ operateDt = #{operateDt,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
- <!--鏍规嵁鎸囧畾鑾峰彇鎺у埗鍣ㄨ褰曟暟-->
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鎺у埗鍣ㄨ褰曟暟-->
<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
+ INNER JOIN pr_intake inta ON con.intakeId = inta.id
<where>
AND ic.operateType = 1
- <if test = "controllerCode != null and controllerCode !=''">
- AND con.code like CONCAT('%',#{controllerCode},'%')
+ AND deleted = 0
+
+ <if test = "id != null and id > 0">
+ AND con.id = ${id}
</if>
- <if test = "onlineState != null and onlineState > 0">
- AND con.onlineState = ${onlineState}
+ <if test = "rtuAddr != null and rtuAddr !=''">
+ AND con.rtuAddr like CONCAT('%',#{rtuAddr},'%')
</if>
<if test = "bindNumber != null and bindNumber > 0">
@@ -174,30 +173,26 @@
</where>
</select>
- <!--鏍规嵁鎸囧畾鑾峰彇鎺у埗鍣ㄨ褰�-->
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鎺у埗鍣ㄨ褰�-->
<select id="getControllers" resultType="com.dy.pipIrrGlobal.voPr.VoController">
SELECT
- (@i:=@i+1) AS id,
- con.code AS controllerCode,
- (CASE
- WHEN con.onlineState = 1 THEN "鍦ㄧ嚎"
- WHEN con.onlineState = 2 THEN "绂荤嚎"
- END) AS onlineState,
+ con.rtuAddr AS rtuAddr,
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
+ con.findDt
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
+ INNER JOIN pr_intake inta ON con.intakeId = inta.id
<where>
AND ic.operateType = 1
- <if test = "controllerCode != null and controllerCode !=''">
- AND con.code like CONCAT('%',#{controllerCode},'%')
+ AND deleted = 0
+
+ <if test = "id != null and id > 0">
+ AND con.id = ${id}
</if>
- <if test = "onlineState != null and onlineState > 0">
- AND con.onlineState = ${onlineState}
+ <if test = "rtuAddr != null and rtuAddr !=''">
+ AND con.rtuAddr like CONCAT('%',#{rtuAddr},'%')
</if>
<if test = "bindNumber != null and bindNumber > 0">
@@ -208,6 +203,20 @@
<if test="pageCurr != null and pageSize != null">
LIMIT ${pageCurr}, ${pageSize}
</if>
+ </select>
+ <!--鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛�-->
+ <select id="getControllersByAddr" resultType="java.util.Map">
+ SELECT id, rtuAddr FROM pr_controller WHERE deleted = 0 AND rtuAddr LIKE CONCAT('%',#{rtuAddr},'%')
+ </select>
+
+ <!--鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗-->
+ <update id="deleteControllerById">
+ UPDATE pr_controller SET deleted = 1 WHERE id = ${controllerId}
+ </update>
+
+ <!--鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨湭鍒犻櫎鐨勬帶鍒跺櫒鏁伴噺-->
+ <select id="getRecordCountOfController" resultType="java.lang.Integer">
+ SELECT COUNT(*) AS recordCount FROM pr_controller WHERE deleted = 0 AND id = ${controllerId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0