Merge branch 'master' into 'master'

修复报表时间条件报错问题

See merge request lighter/web-server!46

src/main/java/thyyxxk/webserver/utils/ReportUtil.java

@@ -62,7 +62,7 @@ public class ReportUtil {
             if(StringUtil.notBlank(dto.getStartTime())){
                 baseSql = baseSql.replaceAll(START_TIME, "'" + dto.getStartTime() + "'");
             } else {
-                baseSql = baseSql.replaceAll(START_TIME, DateUtil.getDayStartTime(new Date()));
+                baseSql = baseSql.replaceAll(START_TIME,"'2012-01-01 00:00:00'");
             }
         }
         if(baseSql.contains(END_TIME)){
@@ -202,7 +202,7 @@ public class ReportUtil {
             if(StringUtil.notBlank(dto.getStartTime())){
                 sqlChild = sqlChild.replaceAll(START_TIME, "'" + dto.getStartTime() + "'");
             } else {
-                sqlChild = sqlChild.replaceAll(START_TIME, DateUtil.getDayStartTime(new Date()));
+                sqlChild = sqlChild.replaceAll(START_TIME, "'" + DateUtil.getDayStartTime(new Date()) + "'");
             }
         }
         if(sqlChild.contains(END_TIME)){
@@ -218,7 +218,7 @@ public class ReportUtil {
                 if(StringUtil.notBlank(dto.getStartTime())){
                     sqlMom = sqlMom.replaceAll(START_TIME, "'" + dto.getStartTime() + "'");
                 } else {
-                    sqlMom = sqlMom.replaceAll(START_TIME, DateUtil.getDayStartTime(new Date()));
+                    sqlMom = sqlMom.replaceAll(START_TIME, "'" + DateUtil.getDayStartTime(new Date()) + "'");
                 }
             }
             if(sqlMom.contains(END_TIME)){
@@ -281,4 +281,19 @@ public class ReportUtil {
         return d;
     }
 
+    /**
+     * @description: 验证sql是否正确
+     * @author: hsh
+     * @date: 2023/7/12 10:32
+     * @param: [sql, isValid]
+     * @return: String
+     **/
+    public static String sqlCheckAndVerifyByKeyword(String sql){
+        if(sql.contains("drop") || sql.contains("truncate") || sql.contains("delete")  || sql.contains("update")
+                || sql.contains("DROP") || sql.contains("TRUNCATE") || sql.contains("DELETE")  || sql.contains("UPDATE")){
+            return "sql语句存在非查询语句关键字，请检查！";
+        }
+        return "";
+    }
+
 }