From 841c8fec5cda842161bd8e8d28bf6deb83ae806c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:31:16 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java | 12 +++++++++++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 5 ++++-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java
index 311d47f..7d09b66 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java
@@ -15,7 +15,7 @@
* @Description
*/
@Data
-@JsonPropertyOrder({ "id", "countyId", "townId", "villageId", "divideId", "blockId", "name", "lng", "lat", "remarks", "operator", "operateDt", "blockName", "address"})
+@JsonPropertyOrder({ "id", "countyId", "townId", "villageId", "divideId", "blockId", "name", "lng", "lat", "remarks", "operator", "operateDt", "blockName", "address", "rtuAddr", "protocol"})
public class VoAllIntake implements BaseEntity {
private static final long serialVersionUID = 202412161003001L;
@@ -95,4 +95,14 @@
* 鍦板潃
*/
private String address;
+
+ /**
+ * RTU鍦板潃
+ */
+ private String rtuAddr;
+
+ /**
+ * 閫氳鍗忚
+ */
+ private String protocol;
}
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