From b6b0cb226fcf184525ee7b36af3a09471e9c0057 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 25 三月 2024 11:29:33 +0800
Subject: [PATCH] 修改数据统计的查询条件

---
 src/main/java/com/lf/server/helper/StringHelper.java |   78 +++++++++++++++++++++++++++++++--------
 1 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/StringHelper.java b/src/main/java/com/lf/server/helper/StringHelper.java
index 36c98b3..2a130b4 100644
--- a/src/main/java/com/lf/server/helper/StringHelper.java
+++ b/src/main/java/com/lf/server/helper/StringHelper.java
@@ -2,9 +2,12 @@
 
 import com.lf.server.entity.all.StaticData;
 
+import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -122,10 +125,17 @@
     }
 
     /**
-     * 鑾峰彇 like 瀛楃涓�-2
+     * 鑾峰彇 like 瀛楃涓�
      */
-    public static String getLikeStr2(String str) {
-        return StringHelper.isEmpty(str) ? "%" : "%" + str.trim() + "%";
+    public static String getLikeUpperStr(String str) {
+        return StringHelper.isEmpty(str) ? null : "%" + str.trim().toUpperCase() + "%";
+    }
+
+    /**
+     * 鑾峰彇 鍙砽ike 瀛楃涓�
+     */
+    public static String getRightLike(String str) {
+        return StringHelper.isEmpty(str) ? null : str.trim() + "%";
     }
 
     /**
@@ -134,7 +144,7 @@
      * @param wkt
      * @return
      */
-    public static String getGeomWKT(String wkt) {
+    public static String getGeomWkt(String wkt) {
         if (StringHelper.isEmpty(wkt)) {
             return "null";
         }
@@ -163,6 +173,10 @@
      * @return 鏄�/鍚�
      */
     public static boolean isSqlInjection(String str) {
+        if (null == str) {
+            return false;
+        }
+
         Matcher m = sqlPattern.matcher(str);
 
         return m.matches();
@@ -172,35 +186,67 @@
      * 鏍￠獙瀵嗙爜鏄�/鍚﹀悎娉�
      *
      * @param pwd 瀵嗙爜
-     * @return 鏄�/鍚﹀悎娉�
+     * @return 鏄�/鍚︿负鏃犳晥鐨�
      */
-    public static boolean checkPwdValid(String pwd) {
-        return Pattern.matches(StaticData.PWD_REG, pwd);
+    public static boolean isPwdInvalid(String pwd) {
+        return !Pattern.matches(StaticData.PWD_REG, pwd);
+    }
+
+    /**
+     * 鑾峰彇GUID
+     */
+    public static String getGuid() {
+        return UUID.randomUUID().toString();
+    }
+
+    /**
+     * 鑾峰彇鍒嗛挓宸暟
+     */
+    public static long getMinuteDifference(Timestamp ts) {
+        return (ts.getTime() - System.currentTimeMillis()) / 1000 / 60;
     }
 
     /**
      * 杩炴帴List闆嗗悎
      *
-     * @param list 鏁存暟闆嗗悎
-     * @param join 杩炴帴瀛楃
-     * @return
+     * @param list list 鏁存暟闆嗗悎
+     * @param join join 杩炴帴瀛楃
+     * @param <T>  娉涘瀷绫�
+     * @return 瀛楃涓�
      */
-    public static String join(List<Integer> list, String join) {
+    public static <T> String join(List<T> list, String join) {
         if (null == list || list.isEmpty()) {
             return "";
         }
 
         StringBuilder sb = new StringBuilder();
-        for (Integer i : list) {
-            if (null != i) {
-                sb.append(i.toString() + join);
+        for (T t : list) {
+            if (null != t) {
+                sb.append(t.toString()).append(join);
             }
         }
 
-        if (sb.length() > 0 && sb.lastIndexOf(join) == sb.length() - 1) {
-            sb.deleteCharAt(sb.length() - 1);
+        if (sb.length() > 0 && sb.lastIndexOf(join) == sb.length() - join.length()) {
+            // 鍒犻櫎浠庣储寮� start 寮�濮嬪埌 end 涔嬮棿鐨勫瓧绗︼紝鍗� 鍓嶅寘鎷� 鍚庝笉鍖呮嫭銆�
+            sb.delete(sb.length() - join.length(), sb.length());
         }
 
         return sb.toString();
     }
+
+    /**
+     * 瀛楃涓茶浆鏁存暟闆嗗悎
+     */
+    public static List<Integer> strToIntegers(String str) {
+        if (StringHelper.isEmpty(str)) {
+            return null;
+        }
+
+        List<Integer> list = new ArrayList<>();
+        for (String s : str.split(StaticData.COMMA)) {
+            list.add(Integer.parseInt(s));
+        }
+
+        return list;
+    }
 }

--
Gitblit v1.9.3