From 595b66ae8800511fab34e503f94d173613088c08 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 01 三月 2025 09:57:38 +0800
Subject: [PATCH] 1、表阀一体机新协议开阀报关阀报数据处理逻辑修改； 2、农户月用水统计查询中，缺少农户姓名，进行SQL修改。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoWatch.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 2c31869..7320ca6 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,15 +28,19 @@
public String rtuAddr ; //鎺у埗鍣ㄥ湴鍧�
public Integer rate ; //杩涘害
public String state; //鍗囩骇鐘舵��
- public Integer status; //杩囩▼鐘舵�侊紙0锛氱绾匡紝1锛氬崌绾т腑锛�2锛氬崌绾ф垚鍔燂紝3鍗囩骇澶辫触锛�
+ 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 ;
@@ -47,8 +51,12 @@
this.status = 3;
}
}
+
+
this.reTryTimes = ugRtu.reTryTimes ;
+
this.over = ugRtu.isOver ;
+
if(ugRtu.isOver){
this.success = (ugRtu.state == UpgradeRtu.STATE_SUCCESS ? true : false) ;
}else{
--
Gitblit v1.8.0