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 | 190 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 153 insertions(+), 37 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..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
@@ -1,27 +1,17 @@
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 net.sourceforge.pinyin4j.PinyinHelper;
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.Collator;
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;
@@ -124,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" ;
@@ -151,8 +142,18 @@
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 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;
public static boolean DEALING_HK_SYNCPLATFORM = false;
@@ -336,11 +337,12 @@
return "";
}
int l = s.length();
- if(Constants.equalsInteger(l,7)){
- return s.substring(0,3)+"**"+s.substring(l-2,l);
- }
- if(l <= 8){
- return s.substring(0,3)+"***"+s.substring(l-2,l);
+ if(l >= 7){
+ String tt = "";
+ for (int i = 0; i < l-6; i++) {
+ tt = tt+"*";
+ }
+ return s.substring(0,2)+tt+s.substring(l-4,l);
}
return s;
}
@@ -411,14 +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;
+ //浣滀笟绫诲瀷 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;//璐ц繍鍙告満
}
@@ -543,10 +575,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;//绠℃帶浜哄憳锛堣繍鍗曟煡璇級
}
@@ -560,6 +597,16 @@
int reason = 6;//鍏ュ洯鍘熷洜
}
+public interface noticesObjectType{
+ int visit = 0;//璁垮鐢宠
+ int visitReporting = 1;//璁垮鎶ュ
+ int useCar = 2;//鐢ㄨ溅鐢宠
+ int dangerDeal = 3;//闅愭偅澶勭悊
+ int logisticsCarUse = 4;//鐗╂祦杞﹀鎵�
+ int system = 5;//绯荤粺娑堟伅
+ int reason = 6;//鍏ュ洯鍘熷洜
+ int hknotice = 7;//娴峰悍鑰冨嫟浠ｅ姙
+}
public static Integer approveTypeToNoticeType(Integer approveType){
@@ -583,16 +630,6 @@
- public interface noticesObjectType{
- int visit = 0;//璁垮鐢宠
- int visitReporting = 1;//璁垮鎶ュ
- int useCar = 2;//鐢ㄨ溅鐢宠
- int dangerDeal = 3;//闅愭偅澶勭悊
- int logisticsCarUse = 4;//鐗╂祦杞﹀鎵�
- int system = 5;//绯荤粺娑堟伅
- int reason = 6;//鍏ュ洯鍘熷洜
- int hknotice = 7;//娴峰悍鑰冨嫟浠ｅ姙
-}
public interface approveStatus{
@@ -673,12 +710,60 @@
}
public static void main(String[] args) {
- System.out.println(Constants.checkCarNo("鐨朅10991"));
- System.out.println(Constants.checkCarNo("鐨朅A10991"));
+// getChinesePingyin("DDaa姹熻悕鐨勫瀵瑰");
+// System.out.println(DateUtil.getShortTime(new Date()));
+// System.out.println( "2025-01-14 10:50:56".substring(0,10));
+// System.out.println(Constants.checkCarNo("鐨朅A10991"));
// System.out.println(Constants.getVehiclePlateNo("婀楤140D17").getDescription());
// System.out.println(Constants.getVehiclePlateNo("瀹緼P0637").getDescription());
-
+ System.out.println("<script> SELECT \n" +
+ "t1.REALNAME `REALNAME`,\n" +
+ "MAX(t1.`01`) `januaryCount`,\n" +
+ "MAX(t1.`02`) `februaryCount`,\n" +
+ "MAX(t1.`03`) `marchCount`,\n" +
+ "MAX(t1.`04`) `aprilCount`,\n" +
+ "MAX(t1.`05`) `mayCount`,\n" +
+ "MAX(t1.`06`) `juneCount`,\n" +
+ "MAX(t1.`07`) `julyCount`,\n" +
+ "MAX(t1.`08`) `augustCount`,\n" +
+ "MAX(t1.`09`) `septemberCount`,\n" +
+ "MAX(t1.`10`) `octoberCount`,\n" +
+ "MAX(t1.`11`) `novemberCount`,\n" +
+ "MAX(t1.`12`) `decemberCount`\n" +
+ "FROM(\n" +
+ "SELECT \n" +
+ "t.id,\n" +
+ "t.REALNAME,\n" +
+ "CASE WHEN t.yue='01' THEN t.c ELSE 0 END AS `01`,\n" +
+ "CASE WHEN t.yue='02' THEN t.c ELSE 0 END AS `02`,\n" +
+ "CASE WHEN t.yue='03' THEN t.c ELSE 0 END AS `03`,\n" +
+ "CASE WHEN t.yue='04' THEN t.c ELSE 0 END AS `04`,\n" +
+ "CASE WHEN t.yue='05' THEN t.c ELSE 0 END AS `05`,\n" +
+ "CASE WHEN t.yue='06' THEN t.c ELSE 0 END AS `06`,\n" +
+ "CASE WHEN t.yue='07' THEN t.c ELSE 0 END AS `07`,\n" +
+ "CASE WHEN t.yue='08' THEN t.c ELSE 0 END AS `08`,\n" +
+ "CASE WHEN t.yue='09' THEN t.c ELSE 0 END AS `09`,\n" +
+ "CASE WHEN t.yue='10' THEN t.c ELSE 0 END AS `10`,\n" +
+ "CASE WHEN t.yue='11' THEN t.c ELSE 0 END AS `11`,\n" +
+ "CASE WHEN t.yue='12' THEN t.c ELSE 0 END AS `12` \n" +
+ "FROM \n" +
+ "(SELECT \n" +
+ "su.id,\n" +
+ "su.REALNAME,\n" +
+ "DATE_FORMAT(b.START_TIME,'%m') yue,\n" +
+ "SUM(" +
+ "CONVERT( (UNIX_TIMESTAMP(b.END_TIME) - UNIX_TIMESTAMP(b.START_TIME))/(60*60), DECIMAL(5,1))) c\n" +
+ "FROM \n" +
+ "meeting_user_rel ur\n" +
+ "LEFT JOIN `SYSTEM_USER` su ON ur.USER_ID = su.id \n" +
+ "LEFT JOIN meeting_book b ON ur.OBJ_ID = b.id \n" +
+ "WHERE DATE_FORMAT(b.START_TIME,'%Y') = #{yearNum} AND b.STATUS in(0,2) and b.isdeleted=0" +
+ "<if test='userId != null'>"+
+ "and ur.USER_ID = #{userId}\n" +
+ "</if>"+
+ "GROUP BY su.id, DATE_FORMAT(b.START_TIME,'%m')) t) t1 GROUP BY t1.id" +
+ "</script>");
}
@@ -698,6 +783,10 @@
LW_FK(0,"鍔冲姟璁垮"),
PT_FK(1,"鏅�氳瀹�"),
NB_FK(2,"鍐呴儴浜哄憳"),
+
+ COMPANY_TYPE_REL(0,"鐩稿叧鏂圭粍缁�"),
+ COMPANY_TYPE_INTERNAL(1,"鍐呴儴浜哄憳"),
+ COMPANY_TYPE_FK(3,"璁垮"),
/** 杩涘満绫诲瀷 **/
OUT(0,"鍑�"),
@@ -981,6 +1070,25 @@
this.info = info;
}
}
+ public static String getChinesePingyin(String chinese) {
+ if(StringUtils.isBlank(chinese)){
+ return null;
+ }
+ StringBuilder result = new StringBuilder();
+ for (char ch : chinese.toCharArray()) {
+ String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(ch);
+
+ // 濡傛灉瀛楃鏄腑鏂囷紝鍒欒幏鍙栧叾鎷奸煶鐨勯瀛楁瘝
+ if (pinyinArray != null && pinyinArray.length > 0) {
+ result.append(pinyinArray[0].charAt(0));
+ } else {
+ // 闈炰腑鏂囧瓧绗︾洿鎺ユ嫾鎺�
+ result.append(ch);
+ }
+ }
+ System.out.println(result.toString());
+ return result.toString().toUpperCase();
+ }
/**
* 鏈堝彴浣滀笟 鐘舵��
@@ -992,7 +1100,7 @@
WAIT_CALL(2, "宸茬鍒�","宸茬鍒�"),
IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ),
CALLED(4, "宸插彨鍙�","宸插彨鍙�" ),
- WORKING(5, "浣滀笟涓�","浣滀笟涓�" ),
+ WORKING(5, "浣滀笟涓�","浣滀笟涓�" ),
DONE(6, "浣滀笟瀹屾垚 ","浣滀笟瀹屾垚" ),
TRANSFERING(7, "杞Щ涓�","杞Щ涓�" ),
EXCEPTION(8, "寮傚父鎸傝捣","寮傚父鎸傝捣" ),
@@ -1258,6 +1366,13 @@
IMPORT_TRAIMETIME(14, "瀵煎叆鍩硅鏈夋晥","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬鍏ュ煿璁湁鏁堛�戞搷浣�" ),
BE_HEAD(15, "璁句负涓荤","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愯涓轰富绠°�戞搷浣�" ),
NOT_HEAD(16, "鍙栨秷涓荤","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬彇娑堜富绠°�戞搷浣�" ),
+ MEET_BOOK_DEL(17, "鍒犻櫎浼氳瀹ょ敵璇�","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬垹闄や細璁鐢宠銆戞搷浣�,瀵硅薄淇℃伅${param3}" ),
+ VISIT_DEL(18, "鍒犻櫎璁垮鐢宠","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬垹闄よ瀹㈢敵璇枫��,瀵硅薄淇℃伅锛�${param3}" ),
+ VISIT_CAR_DEL(19, "鍒犻櫎璁垮鎶ュ","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬垹闄よ瀹㈡姤澶囥��,瀵硅薄淇℃伅锛�${param3}" ),
+ PLATFROM_BOOK_DEL(20, "鍒犻櫎鏈堝彴棰勭害浠诲姟","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬垹闄ゆ湀鍙伴绾︿换鍔°��,瀵硅薄淇℃伅锛�${param3}" ),
+ CAR_BOOK_DEL(21, "鍒犻櫎鍏溅鐢宠","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬垹闄ゅ叕杞︾敵璇枫��,瀵硅薄淇℃伅锛�${param3}"),
+ PLATFROM_JOB_DEL(22, "鍒犻櫎瀹夋嘲鐗╂祦浣滀笟浠诲姟","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬垹闄ゅ畨娉扮墿娴佷綔涓氫换鍔°��,瀵硅薄淇℃伅锛�${param3}" ),
+ HIDEN_DANGER_DEL(23, "鍒犻櫎闅愭偅闅忔墜鎷�","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬垹闄ら殣鎮ｉ殢鎵嬫媿銆�,瀵硅薄淇℃伅锛�${param3}"),
;
// 鎴愬憳鍙橀噺
@@ -1312,6 +1427,7 @@
HIDDEN_DANGER_SUBMIT(0, "闅愭偅闅忔墜鎷嶆彁鎶�", "闅愭偅闅忔墜鎷嶆彁鎶�"),
HIDDEN_DANGER_DEAL_BEFORE(1, "闅愭偅闅忔墜鎷嶅鐞嗗墠", "闅愭偅闅忔墜鎷嶅鐞嗗墠"),
HIDDEN_DANGER_DEAL_AFTER(2, "闅愭偅闅忔墜鎷嶅鐞嗗悗 ", "闅愭偅闅忔墜鎷嶅鐞嗗悗 "),
+ MEETING_BOOKS(4, "浼氳鏂囦欢 ", "浼氳鏂囦欢 "),
;
// 鎴愬憳鍙橀噺
private String name;
--
Gitblit v1.9.3