From 9f4c9d49cfd16c61bf00641b1af18cff840985d5 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 11 十二月 2025 09:53:43 +0800
Subject: [PATCH] 钥匙柜开门添加 指纹方式
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 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 f6daf8d..5bb835b 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
@@ -6,6 +6,7 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import lombok.extern.slf4j.Slf4j;
import net.sourceforge.pinyin4j.PinyinHelper;
import org.apache.commons.lang3.StringUtils;
@@ -18,7 +19,7 @@
import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
+@Slf4j
public class Constants {
public static final String HEADER_USER_TOKEN = "dm_user_token";
public static final String REDIS_USER_KEY = "user_token_list_";
@@ -84,6 +85,7 @@
public static final String LOCATION ="LOCATION" ;
public static final String API_KEY ="API_KEY" ;
public static final String CABINET_CONFIG ="CABINET_CONFIG" ;
+ public static final String JDY_CONFIG ="JDY_CONFIG" ;
public static final String BLOW_TIME ="BLOW_TIME" ;
public static final String PRESSURE ="PRESSURE" ;
public static final String CONCENTRATION ="CONCENTRATION" ;
@@ -107,6 +109,7 @@
// 璁垮鏉ヨ閰嶇疆
public static final String VISIT_CONFIG = "VISIT_CONFIG";
public static final String MEMBER_IMG = "MEMBER_IMG";
+ public static final String ACTIVATE = "ACTIVATE";
public static final String PLATFORM_EVENT_IMG = "PLATFORM_EVENT_IMG";
public static final String VISIT_NOTICE = "VISIT_NOTICE";
public static final String TIME_OUT_CONFIG = "TIME_OUT_CONFIG";
@@ -127,6 +130,10 @@
public static final String WORK_END = "WORK_END";
public static final String INTERVAL = "INTERVAL";
public static final String USE_CAR_TAKE_CARE = "USE_CAR_TAKE_CARE";
+
+ public static final String PUSH_URL_KEYS = "PUSH_URL_KEYS";
+ public static final String CAR_SECRET = "CAR_SECRET";
+ public static final String SECRET = "SECRET";
@@ -537,6 +544,9 @@
public static final String APP_SECRET ="APP_SECRET";
public static final String ACCESS_TOKEN ="ACCESS_TOKEN";
public static final String AGENT_ID ="AGENT_ID";
+ public static final String CLEAN_TIME ="CLEAN_TIME";
+ public static final String EARLY_CONFIG ="EARLY_CONFIG";
+
@@ -1524,7 +1534,7 @@
public enum WarningConfig {
ALARM_TEST(10002, "銆愰挜鍖欐煖銆戦厭绮炬祴璇曞紓甯�",0),
- GRID_TIME_OUT_INFO(10003, "銆愰挜鍖欐煖銆戝紑闂ㄨ秴鏃舵湭鍏抽棴",0),
+ GRID_TIME_OUT_INFO(10003, "銆愰挜鍖欐煖銆戝紑闂ㄦ煖鏍兼湭鍏抽棴",0),
KEY_TIME_OUT_BACK(10004, "銆愰挜鍖欐煖銆戦挜鍖欒秴鏃舵湭褰掕繕",0),
;
// 鎴愬憳鍙橀噺
@@ -1568,5 +1578,30 @@
}
+ public static boolean betweenTimeConfig(String timeConfigData,String now){
+ log.error("閽ュ寵鏌滆幏鍙栦繚娲佹椂闂撮厤缃」"+timeConfigData);
+ if(StringUtils.isNotBlank(timeConfigData)){
+ log.error("閽ュ寵鏌滆幏鍙栦繚娲佹椂闂� - 褰撳墠鏃堕棿淇℃伅"+now);
+ Integer nowTime = Integer.valueOf(now.substring(11,16).replace(":",""));
+
+ List<String> cleanConfigList = Arrays.asList(StringUtils.split(timeConfigData,","));
+ for (String config:cleanConfigList) {
+ String [] timeArr = config.split("-");
+ if(timeArr.length>Constants.ONE){
+ try {
+ Integer start = Integer.valueOf(timeArr[0].replace(":",""));
+ Integer end = Integer.valueOf(timeArr[1].replace(":",""));
+ if(start <= nowTime && end >= nowTime){
+ return true;
+ }
+ }catch (Exception e){
+
+ }
+ }
+ }
+ }
+ return false;
+ }
+
}
--
Gitblit v1.9.3