From 1b7c69afc22e9fdc6387afe8423522e3ed2b893d Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 4 May 2023 15:08:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BA=AB=E4=BB=BD=E8=AF=81?=
 =?UTF-8?q?=E6=AD=A3=E5=88=99=E8=A7=A3=E6=9E=90=E5=B7=A5=E5=85=B7=E7=B1=BB?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?[LocalDate=E7=B1=BB=E5=9E=8B]=E7=9A=84=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/utils/DateUtils.java  | 37 +++++++++++++++++++
 .../commons/tools/utils/IdCardRegexUtils.java |  7 +++-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
index 8ddbea5066..f13ecd1297 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
@@ -22,6 +22,8 @@ import org.joda.time.format.DateTimeFormatter;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
 
@@ -1112,4 +1114,39 @@ public class DateUtils {
         cal.setTime(date);
         return str.contains(String.valueOf(cal.get(Calendar.DAY_OF_WEEK)));
     }
+
+    /**
+     * @description: java.time.LocalDate转Date
+     * @param localDate:
+     * @return
+     * @author: WangXianZhang
+     * @date: 2023/5/4 3:00 PM
+     */
+    public static Date localDate2Date(java.time.LocalDate localDate) {
+        Instant instant = localDate.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant();
+        return Date.from(instant);
+    }
+
+    /**
+     * @description: java.time.LocalDateTime转Date
+     * @param localDate:
+     * @return
+     * @author: WangXianZhang
+     * @date: 2023/5/4 3:00 PM
+     */
+    public static Date localDateTime2Date(java.time.LocalDateTime localDate) {
+        Instant instant = localDate.atZone(ZoneId.systemDefault()).toInstant();
+        return Date.from(instant);
+    }
+
+    /**
+     * @description: date转化为DateTime
+     * @param date:
+     * @return
+     * @author: WangXianZhang
+     * @date: 2023/5/4 3:04 PM
+     */
+    public static java.time.LocalDateTime date2LocalDateTime(Date date) {
+        return LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault());
+    }
 }
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java
index ff1f0b0549..78c061b395 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java
@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 import java.time.DateTimeException;
 import java.time.LocalDate;
 import java.time.Period;
+import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -56,6 +57,7 @@ public class IdCardRegexUtils {
         private String birthdayDay;
         private String sex;
         private Integer age;
+        private LocalDate birthday;
     }
 
     /**
@@ -122,17 +124,18 @@ public class IdCardRegexUtils {
             String month = matcher.group("month");
             String day = matcher.group("day");
             String sex = matcher.group("sex");
+            LocalDate birthday;
 
             // ------- 年龄Start----------
             Integer age;
             try {
-                LocalDate birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day));
+                birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day));
                 age = Period.between(birthday, LocalDate.now()).getYears();
             } catch (DateTimeException e) {
                 throw new EpmetException("身份证号解析年龄失败:" + ExceptionUtils.getErrorStackTrace(e));
             }
             // ------- 年龄End----------
-            return new ParsedContent(year, month, day, sex, age);
+            return new ParsedContent(year, month, day, sex, age, birthday);
         }
 
         // 其他类型暂时不可解析