From 1d21a9673d47a186bd189d9cceaa6e2ea17d293d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 15 六月 2021 14:55:44 +0800
Subject: [PATCH] Merge branch 'test'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AgeUtils.java |   35 +++++++++++++++++++++++++++--------
 1 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AgeUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AgeUtils.java
index c64e3e7..ebc574b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AgeUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AgeUtils.java
@@ -12,8 +12,8 @@
     public static int getAgeFromBirthTime(String birthTimeString) {
         // 先截取到字符串中的年、月、日
         int selectYear = Integer.parseInt(birthTimeString.substring(0,4));
-        int selectMonth = Integer.parseInt(birthTimeString.substring(4,6));
-        int selectDay = Integer.parseInt(birthTimeString.substring(6,8));
+        int selectMonth = Integer.parseInt(birthTimeString.substring(5,7));
+        int selectDay = Integer.parseInt(birthTimeString.substring(8));
         // 得到当前时间的年、月、日
         Calendar cal = Calendar.getInstance();
         int yearNow = cal.get(Calendar.YEAR);
@@ -52,6 +52,24 @@
             }
         }
         return age;
+    }
+
+    // 根据时间戳计算年龄
+    public static int getAgeFromBirthTime(long birthTimeLong) {
+        Date date = new Date(birthTimeLong * 1000l);
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String birthTimeString = format.format(date);
+        return getAgeFromBirthTime(birthTimeString);
+    }
+
+    public static String getAgeFormatBirthday(String brithday) {
+        if(StringUtils.isEmpty(brithday)){
+            return "";
+        }
+        String year = brithday.substring(0,4);
+        String month = brithday.substring(4,6);
+        String ri = brithday.substring(6,8);
+        return year + "-" + month + "-" + ri;
     }
 
     public static int getAgeFromBirthTimes(String birthTimeString) {
@@ -96,19 +114,20 @@
                 age = age + 1;
             }
         }
-        return age - 1;
+        return age;
     }
 
-    // 根据时间戳计算年龄
-    public static int getAgeFromBirthTime(long birthTimeLong) {
+    public static int getAgeFromBirthTimes(long birthTimeLong) {
         Date date = new Date(birthTimeLong * 1000l);
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         String birthTimeString = format.format(date);
-        return getAgeFromBirthTime(birthTimeString);
+        return getAgeFromBirthTimes(birthTimeString);
     }
 
     public static void main(String[] args) {
-        int age = getAgeFromBirthTime("1995-08-18");
-        System.out.println(age);
+        String yese = "19980516";
+        String year = yese.substring(0,4);
+        String month = yese.substring(4,6);
+        String ri = yese.substring(6,8);
     }
 }

--
Gitblit v1.7.1