From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 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 f54ec05..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;
@@ -38,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" ;
@@ -53,7 +55,26 @@
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" ;
@@ -171,6 +192,7 @@
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;
@@ -530,6 +552,7 @@
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";
@@ -556,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);
}
@@ -1466,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