Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java

src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java

@@ -2177,10 +2177,10 @@ public class PointServiceImpl implements PointService {
                 return localDateTime.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
             } catch (Exception e) {
                 try {
-                    LocalDateTime localDateTime = LocalDateTime.parse(dateString, DateTimeFormatter.ofPattern("yyyyMMdd"));
+                    LocalDate localDateTime = LocalDate.parse(dateString, DateTimeFormatter.ofPattern("yyyyMMdd"));
                     return localDateTime.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
-                } catch (Exception ignored) {
+                } catch (Exception ex) {
-
+                    System.out.println("时间" + dateString + "解析失败" + ex);
                 }
             }
         }
@@ -2209,8 +2209,8 @@ public class PointServiceImpl implements PointService {
                             time = String.valueOf(param);
                             LocalDateTime localDateTime = LocalDateTime.parse(time, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
                             return localDateTime.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH时mm分"));
-                        } catch (Exception ignored) {
+                        } catch (Exception exxx) {
-
+                            System.out.println("时间" + time + "解析失败" + ex);
                         }
                     }
                 }

src/main/java/com/biutag/supervisiondata/util/TxtUtil.java

@@ -5,13 +5,11 @@ import com.alibaba.fastjson2.JSONArray;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
-import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.*;
 
 /**
  * @author kami on 2024-07-15 15:47:40