From 6525935588f4b9a06e08f91dfc9d2895e5ec2c38 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 20 十月 2025 11:00:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 73 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 14 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 2ae528e..ffa8898 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
@@ -1,6 +1,7 @@
package com.doumee.core.utils;
+import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -26,6 +27,8 @@
public static final int ZERO = 0 ;
public static final int ONE = 1 ;
public static final int TWO = 2 ;
+ public static final Integer DD_STATUS_SUCCESS_CODE = 200 ;
+ public static final Long DD_ERR_CODE = 0L ;
public static final String HK_PARAM ="HK_PARAM" ;
public static final String HK_WEBSITE_DOMAIN_URL ="HK_WEBSITE_DOMAIN_URL" ;
public static final String LED_CONTENT_SPEED ="LED_CONTENT_SPEED" ;
@@ -36,6 +39,7 @@
public static final String HK_HTTPS ="HK_HTTPS" ;
public static final String HK_PUSH_URL = "HK_PUSH_URL";
public static final String HK_CARS_OPENAPI_ACCESS_KEY = "HK_CARS_OPENAPI_ACCESS_KEY";
+ public static final String GAODE_DISTANCE_GEOAPI_URL = "GAODE_DISTANCE_GEOAPI_URL";
public static final String HK_CARS_OPENAPI_ACCESS_SECRET = "HK_CARS_OPENAPI_ACCESS_SECRET";
public static final String HK_CARS_OPENAPI_URL = "HK_CARS_OPENAPI_URL";
public static final String HK_ROOTORG_CODE ="HK_ROOTORG_CODE" ;
@@ -51,8 +55,36 @@
public static final String SIGN_IN_QRCODE ="SIGN_IN_QRCODE" ;
public static final String SIGN_IN_ATTENTION ="SIGN_IN_ATTENTION" ;
public static final String SIGN_IN_QRCODE_PREFIX ="SIGN_IN_QRCODE_PREFIX" ;
+ /**
+ * 鎿嶄綔绫诲瀷锛岀敤浜庡仛鎺ュ彛楠岃瘉鍒嗙粍
+ */
+ public interface OperaType {
+ /**
+ * 鍒涘缓
+ */
+ interface Create {}
+ /**
+ * 淇敼
+ */
+ interface Update {}
+
+ /**
+ * 淇敼鐘舵��
+ */
+ interface UpdateStatus {}
+ }
+
+ public static final String WEATHER_CONFIG ="WEATHER_CONFIG" ;
+ public static final String REQUEST_URL ="REQUEST_URL" ;
+ 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 BLOW_TIME ="BLOW_TIME" ;
+ public static final String PRESSURE ="PRESSURE" ;
+ public static final String CONCENTRATION ="CONCENTRATION" ;
+ public static final String THRESHOLD ="THRESHOLD" ;
//琚嫓璁夸汉淇℃伅鏍￠獙鏂瑰紡锛�0鎵嬫満鍙峰崟鐙牎楠� 1鎵嬫満鍙峰拰濮撳悕缁勫悎鏍￠獙锛�
public static final String BEVISITED_USER_VALID = "BEVISITED_USER_VALID";
public static final String LW_BEVISITED_USER_VALID = "LW_BEVISITED_USER_VALID";
@@ -106,6 +138,7 @@
public static final String FTP_USERNAME ="FTP_USERNAME" ;
public static final String FTP_PWD ="FTP_PWD" ;
public static final String COMPANY_DOCUMENTS ="COMPANY_DOCUMENTS" ;
+ public static final String APP_FILE ="APP_FILE" ;
public static final String FTP_RESOURCE_PATH ="FTP_RESOURCE_PATH" ;
public static final String FTP_LOCAL_RESOURCE_PATH ="FTP_LOCAL_RESOURCE_PATH" ;
@@ -157,6 +190,10 @@
public static final String OVER_NOTICE_WX = "OVER_NOTICE_WX";
public static final String PRESSURE_LEVEL_UNIT = "PRESSURE_LEVEL_UNIT";
public static final String LIQUID_LEVEL_UNIT ="LIQUID_LEVEL_UNIT" ;
+ public static final String OUT_HY_LOT_TOTAL ="OUT_HY_LOT_TOTAL" ;
+ public static final String BANNER_IMG ="BANNER_IMG" ;
+ public static final String COMPANY_LOCATION = "COMPANY_LOCATION";
+ public static final String GAODE_LOCATION_GEOAPI_URL = "GAODE_LOCATION_GEOAPI_URL";
public static boolean DEALING_HK_SYNCPRIVILEGE= false;
public static boolean DEALING_HK_SYNCDEVICE = false;
@@ -491,6 +528,11 @@
public static final String HOME_IMAGE ="HOME_IMAGE";
+ public static final String DD_TALK ="DD_TALK";
+ public static final String APP_KEY ="APP_KEY";
+ public static final String APP_SECRET ="APP_SECRET";
+ public static final String ACCESS_TOKEN ="ACCESS_TOKEN";
+ public static final String AGENT_ID ="AGENT_ID";
@@ -509,6 +551,11 @@
public interface RedisKeys {
public static final String IMPORTING_CARS ="IMPORTING_CARS";
+ public static final String CHECKING_JKCUSTOMER_LOCATION ="CHECKING_JKCUSTOMER_LOCATION";
+ public static final String JKLINE_JOB ="JKLINE_JOB_";
+ public static final String IMPORTING_JKCUSTOMER ="IMPORTING_JKCUSTOMER";
+ public static final String IMPORTING_JKORDERS ="IMPORTING_JKORDERS";
+ public static final String IMPORTING_JKLINE ="IMPORTING_JKLINE";
public static final String IMPORTING_MEMBER ="IMPORTING_MEMBER";
public static final String BIGSCREEN_UUID ="BIGSCREEN_UUID";
public static final String IMPORTING_GAS ="IMPORTING_GAS";
@@ -532,28 +579,21 @@
return d;
}
public static BigDecimal formatBigdecimal4Float(BigDecimal d) {
+ return formatBigdecimalScale(d,4);
+ }
+ public static BigDecimal formatBigdecimalScale(BigDecimal d,int scale) {
if (d == null) {
d = new BigDecimal(0.0);
}
//淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏�
- d = d.setScale(4, BigDecimal.ROUND_HALF_UP);
+ d = d.setScale(scale, BigDecimal.ROUND_HALF_UP);
return d;
}
public static BigDecimal formatBigdecimal0Float(BigDecimal d) {
- if (d == null) {
- d = new BigDecimal(0.0);
- }
- //淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏�
- d = d.setScale(0, BigDecimal.ROUND_HALF_UP);
- return d;
+ return formatBigdecimalScale(d,0);
}
public static BigDecimal formatBigdecimal2Float(BigDecimal d) {
- if (d == null) {
- d = new BigDecimal(0.0);
- }
- //淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏�
- d = d.setScale(2, BigDecimal.ROUND_HALF_UP);
- return d;
+ return formatBigdecimalScale(d,2);
}
@@ -861,6 +901,7 @@
AUTHED_LEAVE(9, "涓嬪彂鎺堟潈绂诲洯","涓嬪彂鎺堟潈绂诲洯" ),
LEAVED(10, "宸茬鍥� ","杞﹁締浠巤data}绂诲満 " ),
OVER_NUMBER(11, "宸茶繃鍙�","瓒呮椂鏈埌鎸囧畾鏈堝彴鑷姩杩囧彿" ),
+ CHANGE_GROUP(12, "鏇存崲鏈堝彴缁�","浠庛�恵data}銆戞洿鎹㈠埌銆恵data1}銆�" ),
;
// 鎴愬憳鍙橀噺
@@ -1441,8 +1482,12 @@
public String getNoteinfo() {
return noteinfo;
}
+ }
-
+ public static String strToJson(String key,String val){
+ Map<String,Object> map = new HashMap<>();
+ map.put(key,val);
+ return JSONObject.toJSONString(map);
}
}
--
Gitblit v1.9.3