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 |   39 +++++++++++++++++++++++++++++++++------
 1 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/StringHelper.java b/src/main/java/com/lf/server/helper/StringHelper.java
index 40bb51c..2a130b4 100644
--- a/src/main/java/com/lf/server/helper/StringHelper.java
+++ b/src/main/java/com/lf/server/helper/StringHelper.java
@@ -2,7 +2,9 @@
 
 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;
@@ -123,10 +125,10 @@
     }
 
     /**
-     * 鑾峰彇 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() + "%";
     }
 
     /**
@@ -171,6 +173,10 @@
      * @return 鏄�/鍚�
      */
     public static boolean isSqlInjection(String str) {
+        if (null == str) {
+            return false;
+        }
+
         Matcher m = sqlPattern.matcher(str);
 
         return m.matches();
@@ -188,11 +194,16 @@
 
     /**
      * 鑾峰彇GUID
-     *
-     * @return
      */
     public static String getGuid() {
         return UUID.randomUUID().toString();
+    }
+
+    /**
+     * 鑾峰彇鍒嗛挓宸暟
+     */
+    public static long getMinuteDifference(Timestamp ts) {
+        return (ts.getTime() - System.currentTimeMillis()) / 1000 / 60;
     }
 
     /**
@@ -211,7 +222,7 @@
         StringBuilder sb = new StringBuilder();
         for (T t : list) {
             if (null != t) {
-                sb.append(t.toString() + join);
+                sb.append(t.toString()).append(join);
             }
         }
 
@@ -222,4 +233,20 @@
 
         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