From 11c7a9b0270cbf529ebb5e434b5fe0593dd209f0 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 30 五月 2024 09:43:01 +0800
Subject: [PATCH] 2024-05-30 朱宝民 添加微信和手机App两个子模块
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 9 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 9227924..928d0a5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -14,13 +14,23 @@
<result column="operateDt" jdbcType="TIMESTAMP" property="operateDt" />
<result column="deleted" jdbcType="TINYINT" property="deleted" />
</resultMap>
+ <resultMap id="PartResultMap" type="com.dy.pipIrrGlobal.pojoPr.PrController">
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="intakeId" jdbcType="BIGINT" property="intakeId" />
+ <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
+ </resultMap>
+
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, intakeId, rtuAddr, protocol, findDt, addWays, `operator`, operateDt, deleted
</sql>
+ <sql id="Part_Column_List">
+ <!--@mbg.generated-->
+ id, rtuAddr, intakeId
+ </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
- select
+ select
<include refid="Base_Column_List" />
from pr_controller
where id = #{id,jdbcType=BIGINT}
@@ -32,8 +42,8 @@
</delete>
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoPr.PrController">
<!--@mbg.generated-->
- insert into pr_controller (id, intakeId, rtuAddr,
- protocol, findDt, addWays,
+ insert into pr_controller (id, intakeId, rtuAddr,
+ protocol, findDt, addWays,
`operator`, operateDt, deleted
)
values (#{id,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR},
@@ -148,6 +158,11 @@
where id = #{id,jdbcType=BIGINT}
</update>
+ <!--鏍规嵁鎺у埗鍣ㄧ紪鍙峰垹闄ゅ彇姘村彛缂栧彿-->
+ <update id="deleteIntakeId">
+ UPDATE pr_controller SET intakeId = null WHERE id = ${controllerId}
+ </update>
+
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鎺у埗鍣ㄨ褰曟暟-->
<select id="getRecordCount" resultType="java.lang.Long">
SELECT
@@ -157,7 +172,7 @@
INNER JOIN pr_intake inta ON con.intakeId = inta.id
<where>
AND ic.operateType = 1
- AND deleted = 0
+ AND con.deleted = 0
<if test = "id != null and id > 0">
AND con.id = ${id}
@@ -176,16 +191,18 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鎺у埗鍣ㄨ褰�-->
<select id="getControllers" resultType="com.dy.pipIrrGlobal.voPr.VoController">
SELECT
+ CAST(con.id AS char) AS id,
con.rtuAddr AS rtuAddr,
inta.name AS intakeName,
+ "鍦ㄧ嚎" AS onlineState,
(SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) AS bindNumber,
- con.findDt
+ con.findDt AS findDt
FROM pr_controller con
INNER JOIN pr_intake_controller ic ON ic.controllerId = con.id
INNER JOIN pr_intake inta ON con.intakeId = inta.id
<where>
AND ic.operateType = 1
- AND deleted = 0
+ AND con.deleted = 0
<if test = "id != null and id > 0">
AND con.id = ${id}
@@ -200,14 +217,24 @@
</if>
</where>
ORDER BY con.operateDt DESC
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
+ <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="getControllersByAddr" resultType="java.util.Map">
SELECT id, rtuAddr FROM pr_controller WHERE deleted = 0 AND rtuAddr LIKE CONCAT('%',#{rtuAddr},'%')
+ </select>
+
+ <!--鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛�-->
+ <select id="getControllersByRtuAddrAndIntakeNotNull" parameterType="java.lang.String" resultMap="PartResultMap">
+ SELECT
+ <include refid="Part_Column_List">
+ </include>
+ FROM pr_controller WHERE deleted = 0 AND intakeId is not null AND rtuAddr=#{rtuAddr,jdbcType=VARCHAR}
</select>
<!--鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗-->
@@ -219,4 +246,19 @@
<select id="getRecordCountOfController" resultType="java.lang.Integer">
SELECT COUNT(*) AS recordCount FROM pr_controller WHERE deleted = 0 AND id = ${controllerId}
</select>
+
+ <!--鏍规嵁娴佹氮鎺у埗鍣ㄧ紪鍙疯幏鍙栧凡缁戝畾璁板綍鏁�-->
+ <select id="getBindedCount" resultType="java.lang.Integer">
+ SELECT COUNT(*) AS recordCount FROM pr_controller WHERE rtuAddr = (SELECT rtuAddr FROM pr_controller_tramp WHERE id = ${controllerId}) AND intakeId IS NOT NULL
+ </select>
+
+ <!--鏍规嵁鍙栨按鍙D鑾峰彇闃�鎺у櫒瀵硅薄-->
+ <select id="getControllerByIntakeId" resultType="com.dy.pipIrrGlobal.pojoPr.PrController">
+ SELECT * FROM pr_controller WHERE deleted = 0 AND intakeId = #{intakeId} LIMIT 0,1
+ </select>
+
+ <!--鏍规嵁RTU鍦板潃鑾峰彇闃�鎺у櫒瀵硅薄-->
+ <select id="getControllerByRtuAddr" resultType="com.dy.pipIrrGlobal.pojoPr.PrController">
+ SELECT * FROM pr_controller WHERE deleted = 0 AND rtuAddr = #{rtuAddr} LIMIT 0,1
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0