From 21de9eefe1a98ba0f154febf268d551600deff04 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 23 六月 2025 17:25:16 +0800
Subject: [PATCH] 1、配置文件增加MQTT远程命令结果回调URL； 2、MQTT远程命令bug修改； 3、增加两说明文档； 4、配置文件规范。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 8 +++-----
1 files changed, 3 insertions(+), 5 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 73fcad0..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">
--
Gitblit v1.8.0