From 2bb847e3b8bdc2692d88ad9df0d4ad54a3ccd890 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 08 十一月 2023 16:01:20 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 11 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..cacca62 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;
@@ -26,16 +27,34 @@
public static final String DINGDING ="DINGDING" ;
public static final String MINI_PROGRAMME ="MINI_PROGRAMME" ;
public static final String FREE_RENT_TIME ="FREE_RENT_TIME" ;
+ public static final String ACCESS_TOKEN ="ACCESS_TOKEN" ;
public static final String IMG_DIR = "IMG_DIR";
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 ="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";
+
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 sub_health= "device/lock/+/health";
+
+ String sub_brokers = "$SYS/brokers/+/clients/#";
+ //瀹炴椂鑾峰彇閿佷俊鎭紙鍙戝竷锛�
+ String pub_getLockInfo = "device/lock/{siteId}/{lockId}/getInfo";
}
/**
@@ -47,6 +66,14 @@
int all =2;
int partful = 3;
}
+ public interface LockStatus{
+ // //鐘舵�侊紝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;
int pay =1;
@@ -62,11 +89,11 @@
//浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾 1缁撶畻瀹為檯娑堣垂 2缁撶畻閫�娆� 3骞冲彴閫�娆�"
DEPOSIT(0,"绉熻溅鎶奸噾", "绉熻溅鎶奸噾"),
- CONSUMPTION(1,"缁撶畻瀹為檯娑堣垂", "缁撶畻瀹為檯娑堣垂"),
+ CONSUMPTION(1,"璁㈠崟娑堣垂缁撶畻", "璁㈠崟娑堣垂缁撶畻"),
- REFUND(2,"缁撶畻閫�娆�", "缁撶畻閫�娆�"),
+ REFUND(2,"缁撶畻閫�鎶奸噾", "缁撶畻閫�鎶奸噾"),
- PLATFORMREFUND(3,"骞冲彴閫�娆�", "骞冲彴閫�娆�")
+ PLATFORMREFUND(3,"骞冲彴閫�鎶奸噾", "骞冲彴閫�鎶奸噾")
;
String name;
@@ -148,6 +175,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鏄�
@@ -184,6 +213,14 @@
return 0;
}
return num;
+ }
+ public static Integer formatIntegerFromStr(String num) {
+ try {
+ return Integer.parseInt(num);
+ }catch (Exception e){
+
+ }
+ return null;
}
public interface UserActionsType {
@@ -299,13 +336,13 @@
public enum REFUND_TYPE{
// '閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 3缁撶畻鍚庨��娆�'
- NORMAL( 0,"鐢ㄦ埛缁撶畻閫�娆�",""),
+ NORMAL( 0,"鐢ㄦ埛缁撶畻閫�娆�","缁撶畻閫�鎶奸噾"),
- PLAT_AUTO( 1,"骞冲彴鑷姩缁撶畻閫�娆�",""),
+ PLAT_AUTO( 1,"骞冲彴鑷姩缁撶畻閫�娆�","骞冲彴閫�鎶奸噾"),
- PLAT_FORCE( 2,"寮哄埗缁撶畻閫�娆�",""),
+ PLAT_FORCE( 2,"寮哄埗缁撶畻閫�娆�","骞冲彴閫�鎶奸噾"),
- BACK( 3,"缁撶畻鍚庨��娆�",""),
+ BACK( 3,"缁撶畻鍚庨��娆�","骞冲彴閫�娆�"),
;
String name;
--
Gitblit v1.9.3