From 1e69d160cb1e04b1438db0ca950dd5c15088619d Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 15:26:52 +0800
Subject: [PATCH] 灌溉计划终止时不区分终止方式

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoWatch.java |   67 +++++++++++++++++++++++++++++++++
 1 files changed, 67 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoWatch.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoWatch.java
new file mode 100644
index 0000000..7320ca6
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoWatch.java
@@ -0,0 +1,67 @@
+package com.dy.pipIrrGlobal.voUg;
+
+import com.dy.common.softUpgrade.state.UpgradeRtu;
+import com.dy.common.softUpgrade.state.UpgradeState;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/11/14 9:14
+ * @Description 鐩戣RTU杩滅▼鍗囩骇鐘舵�佸�煎璞�
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class VoWatch {
+    public VoUpgradeDetail upgrade ;
+    public UpgradeState overall ;//鍏ㄥ眬缁熻
+    public List<VoWatchRtu> rtus ;//涓�涓帶鍒跺櫒鍗囩骇鎯呭喌
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class VoWatchRtu{
+        public String rtuAddr ;     //鎺у埗鍣ㄥ湴鍧�
+        public Integer rate ;       //杩涘害
+        public String state;        //鍗囩骇鐘舵��
+        public Integer status;      //杩囩▼鐘舵�侊紙0锛氱绾匡紝1锛氬崌绾т腑锛�2锛氬崌绾ф垚鍔燂紝3鍗囩骇澶辫触锛夛紝鍓嶇鍒╃敤鍏惰缃崱鐗囨牱寮�
+        public Integer reTryTimes ; //閲嶈瘯娆℃暟
+        public Boolean over ;       //鏄惁缁撴潫锛坱rue锛氭槸锛宖alse锛氬惁锛�
+        public Boolean success ;    //鏄惁鎴愬姛锛坣ull:杩涜涓紝true锛氭槸锛宖alse锛氬惁锛�
+
+        public void fromCache(UpgradeRtu ugRtu){
+            this.rtuAddr = ugRtu.rtuAddr ;
+
+            this.rate = (ugRtu.currentPackage * 1000)/ugRtu.totalPackage ;//鍓嶇瀹炵幇鏄�1000浠界殑杩涘害鏉�
+
+            this.state = UpgradeRtu.getStateName(ugRtu.state) ;
+
+            //杩囩▼鐘舵�侊紙0锛氱绾匡紝1锛氬崌绾т腑锛�2锛氬崌绾ф垚鍔燂紝3鍗囩骇澶辫触锛夛紝鍓嶇鍒╃敤鍏惰缃崱鐗囨牱寮�
+            this.status = 1 ;//榛樿鍗囩骇涓�
+            if(ugRtu.state == UpgradeRtu.STATE_OFFLINE){
+                this.status = 0 ;
+            }else if(ugRtu.state == UpgradeRtu.STATE_SUCCESS){
+                this.status = 2 ;
+            }else {
+                if(ugRtu.isOver && ugRtu.state != UpgradeRtu.STATE_SUCCESS){
+                    this.status = 3;
+                }
+            }
+
+
+            this.reTryTimes = ugRtu.reTryTimes ;
+
+            this.over = ugRtu.isOver ;
+
+            if(ugRtu.isOver){
+                this.success = (ugRtu.state == UpgradeRtu.STATE_SUCCESS ? true : false) ;
+            }else{
+                this.success = null ;
+            }
+        }
+    }
+}

--
Gitblit v1.8.0