From 4e2e52b766d87fc528d02bdebc1757c3dda8c596 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 二月 2025 09:22:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 100 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 88 insertions(+), 12 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 9b6bc6d..2b7b0ad 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
@@ -5,15 +5,15 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import net.sourceforge.pinyin4j.PinyinHelper;
import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
import java.math.BigDecimal;
+import java.text.Collator;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-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;
@@ -334,11 +334,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;
}
@@ -417,6 +418,7 @@
int selfTruck = 3;
int outTruck = 4;
int cityComTruck = 5;
+ int unknown = 6;
}
@@ -676,12 +678,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 = 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>");
}
@@ -984,6 +1034,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();
+ }
/**
* 鏈堝彴浣滀笟 鐘舵��
@@ -1261,6 +1330,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}"),
;
// 鎴愬憳鍙橀噺
--
Gitblit v1.9.3