From 44180ee779c038ad628fcd847a0b8e2ca9b6f4ee Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 22 十一月 2024 10:46:17 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoWatch.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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
index 79b39b2..2c31869 100644
--- 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
@@ -28,17 +28,32 @@
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 ; //鏄惁鎴愬姛锛坱rue锛氭槸锛宖alse锛氬惁锛�
+ 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) ;
+ 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 ;
- this.success = ugRtu.state == UpgradeRtu.STATE_SUCCESS ? true : false ;
+ if(ugRtu.isOver){
+ this.success = (ugRtu.state == UpgradeRtu.STATE_SUCCESS ? true : false) ;
+ }else{
+ this.success = null ;
+ }
}
}
}
--
Gitblit v1.8.0