From 031ab702d1a6c08c5339b9f5f4514c6879941a97 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 07 五月 2025 10:47:24 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationSv.java | 33 ++++++++++++++++++++++++++-------
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIntake.java | 7 ++++++-
2 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIntake.java
index 2f1b987..07ed982 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIntake.java
@@ -11,7 +11,7 @@
*/
@Data
-@JsonPropertyOrder({"intakeName", "rtuAddr", "isOnLine"})
+@JsonPropertyOrder({"intakeName", "rtuAddr", "isOnLine", "isOpen"})
public class VoIntake {
private static final long serialVersionUID = 202504181410001L;
@@ -29,4 +29,9 @@
* 鏄惁鍦ㄧ嚎
*/
private Boolean isOnLine;
+
+ /**
+ * 鏄惁鎵撳紑
+ */
+ private Boolean isOpen;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationSv.java
index 205ec52..b853e64 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationSv.java
@@ -136,7 +136,10 @@
return map;
}
for (VoIntake intake : intakes) {
- intake.setIsOnLine(getRtuStatus(intake.getRtuAddr()));
+ Boolean isOnLine = getOnlineStatus(intake.getRtuAddr());
+ intake.setIsOnLine(isOnLine);
+ Boolean isOpen = getOpenCloseStatus(intake.getRtuAddr());
+ intake.setIsOpen(isOpen);
}
voGroupIntakes.setIntakes(intakes);
@@ -154,12 +157,7 @@
}
}
- /**
- * 鑾峰彇rtu鍦ㄧ嚎鎯呭喌
- * @param rtuAdd
- * @return
- */
- public Boolean getRtuStatus(String rtuAdd) {
+ public Boolean getOnlineStatus(String rtuAdd) {
Command com = new Command();
com.id = Command.defaultId;
com.code = CodeLocal.onLinePart;
@@ -180,6 +178,27 @@
}
}
+ public Boolean getOpenCloseStatus(String rtuAdd) {
+ Command com = new Command();
+ com.id = Command.defaultId;
+ com.code = CodeLocal.oneRtuStates;
+ com.type = CommandType.innerCommand;
+ com.setRtuAddr(rtuAdd);
+ com.setParam(rtuAdd);
+ JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
+
+ if (response == null || !response.getString("code").equals("0001") || response.getJSONObject("content").getJSONObject("attachment") == null) {
+ return false;
+ }
+
+ if(response.getJSONObject("content").getJSONObject("attachment").get("valveOpenTrueCloseFalse").equals("true")) {
+ return true;
+ }
+ else {
+ return false;
+ }
+ }
+
/**
* 鍙戦�佸懡浠�
*
--
Gitblit v1.8.0