From 34f587564c9a34515e7deda4dcd02eb748480e1f Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期一, 13 一月 2025 18:05:24 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 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 0f1bd6f..9b6bc6d 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,29 +1,19 @@ package com.doumee.core.utils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.doumee.core.model.LoginUserInfo; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategy; -import io.swagger.models.auth.In; -import org.apache.batik.util.Platform; import org.apache.commons.lang3.StringUtils; -import org.springframework.util.CollectionUtils; import java.io.IOException; import java.math.BigDecimal; -import java.net.URLDecoder; -import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Random; -import java.util.*; -import java.util.Date; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -151,8 +141,16 @@ public static final String HK_WXTOKEN_CONFIGID ="HK_WXTOKEN_CONFIGID" ; public static final String HK_WXTOKEN_TAGID ="HK_WXTOKEN_TAGID" ; public static final String WMS_TOTAL_STOCK_NUM ="WMS_TOTAL_STOCK_NUM" ; + public static final String WMS_LIQUID_LEVEL ="WMS_LIQUID_LEVEL" ; + public static final String WMS_PRESSURE_LEVEL ="WMS_PRESSURE_LEVEL" ; public static final String WX_REDIRECT_URL = "WX_REDIRECT_URL"; public static final String HK_CHANGNEI_SCREEN_INDEXCODES = "HK_CHANGNEI_SCREEN_INDEXCODES"; + public static final String CITY_XH_REASON_ID ="CITY_XH_REASON_ID" ; + public static final String ATWL_XH_PLATFORM_ID ="ATWL_XH_PLATFORM_ID" ; + public static final String SCREEN_SEVENT_ARRIVAL_STARTDATE = "SCREEN_SEVENT_ARRIVAL_STARTDATE"; + public static final String EARLY_START_WX_NOTICE = "EARLY_START_WX_NOTICE"; + public static final String OVER_NOTICE_WX = "OVER_NOTICE_WX"; + public static boolean DEALING_HK_SYNCPRIVILEGE= false; public static boolean DEALING_HK_SYNCDEVICE = false; public static boolean DEALING_HK_SYNCPLATFORM = false; @@ -543,10 +541,15 @@ } + /** + * 杩愬崟浜嗗崟浣嶇被鍨� 0涓囨敮 1绠� + */ + public static final int UNIT_TYPE =1; public interface memberType{ int driver = 0;//鍙告満浜哄憳 int visitor = 1;//鏅�氳瀹� int internal = 2;//鍐呴儴浜哄憳 + int gkuser = 3;//绠℃帶浜哄憳锛堣繍鍗曟煡璇級 } @@ -992,7 +995,7 @@ WAIT_CALL(2, "宸茬鍒�","宸茬鍒�"), IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ), CALLED(4, "宸插彨鍙�","宸插彨鍙�" ), - WORKING(5, "浣滀笟涓�","浣滀笟涓�" ), + WORKING(5, "浣滀笟涓�","浣滀笟涓�" ), DONE(6, "浣滀笟瀹屾垚 ","浣滀笟瀹屾垚" ), TRANSFERING(7, "杞Щ涓�","杞Щ涓�" ), EXCEPTION(8, "寮傚父鎸傝捣","寮傚父鎸傝捣" ), -- Gitblit v1.9.3