From b218f31bb202cffa656fa4ee09bdd8d67f8ed0ef Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 13 五月 2025 17:29:42 +0800
Subject: [PATCH] 1、根据江海调整，功能码92、A2的应答中的日期时间去除； 2、表阀一体机的开关阀上行数据（84、85）处理逻辑进行修改。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 885c6b7..01b3bcf 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -55,16 +55,14 @@
con.rtuAddr,
con.protocol
FROM pr_intake ge
- INNER JOIN pr_divide divi ON ge.divideId = divi.id
- INNER JOIN ba_block blo ON divi.blockId = blo.id
+ LEFT JOIN pr_divide divi ON ge.divideId = divi.id
+ LEFT JOIN ba_block blo ON divi.blockId = blo.id
LEFT JOIN ba_district country ON ge.countyId = country.id
LEFT JOIN ba_district town ON ge.townId = town.id
LEFT JOIN ba_district village ON ge.villageId = village.id
- INNER JOIN pr_controller con ON con.intakeId = ge.id
+ LEFT JOIN pr_controller con ON con.intakeId = ge.id
where ge.id = #{id,jdbcType=BIGINT}
AND ge.deleted = 0
- AND divi.deleted = 0
- AND blo.deleted = 0
</select>
<delete id="deleteLogicById" parameterType="java.lang.Long">
@@ -597,7 +595,9 @@
SELECT
inta.id AS intakeId,
con.rtuAddr,
- inta.name AS intakeNum,
+ con.protocol,
+ con.protocol_version AS protocolVersion,
+ inta.name AS intakeNum,
inta.lng,
inta.lat,
IFNULL(hou.instant_amount, 0) AS instantAmount,
--
Gitblit v1.8.0