From e29b2f68e2062688c2d40209ba434e3e7932b92e Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 02 十二月 2024 16:09:03 +0800 Subject: [PATCH] 修改升级数据中的CRC16验证算法,注意其是大端模块,与其他部分不一样 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 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 09b02b9..87f3331 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 @@ -22,9 +22,9 @@ @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) @@ -52,7 +52,7 @@ return sb.toString() ; } - public String getStateName(int state){ + public static String getStateName(int state){ switch (state) { case STATE_OFFLINE: return "绂荤嚎"; @@ -63,11 +63,11 @@ case STATE_SUCCESS: return "鍗囩骇鎴愬姛"; case STATE_FAILONE: - return "鍗囩骇澶辫触锛�1鍖呮锛�"; + return "涓�鍖呮"; case STATE_FAIL: - return "鍗囩骇澶辫触锛堥潪1鍖呮锛�"; + return "澶氬寘姝�"; case STATE_FAILOFFLINE: - return "鍗囩骇澶辫触锛堢绾匡級"; + return "绂荤嚎澶辫触"; default: return "鏈煡"; } -- Gitblit v1.8.0