From 1dca57c0f15c3cdfbebf14ad1e9e04d8c84e775c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 07 三月 2026 09:51:47 +0800
Subject: [PATCH] no message

---
 src/main/java/com/zy/asrs/utils/Utils.java |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 5535a49..1b0fe35 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -18,10 +18,11 @@
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 
 /**
  * Created by vincent on 2020/8/27
@@ -60,6 +61,15 @@
         } catch (ParseException e) {
             return false;
         }
+    }
+
+    public static Date getFormateDate(String datestr) {
+        //瀛楃涓茶浆鏃ユ湡
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime parse = LocalDateTime.parse(datestr, dateTimeFormatter);
+        Instant instant = parse.atZone(ZoneId.systemDefault()).toInstant();
+        Date date = Date.from(instant);
+        return date;
     }
 
     /**
@@ -293,7 +303,8 @@
             case 2://缁忓吀鍗曚几搴撲綅锛�2鎺掕揣鏋讹級
                 return LocNecessaryParametersDoubleExtension2(rowLastno, curRow, crnNumber); //宸插畬鍠�
             case 3://缁忓吀鍗曞弻浼稿簱浣�  宸﹀崟鍙冲弻(灏忓崟澶у弻)
-                return LocNecessaryParametersDoubleExtension3(rowLastno, curRow, crnNumber); //鏈畬鍠�
+                return LocNecessaryParametersDoubleExtension(rowLastno, curRow, crnNumber); //宸插畬鍠�
+//            return LocNecessaryParametersDoubleExtension3(rowLastno, curRow, crnNumber); //鏈畬鍠�
             case 4://缁忓吀鍗曞弻浼稿簱浣�  宸﹀弻鍙冲崟(灏忓弻澶у崟)
                 return LocNecessaryParametersDoubleExtension4(rowLastno, curRow, crnNumber); //鏈畬鍠�
             case 5://鍙屽伐浣嶅崟浼稿簱浣�(4鎺掕揣鏋�)
@@ -644,4 +655,15 @@
         return result;
     }
 
+    /**
+     * 鏃ユ湡杞崲涓哄瓧绗︿覆
+     * @param date 鏃ユ湡
+     * @param format 鏍煎紡
+     * @return 瀛楃涓�
+     */
+    public static String dateToStr(Date date, String format) {
+        SimpleDateFormat sdf = new SimpleDateFormat(format);
+        return sdf.format(date);
+    }
+
 }

--
Gitblit v1.9.1