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

diff --git a/src/main/java/com/lf/server/helper/StringHelper.java b/src/main/java/com/lf/server/helper/StringHelper.java
index 6c538be..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.text.DecimalFormat;
+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;
 
@@ -16,7 +19,7 @@
     /**
      * 鏁板瓧姝e垯
      */
-    public static final Pattern NUMBER_PATTERN = Pattern.compile("^[-\\+]?[\\d]*[.]?[\\d]*$");
+    public static final Pattern NUMBER_PATTERN = Pattern.compile("-?\\d+(\\.\\d+)?");
 
     /**
      * 鏍煎紡鍖栧綋鍓嶇郴缁熸棩鏈� 1
@@ -31,26 +34,43 @@
     /**
      * 鏍煎紡鍖栧綋鍓嶇郴缁熸棩鏈� 3
      */
-    public static final SimpleDateFormat YMD__FORMAT = new SimpleDateFormat("yyyyMMdd_");
+    public static final SimpleDateFormat YMD2_FORMAT = new SimpleDateFormat("yyyyMMdd");
 
     /**
      * 鏍煎紡鍖栧綋鍓嶇郴缁熸棩鏈� 4
      */
-    public static final SimpleDateFormat YMD_HM_FORMAT = new SimpleDateFormat("yyyyMMdd_HHmm");
-
-    public static final double D1024 = 1024.0;
+    public static final SimpleDateFormat YMDHMS2_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss");
 
     /**
-     * 鍒ゆ柇瀛楃涓�,鏄惁涓烘暟瀛�
+     * 鍒ゆ柇瀛楃涓�,鏄惁涓烘暣鏁�
      */
-    public static boolean isNumber(String str) {
-        return NUMBER_PATTERN.matcher(str).matches();
+    public static boolean isInteger(String str) {
+        return str != null && str.matches("[0-9]+");
+    }
+
+    /**
+     * 鍒ゆ柇瀛楃涓�,鏄惁涓烘诞鐐规暟
+     */
+    public static boolean isNumeric(String str) {
+        return str != null && str.matches("-?\\d+(\\.\\d+)?");
+    }
+
+    /**
+     * 鍒ゆ柇瀛楃涓�,鏄惁涓烘诞鐐规暟
+     */
+    public static boolean isNumeric2(String str) {
+        return str != null && NUMBER_PATTERN.matcher(str).matches();
     }
 
     /**
      * 鏃ユ湡姝e垯
      */
     public static Pattern datePattern = Pattern.compile("^((\\d{2}(([02468][048])|([13579][26]))[\\-\\/]((((0?[13578])|(1[02]))[\\-\\/]((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/]((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/]((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-\\/]((((0?[13578])|(1[02]))[\\-\\/]((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/]((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/]((0?[1-9])|(1[0-9])|(2[0-8]))))))(\\s(((0?[0-9])|([1-2][0-3]))\\:([0-5]?[0-9])((\\s)|(\\:([0-5]?[0-9])))))?$");
+
+    /**
+     * SQL姝e垯
+     */
+    public static Pattern sqlPattern = Pattern.compile("|and|exec|execute|insert|select|delete|update|count|drop|\\*|%|chr|mid|master|truncate|char|declare|sitename|net user|xp_cmdshell|;|or|-|\\+|,|like");
 
     /**
      * 瀛楃涓茶浆涓烘棩鏈�
@@ -94,51 +114,139 @@
      * 瀛楃涓�,鏄惁涓虹┖null鍜岀┖鏍�
      */
     public static boolean isEmpty(String str) {
-        return str == null || "".equals(str.trim());
+        return null == str || "".equals(str.trim());
     }
 
     /**
      * 鑾峰彇 like 瀛楃涓�
      */
-    public static String getLikeStr(String name) {
-        return StringHelper.isEmpty(name) ? null : "%" + name.trim() + "%";
+    public static String getLikeStr(String str) {
+        return StringHelper.isEmpty(str) ? null : "%" + str.trim() + "%";
+    }
+
+    /**
+     * 鑾峰彇 like 瀛楃涓�
+     */
+    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() + "%";
+    }
+
+    /**
+     * 鑾峰彇鍥惧舰鐨刉KT瀛楃涓�
+     *
+     * @param wkt
+     * @return
+     */
+    public static String getGeomWkt(String wkt) {
+        if (StringHelper.isEmpty(wkt)) {
+            return "null";
+        }
+
+        return String.format("ST_GeomFromText('%s')", wkt);
     }
 
     /**
      * 棣栧瓧姣嶅ぇ鍐�
      */
-    public static String capitalize(String str) {
-        return String.valueOf(str.charAt(0)).toUpperCase() + str.substring(1);
+    public static String firstCharToUpperCase(String str) {
+        return str.substring(0, 1).toUpperCase() + str.substring(1);
+    }
+
+    /**
+     * 棣栧瓧姣嶅皬鍐�
+     */
+    public static String firstCharToLowerCase(String str) {
+        return str.substring(0, 1).toLowerCase() + str.substring(1);
+    }
+
+    /**
+     * 鍒ゆ柇鍊兼槸鍚﹀瓨鍦⊿QL娉ㄥ叆
+     *
+     * @param str 瀛楃涓�
+     * @return 鏄�/鍚�
+     */
+    public static boolean isSqlInjection(String str) {
+        if (null == str) {
+            return false;
+        }
+
+        Matcher m = sqlPattern.matcher(str);
+
+        return m.matches();
     }
 
     /**
      * 鏍¢獙瀵嗙爜鏄�/鍚﹀悎娉�
      *
      * @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 formatByte(long byteNumber) {
-        double kbNumber = byteNumber / D1024;
-        if (kbNumber < D1024) {
-            return new DecimalFormat("#.##KB").format(kbNumber);
-        }
-        double mbNumber = kbNumber / D1024;
-        if (mbNumber < D1024) {
-            return new DecimalFormat("#.##MB").format(mbNumber);
-        }
-        double gbNumber = mbNumber / D1024;
-        if (gbNumber < D1024) {
-            return new DecimalFormat("#.##GB").format(gbNumber);
-        }
-        double tbNumber = gbNumber / D1024;
+    public static String getGuid() {
+        return UUID.randomUUID().toString();
+    }
 
-        return new DecimalFormat("#.##TB").format(tbNumber);
+    /**
+     * 鑾峰彇鍒嗛挓宸暟
+     */
+    public static long getMinuteDifference(Timestamp ts) {
+        return (ts.getTime() - System.currentTimeMillis()) / 1000 / 60;
+    }
+
+    /**
+     * 杩炴帴List闆嗗悎
+     *
+     * @param list list 鏁存暟闆嗗悎
+     * @param join join 杩炴帴瀛楃
+     * @param <T>  娉涘瀷绫�
+     * @return 瀛楃涓�
+     */
+    public static <T> String join(List<T> list, String join) {
+        if (null == list || list.isEmpty()) {
+            return "";
+        }
+
+        StringBuilder sb = new StringBuilder();
+        for (T t : list) {
+            if (null != t) {
+                sb.append(t.toString()).append(join);
+            }
+        }
+
+        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