From c568a328a8c273531773710fe814ac429bafc48f Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 29 一月 2024 14:09:12 +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 | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 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 fa8b81d..aa36478 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml @@ -19,13 +19,14 @@ <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 + id, rtuAddr, intakeId </sql> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <!--@mbg.generated--> @@ -157,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 @@ -236,4 +242,9 @@ <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> </mapper> \ No newline at end of file -- Gitblit v1.8.0