From 9b74b477139659d69fcf321d160724aa1cd90ce0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 07 五月 2025 18:49:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 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 1405932..73aecd0 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
@@ -114,6 +114,7 @@
public static final Integer THREE =3 ;
public static final Integer FOUR =4 ;
public static final Integer FIVE =5 ;
+ public static final Integer SIX =6 ;
public static final String ORG_USER_ORIGIN = "ORG_USER_ORIGIN";
public static final String VIRTUAL_CARD_INDEX = "02098469790";
public static final String RETRY_CONNECT_NUM ="RETRY_CONNECT_NUM" ;
@@ -150,6 +151,8 @@
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 final String PRESSURE_LEVEL_UNIT = "PRESSURE_LEVEL_UNIT";
+ public static final String LIQUID_LEVEL_UNIT ="LIQUID_LEVEL_UNIT" ;
public static boolean DEALING_HK_SYNCPRIVILEGE= false;
public static boolean DEALING_HK_SYNCDEVICE = false;
@@ -410,15 +413,44 @@
int invalid =9;
}
+ /**
+ * 0=璁垮杞﹁締-璁垮杞﹁締
+ * 1=wms鎺ㄩ�佺殑鐗╂祦杞﹁締锛堥潪鑷湁杞︼級锛氳揣杩愯溅杈�-澶栧崗杩愯緭杞﹁締
+ * 2= 甯傚叕鍙哥殑棰勭害鍏ュ洯杞﹁締锛氳揣杩愯溅杈�-甯傚叕鍙稿嵏璐ц溅杈�
+ * 3= 瀹夋嘲鐨勯绾﹀叆鍥溅杈嗭細璐ц繍杞﹁締-鍔犲伐鐑熷嵏璐ц溅杈�
+ * 4= 瀹夋嘲鍏姟杞︼細鍏姟杞�-瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅
+ * 5= 瀹夋嘲鑷湁杞︼細璐ц繍杞﹁締-瀹夋嘲鐗╂祦璐ц繍杞﹁締
+ */
public interface RetentionCarType{
//杞﹁締绫诲瀷 0鍐呴儴杞﹁締 1鐩稿叧鏂硅溅杈� 2璁垮杞﹁締 3鍐呰繍鐗╂祦杞� 4澶栧崗杞﹁締 5甯傚叕鍙稿嵏璐ц溅
- int internal = 0;
- int relation = 1;
- int visitor = 2;
- int selfTruck = 3;
- int outTruck = 4;
- int cityComTruck = 5;
- int unknown = 6;
+ //浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣
+// int internal = 0;
+// int relation = 1;
+// int visitor = 2;
+// int selfTruck = 3;
+// int outTruck = 4;
+// int cityComTruck = 5;
+// int unknown = 6;
+ int fkCar = 0;//璁垮杞﹁締-璁垮杞﹁締
+ int wxysCar = 1;//鎺ㄩ�佺殑鐗╂祦杞﹁締锛堥潪鑷湁杞︼級锛氳揣杩愯溅杈�-澶栧崗杩愯緭杞﹁締
+ int sgsxhCar = 2;//甯傚叕鍙哥殑棰勭害鍏ュ洯杞﹁締锛氳揣杩愯溅杈�-甯傚叕鍙稿嵏璐ц溅杈�
+ int jgyxhCar = 3;//瀹夋嘲鐨勯绾﹀叆鍥溅杈嗭細璐ц繍杞﹁締-鍔犲伐鐑熷嵏璐ц溅杈�
+ int atwlgwCar = 4;//瀹夋嘲鍏姟杞︼細鍏姟杞�-瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅
+ int atwlzyCar = 5;//瀹夋嘲鑷湁杞︼細璐ц繍杞﹁締-瀹夋嘲鐗╂祦璐ц繍杞﹁締
+ int other = 6;//鏈煡杞﹁締
+ }
+
+ /**
+ * 鍦ㄥ満浜哄憳绫诲瀷
+ */
+ public interface RetentionMemberType{
+ //绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅 4鐩稿叧鏂逛汉鍛� 5璐ц繍鍙告満
+ int lwfk = 0;//0鍔冲姟璁垮
+ int fk = 1;//1鏅�氳瀹�
+ int internalMember = 2;//鍐呴儴鍛樺伐
+ int car = 3;//杞﹁締淇℃伅
+ int relMember = 4;//鐩稿叧鏂逛汉鍛�
+ int driver = 5;//璐ц繍鍙告満
}
--
Gitblit v1.9.3