From 90518d09cc278d3304ccd5fc122269d89854b656 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 13 十二月 2024 10:18:33 +0800
Subject: [PATCH] 增加SQL日志输出mybatis拦截器，并在application-global.xml中增加是否输出sql配置项
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java
index 0c9b42b..41b06f6 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java
@@ -14,6 +14,8 @@
public class UpgradeRtu {
@JSONField(serialize = false)
+ public static final int STATE_OPEN = -2 ;//-1-闃�寮�锛堟车寮�锛変笉鑳藉崌绾�
+ @JSONField(serialize = false)
public static final int STATE_OFFLINE = -1 ;//-1-绂荤嚎
@JSONField(serialize = false)
public static final int STATE_UNSTART = 0 ;//0-鏈紑濮�
@@ -22,22 +24,63 @@
@JSONField(serialize = false)
public static final int STATE_SUCCESS = 2 ;//2-鍗囩骇鎴愬姛
@JSONField(serialize = false)
- public static final int STATE_FAILONE = 3 ;//3-鍗囩骇澶辫触锛�1鍖呮锛�
+ public static final int STATE_FAILONE = 3 ;//3-鍗囩骇澶辫触锛堜竴鍖呮锛�
@JSONField(serialize = false)
- public static final int STATE_FAIL = 4 ;//4-鍗囩骇澶辫触锛堥潪1鍖呮锛�
+ public static final int STATE_FAIL = 4 ;//4-鍗囩骇澶辫触锛堝鍖呮锛�
@JSONField(serialize = false)
public static final int STATE_FAILOFFLINE = 5 ;//4-鍗囩骇澶辫触锛堢绾匡級
@JSONField(serialize = false)
- public static final int RAMADDRADD = 0x20 ;//绋嬪簭瀛樺偍鍐呭瓨鍦ㄥ潃澧為噺
+ public static final int STATE_FAILOPEN = 6 ;//4-鍗囩骇澶辫触锛堥榾寮�锛�
+ @JSONField(serialize = false)
+ public static final int RAMADDRADD = 0x200 ;//绋嬪簭瀛樺偍鍐呭瓨鍦ㄥ潃澧為噺
public String rtuAddr ;
- public int state ;// -1-绂荤嚎锛�0-鏈紑濮嬶紝1-鍗囩骇涓紝2-鍗囩骇鎴愬姛锛�3-鍗囩骇澶辫触锛�1鍖呮锛夛紝4-鍗囩骇澶辫触锛堥潪1鍖呮锛夛紝5-鍗囩骇澶辫触锛堢绾匡級
+ public int state ;// -1-绂荤嚎锛�0-鏈紑濮嬶紝1-鍗囩骇涓紝2-鍗囩骇鎴愬姛锛�3-鍗囩骇澶辫触锛�1鍖呮锛夛紝4-鍗囩骇澶辫触锛堥潪1鍖呮锛夛紝5-鍗囩骇澶辫触锛堢绾匡級锛�6-鍗囩骇澶辫触锛堥榾寮�锛�
public int totalPackage ;// 鎬诲寘鏁�
public int currentPackage ;// 褰撳墠涓嬪彂鍗囩骇鍖呮暟
public int currentRamAddr ;// 褰撳墠涓嬪彂鍗囩骇鍖匯TU瀛樺偍鍦板潃
public String lastDownDt ;// 鏈�鍚庝笅鍙戝崌绾ф暟鎹寘鏃堕棿锛坹yyy-mm-dd HH:HH:SS锛�
+ public Long lastDownDtAt ;// 鏈�鍚庝笅鍙戝崌绾ф暟鎹寘鏃跺埢
public int reTryTimes ;//鍗囩骇涓嶆垚鍔燂紝閲嶈瘯娆℃暟
- public boolean isOver ;
+ public boolean isOver ;//鏄惁鍗囩骇杩囩▼缁撴潫锛�1锛氱粨鏉燂紝0锛氭湭缁撴潫
+
+ public String toString(){
+ StringBuilder sb = new StringBuilder();
+ sb.append("RTU锛�" + rtuAddr + "锛夊崌绾х姸鎬侊細") ;
+ sb.append(" \n褰� 鍓� 鐘� 鎬侊細" + getStateName(state)) ;
+ sb.append(" \n闇�涓嬪彂鏁版嵁鍖呮�绘暟锛�" + totalPackage) ;
+ sb.append(" \n褰撳墠涓嬪彂鍗囩骇鍖呮暟锛�" + currentPackage) ;
+ sb.append(" \n褰撳墠涓嬪彂瀛樺偍鍦板潃锛�" + currentRamAddr) ;
+ sb.append(" \n褰撳墠涓嬪彂鏁版嵁鏃堕棿锛�" + lastDownDt) ;
+ sb.append(" \n鍗囩骇澶辫触閲嶈瘯娆℃暟锛�" + reTryTimes) ;
+ sb.append(" \n鍗囩骇杩囩▼鏄惁缁撴潫锛�" + (isOver?"鏄�":"鍚�")) ;
+ return sb.toString() ;
+ }
+
+ public static String getStateName(int state){
+ switch (state) {
+ case STATE_OPEN:
+ return "闃�寮�";
+ case STATE_OFFLINE:
+ return "绂荤嚎";
+ case STATE_UNSTART:
+ return "鏈紑濮�";
+ case STATE_RUNNING:
+ return "鍗囩骇涓�";
+ case STATE_SUCCESS:
+ return "鍗囩骇鎴愬姛";
+ case STATE_FAILONE:
+ return "涓�鍖呮";
+ case STATE_FAIL:
+ return "澶氬寘姝�";
+ case STATE_FAILOFFLINE:
+ return "绂荤嚎澶辫触";
+ case STATE_FAILOPEN:
+ return "闃�寮�澶辫触";
+ default:
+ return "鏈煡";
+ }
+ }
/**
* 瑙﹀彂鍗囩骇
--
Gitblit v1.8.0