From f4d206d07eaeabad56e2918edf9799af13bb526e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 12 五月 2025 17:38:12 +0800
Subject: [PATCH] 表阀一体机:web后端系统,实现功能码5B、5C、15、16、22、30、31、50、55、56、65、68、97、98、99远程命令。

---
 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 968d7d7..73fcad0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -51,6 +51,7 @@
         ge.operateDt,
         blo.`name`                                          AS blockName,
         CONCAT(country.`name`, town.`name`, village.`name`)              AS address,
+        con.id AS controllerId,
         con.rtuAddr,
         con.protocol
         FROM pr_intake ge
@@ -596,7 +597,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