From aa6febca297b0e1a68b1877fc9f41885e9fc0c7a Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 16 十月 2023 15:56:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 100 insertions(+), 9 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 3f9acf4..4bdbd4a 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
@@ -23,17 +23,28 @@
public static final String FALSE = "f";
public static final String TOKEN ="TOKEN" ;
public static final String SYSTEM ="SYSTEM" ;
+ 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 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 FORCE_BACK_LOCK = "FORCE_BACK_LOCK";
+ public static final String FORCE_BACK_SITE = "FORCE_BACK_SITE";
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";
}
/**
@@ -45,6 +56,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;
@@ -56,13 +74,63 @@
int waitPay =0;
int pay =1;
}
- public interface transactionsType{
- int deposit =0;
- int consumption =1;
+ public enum TRANSACTIONS_TYPE{
+ //浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾 1缁撶畻瀹為檯娑堣垂 2缁撶畻閫�娆� 3骞冲彴閫�娆�"
+ DEPOSIT(0,"绉熻溅鎶奸噾", "绉熻溅鎶奸噾"),
- int refund =2;
- int platformRefund = 3;
+ CONSUMPTION(1,"缁撶畻瀹為檯娑堣垂", "缁撶畻瀹為檯娑堣垂"),
+
+ REFUND(2,"缁撶畻閫�娆�", "缁撶畻閫�娆�"),
+
+ PLATFORMREFUND(3,"骞冲彴閫�娆�", "骞冲彴閫�娆�")
+
+ ;
+ String name;
+
+ Integer key;
+
+ String info;
+
+ TRANSACTIONS_TYPE(Integer key, String name, String info) {
+ this.name = name;
+ this.key = key;
+ this.info = info;
+ }
+ public static TRANSACTIONS_TYPE get(int key) {
+ TRANSACTIONS_TYPE[] values = TRANSACTIONS_TYPE.values();
+ for (TRANSACTIONS_TYPE object : values) {
+ if (object.key == key) {
+ return object;
+ }
+ }
+ return null;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getKey() {
+ return key;
+ }
+
+ public void setKey(Integer key) {
+ this.key = key;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
}
+
public static String getUUID(){
return UUID.randomUUID().toString().replace("-","");
@@ -108,6 +176,16 @@
public static final String BUSINESS_STARTTIME = "BUSINESS_STARTTIME";
//灏忕▼搴忔瘡鏃ユ湇鍔＄粨鏉熸椂闂�
public static final String BUSINESS_ENDTIME = "BUSINESS_ENDTIME";
+
+ //閽夐拤閫氱煡鍦板潃
+ public static final String DINGDING_URL = "DINGDING_URL";
+ //閽夐拤绛惧悕
+ public static final String DINGDING_SECRET = "DINGDING_SECRET";
+
+ //灏忕▼搴忔弧杞介璀�(%)鏈�澶у��
+ public static final String WARN_MAX = "WARN_MAX";
+ //灏忕▼搴忔弧杞介璀�(%)鏈�灏忓��
+ public static final String WARN_MIN = "WARN_MIN";
public static final String FILES_DIR = "FILES_DIR";
@@ -259,6 +337,15 @@
this.info = info;
}
+ public static REFUND_TYPE get(int key) {
+ REFUND_TYPE[] values = REFUND_TYPE.values();
+ for (REFUND_TYPE object : values) {
+ if (object.key == key) {
+ return object;
+ }
+ }
+ return null;
+ }
public String getName() {
return name;
}
@@ -470,4 +557,8 @@
}
+ public static BigDecimal translateMoney(BigDecimal money){
+ return Constants.formatDecimalNum(money).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP);
+
+ }
}
--
Gitblit v1.9.3