From 38ab8fbd4355070def9e3b39f362731dd4dea6d1 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 30 八月 2023 20:54:12 +0800
Subject: [PATCH] 优化设备状态解析
---
igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerUtils.java | 60 +++++++++++++++++++++++++++---------------------------------
1 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerUtils.java b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerUtils.java
index bae90bd..0c99b58 100644
--- a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerUtils.java
+++ b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerUtils.java
@@ -3,7 +3,6 @@
import com.ld.igds.constant.*;
import com.ld.igds.io.request.ExeDevice;
import com.ld.igds.n2.N2ModelTag;
-import com.ld.igds.n2.N2Util;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.verb.AreationModel;
import org.apache.commons.lang3.StringUtils;
@@ -97,15 +96,15 @@
public static String RESP_9999 = "9999";// 鏈煡閿欒
//浠撳簱鐘舵��
- static String DEPOT_STATUS_1001 = "1001";
- static String DEPOT_STATUS_2001 = "2001";
- static String DEPOT_STATUS_3001 = "3001";
- static String DEPOT_STATUS_4001 = "4001";
- static String DEPOT_STATUS_5001 = "5001";
- static String DEPOT_STATUS_6001 = "6001";
- static String DEPOT_STATUS_7001 = "7001";
- static String DEPOT_STATUS_8001 = "8001";
- static String DEPOT_STATUS_9001 = "9001";
+ static String DEPOT_STATUS_1001 = "1001";//閫氶
+ static String DEPOT_STATUS_2001 = "2001";//姘旇皟
+ static String DEPOT_STATUS_3001 = "3001";//鐔忚捀
+ static String DEPOT_STATUS_4001 = "4001";//娓╂帶
+ static String DEPOT_STATUS_5001 = "5001";//缁翠慨
+ static String DEPOT_STATUS_6001 = "6001";//鍑哄簱
+ static String DEPOT_STATUS_7001 = "7001";//鍏ュ簱
+ static String DEPOT_STATUS_8001 = "8001";//婊′粨
+ static String DEPOT_STATUS_9001 = "9001";//绌轰粨
//璁惧绫诲瀷
public static String DEVICE_TYPE_1 = "1";// 椋庣獥
@@ -189,65 +188,60 @@
* @return
*/
public static String analysisDepotStatus(String status) {
-
if (null == status) return null;
-
if (status.equals(DEPOT_STATUS_1001)) {
- return DepotStatus.STATUS_07.getCode();
+ return DepotStatus.STATUS_33.getCode();
}
if (status.equals(DEPOT_STATUS_2001)) {
- return DepotStatus.STATUS_05.getCode();
+ return DepotStatus.STATUS_31.getCode();
}
if (status.equals(DEPOT_STATUS_3001)) {
- return DepotStatus.STATUS_06.getCode();
+ return DepotStatus.STATUS_32.getCode();
}
if (status.equals(DEPOT_STATUS_4001)) {
- return DepotStatus.STATUS_09.getCode();
+ return DepotStatus.STATUS_34.getCode();
}
if (status.equals(DEPOT_STATUS_5001)) {
- return DepotStatus.STATUS_08.getCode();
+ return DepotStatus.STATUS_9.getCode();
}
if (status.equals(DEPOT_STATUS_6001)) {
- return DepotStatus.STATUS_04.getCode();
+ return DepotStatus.STATUS_4.getCode();
}
if (status.equals(DEPOT_STATUS_7001)) {
- return DepotStatus.STATUS_03.getCode();
+ return DepotStatus.STATUS_2.getCode();
}
if (status.equals(DEPOT_STATUS_8001)) {
- return DepotStatus.STATUS_02.getCode();
+ return DepotStatus.STATUS_3.getCode();
}
-
- return DepotStatus.STATUS_01.getCode();
+ return DepotStatus.STATUS_1.getCode();
}
public static String getDepotSendStatus(String status) {
-
- if (status.equals(DepotStatus.STATUS_07.getCode())) {
+ if (status.equals(DepotStatus.STATUS_33.getCode())) {
return DEPOT_STATUS_1001;
}
-
- if (status.equals(DepotStatus.STATUS_05.getCode())) {
+ if (status.equals(DepotStatus.STATUS_31.getCode())) {
return DEPOT_STATUS_2001;
}
- if (status.equals(DepotStatus.STATUS_06.getCode())) {
+ if (status.equals(DepotStatus.STATUS_32.getCode())) {
return DEPOT_STATUS_3001;
}
- if (status.equals(DepotStatus.STATUS_09.getCode())) {
+ if (status.equals(DepotStatus.STATUS_34.getCode())) {
return DEPOT_STATUS_4001;
}
- if (status.equals(DepotStatus.STATUS_08.getCode())) {
+ if (status.equals(DepotStatus.STATUS_9.getCode())) {
return DEPOT_STATUS_5001;
}
- if (status.equals(DepotStatus.STATUS_04.getCode())) {
+ if (status.equals(DepotStatus.STATUS_4.getCode())) {
return DEPOT_STATUS_6001;
}
- if (status.equals(DepotStatus.STATUS_03.getCode())) {
+ if (status.equals(DepotStatus.STATUS_2.getCode())) {
return DEPOT_STATUS_7001;
}
- if (status.equals(DepotStatus.STATUS_02.getCode())) {
+ if (status.equals(DepotStatus.STATUS_3.getCode())) {
return DEPOT_STATUS_8001;
}
- return DepotStatus.STATUS_01.getCode();
+ return DepotStatus.STATUS_1.getCode();
}
/**
--
Gitblit v1.9.3