From a87eff704037284e46568c7c7b8a60caaae884c2 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 17 五月 2023 20:22:44 +0800
Subject: [PATCH] 调整计划管理模块
---
igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java | 383 +++++++++++++++++++++++++++++-------------------------
1 files changed, 205 insertions(+), 178 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java b/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java
index b04ab37..56819c7 100644
--- a/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java
+++ b/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java
@@ -10,207 +10,234 @@
*/
public class InoutConstant {
- /**
- * 榛樿韬唤璇�
- */
- public static final String DEFAULT_ID_CARD = "100000000000000000";
+ /**
+ * 榛樿韬唤璇�
+ */
+ public static final String DEFAULT_ID_CARD = "100000000000000000";
- /**
- * 缂撳瓨-鍏ュ簱ID
- */
- public static final String CACHE_RECORD_ID = "RECORD_ID";
+ /**
+ * 缂撳瓨-鍏ュ簱ID
+ */
+ public static final String CACHE_RECORD_ID = "RECORD_ID";
- /**
- * 缂撳瓨KEY-鍑哄叆搴撻厤缃俊鎭紦瀛�
- */
- public static final String CACHE_INOUT_CONF_LIST = "INOUT_CONF";
+ /**
+ * 缂撳瓨KEY-鍑哄叆搴撻厤缃俊鎭紦瀛�
+ */
+ public static final String CACHE_INOUT_CONF_LIST = "INOUT_CONF";
- /**
- * 缂撳瓨KEY-鍑哄叆搴撴祦绋嬮厤缃俊鎭�
- */
- public static final String CACHE_INOUT_SYS_CONF = "INOUT_SYS_CONF";
+ /**
+ * 缂撳瓨KEY-鍑哄叆搴撴祦绋嬮厤缃俊鎭�
+ */
+ public static final String CACHE_INOUT_SYS_CONF = "INOUT_SYS_CONF";
- /**
- * 涓存椂缂撳瓨锛屽瓨鏀惧綋鍓嶇殑鍑哄叆搴撲俊鎭�
- */
- public static final String KEY_INOUT_LIST = "INOUT_LIST";
+ /**
+ * 涓存椂缂撳瓨锛屽瓨鏀惧綋鍓嶇殑鍑哄叆搴撲俊鎭�
+ */
+ public static final String KEY_INOUT_LIST = "INOUT_LIST";
- /**
- * 涓存椂缂撳瓨锛屽瓨鏀惧綋鍓嶇殑鍑哄叆搴撲俊鎭椂闂达紝鍑哄叆搴撶紦瀛樺彲鑳藉瓨鍦ㄤ袱澶╁畬鎴愮殑鎯呭喌锛屾椂闂磋皟鏁翠负48灏忔椂
- */
- public static final long KEY_INOUT_LIST_TIME = 48 * 60 * 60;
-
-
- /**
- * 涓存椂缂撳瓨锛屽瓨鏀惧綋鏃ュ凡缁忓畬鎴愮殑鍑哄叆搴撲俊鎭�
- */
- public static final String KEY_INOUT_COMPLETE_LIST = "INOUT_COMPLETE";
-
- /**
- * 褰撴棩瀹屾垚鐨勫嚭鍏ュ簱淇℃伅浠诲姟鍒楄〃
- */
- public static final long KEY_INOUT_COMPLETE_LIST_TIME = 8 * 60 * 60;
-
-
-
- // 鎵︽牱-鍖栭獙鐘舵��
- public static final String STATUS_NONE = "NONE";
- // 鎵︽牱-鍖栭獙鐘舵��
- public static final String STATUS_PASS = "PASS";
- // 鎵︽牱-鍖栭獙鐘舵��
- public static final String STATUS_UNPASS = "UNPASS";
-
- /**
- * 鍖栭獙涓嶅悎鏍艰繘琛屾柟寮�
- */
- public static final String CHECK_NOPASS_NORMAL = "0"; //姝ｅ父娴佽浆
- public static final String CHECK_NOPASS_BACK = "1"; //鍑哄簱鏀跺崱
- public static final String CHECK_NOPASS_RECORD = "2"; //娴佺▼缁撴潫
-
- // 瀹屾垚鐘舵��-鏈畬鎴�
- public static final String COMPLETE_STATUS_NONE = "NONE";
- // 瀹屾垚鐘舵��-宸插畬鎴�
- public static final String COMPLETE_STATUS_COMPLETE = "COMPLETE";
-
- /** 璁惧鐘舵��-鏈煡鐘舵�� */
- public static final String MAC_STATUS_NONE = "NONE";
- /** 璁惧鐘舵��-姝ｅ父鐘舵�� */
- public static final String MAC_STATUS_NORMAL = "NORMAL";
- /** 璁惧鐘舵��-鏈繛鎺ャ�佹棤淇″彿 */
- public static final String MAC_STATUS_NO_SIGNAL = "NO_SIGNAL";
-
- /**
- * 鍑哄叆搴撻厤缃殑绫诲瀷 10 = 杞︾墝璇嗗埆
- */
- public static final String CONF_TYPE_10 = "10";
-
- /**
- * 鍑哄叆搴撻厤缃殑绫诲瀷 20 = 鎵︽牱鏈哄櫒
- */
- public static final String CONF_TYPE_20 = "20";
-
- /**
- * 鍑哄叆搴撻厤缃殑绫诲瀷 21 = 鍖栭獙鏈�
- */
- public static final String CONF_TYPE_21 = "21";
-
- /**
- * 鍑哄叆搴撻厤缃殑绫诲瀷 30 = 鍦扮
- */
- public static final String CONF_TYPE_30 = "30";
-
- /**
- * 鍑哄叆搴撻厤缃殑绫诲瀷40 = LED鏄剧ず灞忓箷
- */
- public static final String CONF_TYPE_40 = "40";
-
- /**
- * 鍖栭獙澶у睆瑙嗛
- */
- public static final String CONF_TYPE_50 = "50";
-
- /**
- * 鍑哄叆搴撴姄鎷嶆憚鍍忓ご
- */
- public static final String CONF_TYPE_60 = "60";
-
- /**
- * 绉伴噸涓绘帶鍒跺櫒
- */
- public static final String CONF_TYPE_70 = "70";
-
- /**
- * 鏅烘収鍗�
- */
- public static final String CONF_TYPE_80 = "80";
-
- // 鍑哄叆搴撶被鍨�-鍏ュ簱
- public static final String TYPE_IN = "IN";
-
- // 鍑哄叆搴撶被鍨�-鍑哄簱
- public static final String TYPE_OUT = "OUT";
-
- public static final String TYPE_NONE = "NONE";
-
- // 鏁版嵁鐘舵��-姝ｅ父
- public static final String RECORD_STATUS_NORMAL = "NORMAL";
- // 鏁版嵁鐘舵��-寮傚父
- public static final String RECORD_STATUS_ERROR = "ERROR";
- // 鏁版嵁鐘舵��-琛ュ綍
- public static final String RECORD_STATUS_ADD = "ADD";
- // 鏁版嵁鐘舵��-宸插垹闄�
- public static final String RECORD_STATUS_DEL = "DEL";
-
- // 娴佺▼-鐧昏
- public static final String PROGRESS_REGISTER = "REGISTER";
- // 娴佺▼-鍏ュ簱璐ㄦ
- public static final String PROGRESS_CHECK = "CHECK";
- // 娴佺▼-鍊间粨
- public static final String PROGRESS_HANDLE = "HANDLE";
- // 娴佺▼-绉伴噸锛屽寘鎷弧杞︾О閲嶆垨鑰呯┖杞︾О閲嶏紝褰撳墠鐘舵�佹瘮杈冪壒娈婏紝涓嶄綔涓烘祦绋嬭妭鐐癸紝鍙綔涓烘爣绛�
- public static final String PROGRESS_WEIGHT_TAG = "WEIGHT_TAG";
- // 娴佺▼-婊¤溅绉伴噸
- public static final String PROGRESS_WEIGHT_FULL = "WEIGHT_FULL";
- // 娴佺▼-绌鸿溅绉伴噸
- public static final String PROGRESS_WEIGHT_EMPTY = "WEIGHT_EMPTY";
- // 娴佺▼-缁撶畻
- public static final String PROGRESS_PAY = "PAY";
- // 娴佺▼-鍗＄墖鍥炴敹
- public static final String PROGRESS_CARD_BACK = "CARD_BACK";
-
- // 娴佺▼-澶囨锛堣〃绀烘祦绋嬫暣浣撳畬鎴愬悗澶囨锛�
- public static final String PROGRESS_RECORD = "RECORD";
+ /**
+ * 涓存椂缂撳瓨锛屽瓨鏀惧綋鍓嶇殑鍑哄叆搴撲俊鎭椂闂达紝鍑哄叆搴撶紦瀛樺彲鑳藉瓨鍦ㄤ袱澶╁畬鎴愮殑鎯呭喌锛屾椂闂磋皟鏁翠负48灏忔椂
+ */
+ public static final long KEY_INOUT_LIST_TIME = 48 * 60 * 60;
+ /**
+ * 涓存椂缂撳瓨锛屽瓨鏀惧綋鏃ュ凡缁忓畬鎴愮殑鍑哄叆搴撲俊鎭�
+ */
+ public static final String KEY_INOUT_COMPLETE_LIST = "INOUT_COMPLETE";
- public static final String CHECK_ITEM_C01 = "C01";//姘村垎
-
- public static final String CHECK_ITEM_C020101 = "020101";//姘村垎
-
- public static final String CHECK_ITEM_C01010301 = "01010301";//鏉傝川
-
- public static final String CHECK_ITEM_C02 = "C02";//鏉傝川
+ /**
+ * 褰撴棩瀹屾垚鐨勫嚭鍏ュ簱淇℃伅浠诲姟鍒楄〃
+ */
+ public static final long KEY_INOUT_COMPLETE_LIST_TIME = 8 * 60 * 60;
+ // 鎵︽牱-鍖栭獙鐘舵��
+ public static final String STATUS_NONE = "NONE";
+ // 鎵︽牱-鍖栭獙鐘舵��
+ public static final String STATUS_PASS = "PASS";
+ // 鎵︽牱-鍖栭獙鐘舵��
+ public static final String STATUS_UNPASS = "UNPASS";
+
+ /**
+ * 鍖栭獙涓嶅悎鏍艰繘琛屾柟寮�
+ */
+ public static final String CHECK_NOPASS_NORMAL = "0"; //姝ｅ父娴佽浆
+ public static final String CHECK_NOPASS_BACK = "1"; //鍑哄簱鏀跺崱
+ public static final String CHECK_NOPASS_RECORD = "2"; //娴佺▼缁撴潫
+
+ // 瀹屾垚鐘舵��-鏈畬鎴�
+ public static final String COMPLETE_STATUS_NONE = "NONE";
+ // 瀹屾垚鐘舵��-宸插畬鎴�
+ public static final String COMPLETE_STATUS_COMPLETE = "COMPLETE";
+
+ /**
+ * 璁惧鐘舵��-鏈煡鐘舵��
+ */
+ public static final String MAC_STATUS_NONE = "NONE";
+ /**
+ * 璁惧鐘舵��-姝ｅ父鐘舵��
+ */
+ public static final String MAC_STATUS_NORMAL = "NORMAL";
+ /**
+ * 璁惧鐘舵��-鏈繛鎺ャ�佹棤淇″彿
+ */
+ public static final String MAC_STATUS_NO_SIGNAL = "NO_SIGNAL";
+
+ /**
+ * 鍑哄叆搴撻厤缃殑绫诲瀷 10 = 杞︾墝璇嗗埆
+ */
+ public static final String CONF_TYPE_10 = "10";
+
+ /**
+ * 鍑哄叆搴撻厤缃殑绫诲瀷 20 = 鎵︽牱鏈哄櫒
+ */
+ public static final String CONF_TYPE_20 = "20";
+
+ /**
+ * 鍑哄叆搴撻厤缃殑绫诲瀷 21 = 鍖栭獙鏈�
+ */
+ public static final String CONF_TYPE_21 = "21";
+
+ /**
+ * 鍑哄叆搴撻厤缃殑绫诲瀷 30 = 鍦扮
+ */
+ public static final String CONF_TYPE_30 = "30";
+
+ /**
+ * 鍑哄叆搴撻厤缃殑绫诲瀷40 = LED鏄剧ず灞忓箷
+ */
+ public static final String CONF_TYPE_40 = "40";
+
+ /**
+ * 鍖栭獙澶у睆瑙嗛
+ */
+ public static final String CONF_TYPE_50 = "50";
+
+ /**
+ * 鍑哄叆搴撴姄鎷嶆憚鍍忓ご
+ */
+ public static final String CONF_TYPE_60 = "60";
+
+ /**
+ * 绉伴噸涓绘帶鍒跺櫒
+ */
+ public static final String CONF_TYPE_70 = "70";
+
+ /**
+ * 鏅烘収鍗�
+ */
+ public static final String CONF_TYPE_80 = "80";
+
+ // 鍑哄叆搴撶被鍨�-鍏ュ簱
+ public static final String TYPE_IN = "IN";
+
+ // 鍑哄叆搴撶被鍨�-鍑哄簱
+ public static final String TYPE_OUT = "OUT";
+
+ public static final String TYPE_NONE = "NONE";
+
+ // 鏁版嵁鐘舵��-姝ｅ父
+ public static final String RECORD_STATUS_NORMAL = "NORMAL";
+ // 鏁版嵁鐘舵��-寮傚父
+ public static final String RECORD_STATUS_ERROR = "ERROR";
+ // 鏁版嵁鐘舵��-琛ュ綍
+ public static final String RECORD_STATUS_ADD = "ADD";
+ // 鏁版嵁鐘舵��-宸插垹闄�
+ public static final String RECORD_STATUS_DEL = "DEL";
+
+ // 娴佺▼-鐧昏
+ public static final String PROGRESS_REGISTER = "REGISTER";
+ // 娴佺▼-鍏ュ簱璐ㄦ
+ public static final String PROGRESS_CHECK = "CHECK";
+ // 娴佺▼-鍊间粨
+ public static final String PROGRESS_HANDLE = "HANDLE";
+ // 娴佺▼-绉伴噸锛屽寘鎷弧杞︾О閲嶆垨鑰呯┖杞︾О閲嶏紝褰撳墠鐘舵�佹瘮杈冪壒娈婏紝涓嶄綔涓烘祦绋嬭妭鐐癸紝鍙綔涓烘爣绛�
+ public static final String PROGRESS_WEIGHT_TAG = "WEIGHT_TAG";
+ // 娴佺▼-婊¤溅绉伴噸
+ public static final String PROGRESS_WEIGHT_FULL = "WEIGHT_FULL";
+ // 娴佺▼-绌鸿溅绉伴噸
+ public static final String PROGRESS_WEIGHT_EMPTY = "WEIGHT_EMPTY";
+ // 娴佺▼-缁撶畻
+ public static final String PROGRESS_PAY = "PAY";
+ // 娴佺▼-鍗＄墖鍥炴敹
+ public static final String PROGRESS_CARD_BACK = "CARD_BACK";
+
+ // 娴佺▼-澶囨锛堣〃绀烘祦绋嬫暣浣撳畬鎴愬悗澶囨锛�
+ public static final String PROGRESS_RECORD = "RECORD";
+ public static final String CHECK_ITEM_C01 = "C01";//姘村垎
+
+ public static final String CHECK_ITEM_C020101 = "020101";//姘村垎
+
+ public static final String CHECK_ITEM_C01010301 = "01010301";//鏉傝川
+
+ public static final String CHECK_ITEM_C02 = "C02";//鏉傝川
+ /**
+ * 璁″垝绫诲瀷 -杞崲璁″垝
+ **/
+ public static final String PLAN_TYPE_01 = "01";
+ /**
+ * 璁″垝绫诲瀷 -閲囪喘璁″垝
+ **/
+ public static final String PLAN_TYPE_02 = "02";
+ /**
+ * 璁″垝绫诲瀷 -閿�鍞鍒�
+ **/
+ public static final String PLAN_TYPE_03 = "03";
+ /**
+ * 璁″垝绫诲瀷 -鐢熶骇鍔犲伐璁″垝
+ **/
+ public static final String PLAN_TYPE_04 = "04";
- /**
- * 鏍规嵁涓氬姟绫诲瀷鍜� 褰撳墠鐘舵�佽繑鍥炲綋鍓嶇姸鎬佺殑娴佺▼鍚嶇О
- *
- * @param type
- * @param progress
- * @return
- */
- public static String getProcessName(String type, String progress) {
+ /**
+ * 璁″垝鏄庣粏绫诲瀷 -杞嚭璁″垝
+ **/
+ public static final String PLAN_DETAIL_TYPE_1 = "1";
- if (PROGRESS_REGISTER.equals(progress))
- return "鐧昏";
+ /**
+ * 璁″垝鏄庣粏绫诲瀷 -杞叆璁″垝
+ **/
+ public static final String PLAN_DETAIL_TYPE_2 = "2";
- if (PROGRESS_CHECK.equals(progress))
- return "鍏ュ簱鎵︽牱娴佺▼";
- if (PROGRESS_HANDLE.equals(progress))
- return "鍊间粨娴佺▼";
+ /**
+ * 鏍规嵁涓氬姟绫诲瀷鍜� 褰撳墠鐘舵�佽繑鍥炲綋鍓嶇姸鎬佺殑娴佺▼鍚嶇О
+ *
+ * @param type
+ * @param progress
+ * @return
+ */
+ public static String getProcessName(String type, String progress) {
- if (PROGRESS_WEIGHT_FULL.equals(progress))
- return "婊¤溅绉伴噸娴佺▼";
+ if (PROGRESS_REGISTER.equals(progress))
+ return "鐧昏";
- if (PROGRESS_WEIGHT_EMPTY.equals(progress))
- return "绌鸿溅绉伴噸娴佺▼";
+ if (PROGRESS_CHECK.equals(progress))
+ return "鍏ュ簱鎵︽牱娴佺▼";
- if (PROGRESS_PAY.equals(progress))
- return "缁撶畻娴佺▼";
+ if (PROGRESS_HANDLE.equals(progress))
+ return "鍊间粨娴佺▼";
- if (PROGRESS_CARD_BACK.equals(progress))
- return "鍗＄墖鍥炴敹";
+ if (PROGRESS_WEIGHT_FULL.equals(progress))
+ return "婊¤溅绉伴噸娴佺▼";
- if (PROGRESS_RECORD.equals(progress))
- return "娴佺▼瀹屾垚";
+ if (PROGRESS_WEIGHT_EMPTY.equals(progress))
+ return "绌鸿溅绉伴噸娴佺▼";
- return "";
- }
+ if (PROGRESS_PAY.equals(progress))
+ return "缁撶畻娴佺▼";
+
+ if (PROGRESS_CARD_BACK.equals(progress))
+ return "鍗＄墖鍥炴敹";
+
+ if (PROGRESS_RECORD.equals(progress))
+ return "娴佺▼瀹屾垚";
+
+ return "";
+ }
}
--
Gitblit v1.9.3