From 765e33b30a4ecd81a9634a12dc01d4cc5564168b Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 06 五月 2025 17:23:39 +0800
Subject: [PATCH] 获取一个取水口接口返回值增加控制器地址和通讯协议字段

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 5852ca9..968d7d7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -50,13 +50,16 @@
         ge.`operator`,
         ge.operateDt,
         blo.`name`                                          AS blockName,
-        CONCAT(country.`name`, town.`name`, village.`name`)              AS address
+        CONCAT(country.`name`, town.`name`, village.`name`)              AS address,
+        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 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
         where ge.id = #{id,jdbcType=BIGINT}
         AND ge.deleted = 0
         AND divi.deleted = 0

--
Gitblit v1.8.0