From 8bf400b67418a4a81185a4a302fdbdfce2cdf018 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 03 十一月 2023 11:53:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 8a7dc38..c18cdbd 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
@@ -35,7 +35,7 @@
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 final String BIKE_TYPE ="0,1,2,3,4,5,6,7,8" ;
public static String REDIS_DEBUG_STR="test_";
public static final String AD = "AD";
public static String REPAIR = "REPAIR";
@@ -49,6 +49,9 @@
String sub_lockInfo = "device/lock/+/+/info";
//杩樿溅閿佸ご锛堣闃咃級
String sub_closeLock = "device/lock/+/+/bike";
+ String sub_health= "device/lock/+/health";
+
+ String sub_brokers = "$SYS/brokers/+/clients/#";
//瀹炴椂鑾峰彇閿佷俊鎭紙鍙戝竷锛�
String pub_getLockInfo = "device/lock/{siteId}/{lockId}/getInfo";
}
@@ -63,11 +66,12 @@
int partful = 3;
}
public interface LockStatus{
- // //鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
+ // //鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父 -1鑷
int closed =0;
int open =1;
int running =2;
int error= 3;
+ int checking= -1;
}
public interface goodsorderStatus{
int waitPay =0;
@@ -170,6 +174,8 @@
public static final String RENT_DEPOSIT = "RENT_DEPOSIT";
//娓╅Θ鎻愮ず
public static final String TIPS = "TIPS";
+ //娓╅Θ鎻愮ず
+ public static final String RENT_NOTICE = "RENT_NOTICE";
//灏忕▼搴忓仠姝㈡湇鍔℃彁绀�
public static final String STOP_SERVE_TIPS = "STOP_SERVE_TIPS";
//灏忕▼搴忔槸鍚﹀仠姝㈡湇鍔� 0鍚� 1鏄�
--
Gitblit v1.9.3