From c7c8554e2b9809bc90ac4a43fdaa39dfe16f4ab0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 09 五月 2025 14:09:32 +0800
Subject: [PATCH] “远程测控”功能返回数据中增加protocol和protocolVersion属性，以备前端做多协议兼容。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java | 10 +++++++++-
pipIrr-platform/文档/万用token.txt | 1 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 4 +++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
index dd4a4c0..476b14a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
@@ -16,7 +16,7 @@
*/
@Data
-@JsonPropertyOrder({ "intakeId", "rtuAddr", "intakeNum", "isOnLine", "isBinded", "alarm" ,"instantAmount", "totalAmount"})
+@JsonPropertyOrder({ "intakeId", "rtuAddr", "protocol", "protocolVersion", "intakeNum", "isOnLine", "isBinded", "alarm" ,"instantAmount", "totalAmount"})
public class VoOnLineIntake implements BaseEntity {
private static final long serialVersionUID = 202405271703001L;
@@ -29,6 +29,14 @@
* 闃�鎺у櫒鍦板潃
*/
private String rtuAddr;
+ /**
+ * 闃�鎺у櫒閫氫俊鍗忚
+ */
+ private String protocol;
+ /**
+ * 闃�鎺у櫒閫氫俊鍗忚
+ */
+ private Integer protocolVersion;
/**
* 鍙栨按鍙ｇ紪鍙�
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 885c6b7..73fcad0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -597,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,
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\344\270\207\347\224\250token.txt" "b/pipIrr-platform/\346\226\207\346\241\243/\344\270\207\347\224\250token.txt"
new file mode 100644
index 0000000..397ac61
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/\344\270\207\347\224\250token.txt"
@@ -0,0 +1 @@
+0000-0000-1234-9876-5
\ No newline at end of file
--
Gitblit v1.8.0