From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index fceeb10..78c83fb 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -1,5 +1,6 @@
package com.doumee.core.constants;
+import ch.qos.logback.core.util.COWArrayList;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang3.StringUtils;
@@ -30,12 +31,24 @@
public static final String FILE_DIR ="FILE_DIR" ;
public static final String PRIVATE_KEY = "PRIVATE_KEY";
public static final String PROJECT_FILE = "PROJECT_FILE";
+ public static final String PROJECTS = "PROJECTS";
+ public static final String FORCE_BACK_LOCK = "FORCE_BACK_LOCK";
+ public static final String FORCE_BACK_SITE = "FORCE_BACK_SITE";
+ //杞﹁締绫诲瀷鏁版嵁
+ public static final String BIKE_TYPE ="1,2,3,4,5,6,7,8" ;
public static String REDIS_DEBUG_STR="test_";
+ public static final String AD = "AD";
public interface MqttTopic{
- //寮�閿�
- String openLock = "OPENLOCK";
- //鍏抽棴閿佸ご
- String closeLock = "CLOSELOCK";
+
+ String topic_index = "device/lock/";
+ //寮�閿侊紙鍙戝竷锛�
+ String pub_openLock = "device/lock/{siteId}/{lockId}/unlock";
+ //閿佷俊鎭紝鍦ㄥ垵濮嬪寲銆佺姸鎬佸彉鏇存椂浼氭帹閫侀攣鐨勫畬鏁寸姸鎬�(璁㈤槄锛�
+ String sub_lockInfo = "device/lock/+/+/info";
+ //杩樿溅閿佸ご锛堣闃咃級
+ String sub_closeLock = "device/lock/+/+/bike";
+ //瀹炴椂鑾峰彇閿佷俊鎭紙鍙戝竷锛�
+ String pub_getLockInfo = "device/lock/{siteId}/{lockId}/getInfo";
}
/**
@@ -47,6 +60,13 @@
int all =2;
int partful = 3;
}
+ public interface LockStatus{
+ // //鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
+ int closed =0;
+ int open =1;
+ int running =2;
+ int error= 3;
+ }
public interface goodsorderStatus{
int waitPay =0;
int pay =1;
--
Gitblit v1.9.3