From 074485f56f073cf11fb29e6aab4ec9a2d4f3f549 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 19 九月 2024 14:10:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 62 +++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java index 57c23f5..472077e 100644 --- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java +++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java @@ -30,6 +30,7 @@ public static final String HEADER_USER_TOKEN = "dm_user_token"; public static final String REDIS_TOKEN_KEY = "token_"; public static final String REDIS_HK_TOKEN_KEY = "hk_token_"; + public static final String HK_TOKEN_VALIDITY = "HK_TOKEN_VALIDITY"; public static final String[] ALL_SPELL_LIST_FIRST = new String[]{"A", "B", "C", "D", "E", "F", "G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"}; public static final int ZERO = 0 ; public static final int ONE = 1 ; @@ -808,6 +809,66 @@ this.info = info; } } + /** + * 鏈堝彴浣滀笟澶у睆鏂囨 鐘舵�� + * 1銆佹湀鍙扮┖闂诧細1鍙锋湀鍙帮紙鏈堝彴鍚嶇О锛� + * 2銆佸彨鍙蜂腑锛�1鍙锋湀鍙� 鐨朅12345 鍙彿涓� + * 3銆佷綔涓氫腑锛�1鍙锋湀鍙� 鐨朅12345 浣滀笟涓� + * 4銆侀敊璇仠闈狅細1鍙锋湀鍙� 鐨朅12345 褰撳墠杞﹁締閿欒鍋滈潬锛岃灏藉揩椹剁 + * 5銆佽秴鏃跺仠闈狅細1鍙锋湀鍙� 鐨朅12345 褰撳墠杞﹁締瓒呮椂鍋滈潬锛岃灏藉揩椹剁 + */ + public enum PlatformLedContent { + IDEL_CONTNET(1, "绌洪棽涓�","{param}" ), + CALLING(2, "鍙彿涓�","${param} ${param2} 鍙彿涓�"), + WORKING(3, "浣滀笟涓�","${param} ${param2} 浣滀笟涓�" ), + WRONG_IN(4, "閿欒鍋滈潬","${param} ${param2} 褰撳墠杞﹁締閿欒鍋滈潬锛岃灏藉揩椹剁" ), + TIMEOUT_IN(5, "瓒呮椂鍋滈潬","${param} ${param2} 褰撳墠杞﹁締瓒呮椂鍋滈潬锛岃灏藉揩椹剁" ), + ; + + // 鎴愬憳鍙橀噺 + private int key; + private String name; + private String info; + + // 鏋勯�犳柟娉� + PlatformLedContent(int key, String name,String info ) { + this.key = key; + this.info = info; + this.name = name; + } + public static String getName(int index) { + for (PlatformLedContent c : PlatformLedContent.values()) { + if (c.getKey() == index) { + return c.name; + } + } + return null; + } + + public int getKey() { + return key; + } + + public void setKey(int key) { + this.key = key; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getInfo() { + return info; + } + + public void setInfo(String info) { + this.info = info; + } + } /** * 鏈堝彴浣滀笟 鐘舵�� @@ -826,6 +887,7 @@ AUTHED_LEAVE(9, "宸叉巿鏉冪鍥�","宸叉巿鏉冪鍥�" ), LEAVED(10, "宸茬鍥� ","宸茬鍥� " ), OVER_NUMBER(11, "宸茶繃鍙�","宸茶繃鍙�" ), + CANCEL(12, "宸插彇娑�","宸插彇娑�" ), ; // 鎴愬憳鍙橀噺 -- Gitblit v1.9.3