From d15cae9e8d2cabf8d0f3ed41f2f88b04131f8c76 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 七月 2025 14:18:58 +0800
Subject: [PATCH] 增加查询单个设备（RTU或FBox）是否在线的功能接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 16 ++++++++++------
1 files changed, 10 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 5852ca9..01b3bcf 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -50,17 +50,19 @@
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.id AS controllerId,
+ 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
+ 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">
@@ -593,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