From eec55279b295eb447a2d0505ad078fa0c7c1a3d1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 25 十一月 2024 13:53:49 +0800
Subject: [PATCH] 设置一些调试日志输出
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java | 40 ++++++++++++++++++++++++++++++++++++----
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java | 8 +++++++-
2 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java
index b348fe8..678d2f2 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java
@@ -64,6 +64,11 @@
this.task = new UpgradeTask();
this.task.initOption(this.failTryTimes, this.ugMaxRtuSameTime);
this.task.setTask(vo);
+ log.error("==================================================") ;
+ log.error("= =") ;
+ log.error("=褰撳墠璁剧疆浜嗗崌绾т换鍔★紝鍏朵腑RTU鏈�" + vo.rtuAddrList.size() + "涓� =") ;
+ log.error("= =") ;
+ log.error("==================================================") ;
}catch (Exception e){
ex = e ;
}finally {
@@ -186,6 +191,11 @@
int temp = this.task.countNoOneRtuUpgradeInDuration() ;
if(temp == -1){
//褰撳墠娌℃湁RTU杩涜杩囧崌绾э紝鑰屼笖瓒呮椂浜嗭紝璁や负浠诲姟宸茬粡瀹屾垚
+ log.error("==================================================") ;
+ log.error("= =") ;
+ log.error("=褰撳墠娌℃湁RTU杩涜杩囧崌绾э紝鑰屼笖瓒呮椂浜嗭紝璁や负浠诲姟宸茬粡瀹屾垚 =") ;
+ log.error("= =") ;
+ log.error("==================================================") ;
this.task.taskIsOver = true ;
this.stop();
}else if(temp == 1){
@@ -193,11 +203,33 @@
//宸ヤ綔2锛氱粺璁″綋鍓嶆鍦ㄥ崌绾х殑RTU鏁伴噺锛屼负鍚屾椂鍗囩骇鏁伴噺闄愬埗鍋氬噯澶�
this.task.countRunningRtuCount() ;
- //宸ヤ綔3锛氱粺璁￠渶瑕佸崌绾т絾褰撳墠绂荤嚎RTU鐨勬儏鍐碉紝瓒呰繃鏃堕檺鐨勮澶囦负鍗囩骇瀹屾垚
- //this.task.countOffRtuAndSetIfOver() ;
-
+ //宸ヤ綔3锛氱粺璁￠渶瑕佸崌绾т絾褰撳墠绂荤嚎RTU鐨勬儏鍐碉紝瓒呰繃鏃堕檺鐨勮缃负鍗囩骇瀹屾垚
+ int tmp = this.task.countOffRtuAndSetIfOver() ;
+ if(tmp >= 1){
+ //瓒呮椂锛屽己鍒惰缃竴浜汻TU鍗囩骇澶辫触骞朵笖鍗囩骇瀹屾垚锛�
+ log.error("==================================================") ;
+ log.error("= =") ;
+ log.error("=瓒呮椂锛屽己鍒惰缃�" + tmp + "涓猂TU鍗囩骇澶辫触骞朵笖鍗囩骇瀹屾垚 =") ;
+ log.error("= =") ;
+ log.error("==================================================") ;
+ }else if(tmp == 0){
+ log.error("==================================================") ;
+ log.error("= =") ;
+ log.error("=瓒呮椂锛屽己鍒惰缃�0涓猂TU鍗囩骇澶辫触骞朵笖鍗囩骇瀹屾垚 =") ;
+ log.error("= =") ;
+ log.error("==================================================") ;
+ }else{//tmp = -1
+ //鏃犱换鍔￠�昏緫
+ }
//宸ヤ綔4锛氱粺璁℃槸鍚﹀叏閮ㄥ崌绾у畬鎴�
- //this.task.taskIsOver = this.task.countIsAllOver() ;
+ this.task.taskIsOver = this.task.countIsAllOver() ;
+ if(this.task.taskIsOver){
+ log.error("==================================================") ;
+ log.error("= =") ;
+ log.error("=鍗囩骇鍏ㄩ儴缁撴潫锛岃缃崌绾т换鍔″畬鎴� =") ;
+ log.error("= =") ;
+ log.error("==================================================") ;
+ }
}else if(temp == 0){
//褰撳墠娌℃湁涓�涓猂TU杩涜杩囧崌绾э紝涔熸病鏈夎秴鏃讹紝涓嶄綔涓�
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java
index 5e11afd..b19ea75 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java
@@ -320,20 +320,26 @@
/**
* 缁熻闇�瑕佸崌绾т絾褰撳墠绂荤嚎RTU鐨勬儏鍐碉紝瓒呰繃鏃堕檺鐨勮澶囦负鍗囩骇瀹屾垚
+ * @return -1:娌℃湁瓒呮椂锛�0瓒呮椂浜嗕笖鏃犲洜绂荤嚎琚己鍒惰缃崌绾у畬鎴愮殑RTU锛�>0绂荤嚎琚己鍒惰缃崌绾у畬鎴愮殑RTU鏁伴噺
*/
- protected void countOffRtuAndSetIfOver() {
+ protected int countOffRtuAndSetIfOver() {
Long now = System.currentTimeMillis() ;
if(now - this.setupDtLong > UpgradeUnit.confVo.rtuOffLineWaitDuration){
//rtu绂荤嚎锛岀瓑寰呭叾鍗囩骇鐨勬椂闀�(姣)锛岃秴杩囬厤缃殑鏈�澶ф椂闀匡紝璁剧疆鍏跺崌绾уけ璐ワ紝涓旇缃崌绾т换鍔″畬鎴�
+ int count = 0 ;
if (this.taskVo.rtuAddrList != null && this.taskVo.rtuAddrList.size() > 0) {
Collection<UpgradeRtu> col = this.upgradeRtus.values() ;
for(UpgradeRtu info : col){
if(info.state == UpgradeRtu.STATE_OFFLINE){
info.isOver = true ;
info.state = UpgradeRtu.STATE_FAILOFFLINE ;
+ count ++ ;
}
}
}
+ return count ;
+ }else{
+ return -1 ;
}
}
--
Gitblit v1.8.0