From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
index f31dc61c..88163a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
@@ -2,6 +2,7 @@
import lombok.extern.slf4j.Slf4j;
+import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.*;
@@ -32,6 +33,8 @@
public static SimpleDateFormat ymdhms_format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
public static DateTimeFormatter format_ymd_String = DateTimeFormatter.ofPattern("yyMMdd");
+
+ public static SimpleDateFormat yyyyMM_format = new SimpleDateFormat("yyyy-MM");
@@ -615,6 +618,32 @@
return newTime;
}
+ public static boolean isValidDate(String str) {
+ boolean convertSuccess=true;
+ SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
+ try {
+ format.setLenient(false);
+ format.parse(str);
+ } catch (ParseException e) {
+ convertSuccess=false;
+ }
+ return convertSuccess;
+ }
+
+ public static Date toValidDate(String str) {
+ Date date = null;
+ SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
+ try {
+ format.setLenient(false);
+ date = format.parse(str);
+ } catch (ParseException e) {
+ log.error("党员导入日期格式错误");
+ date = new Date();
+ }
+ return date;
+ }
+
+
/**
* 将日期对象格式化成yyyy-MM-dd格式的字符串
*
@@ -684,7 +713,36 @@
return cal.getTime();
}
+ public static Date getDateM(Date start, int min) {
+ Calendar date1 = Calendar.getInstance();
+ date1.setTime(start);
+ date1.add(Calendar.MONTH, min);
+ return date1.getTime();
+ }
+ public static Date parseDateYM(String str) {
+ try {
+ return yyyyMM_format.parse(str);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
+ public static int getMonth(Date date){
+ Calendar instance = Calendar.getInstance();
+ instance.setTime(date);
+ return instance.get(Calendar.MONTH);
+ }
+
+ public static boolean before(Date start, Date end){
+ Calendar date1 = Calendar.getInstance();
+ date1.setTime(start);
+ Calendar date2 = Calendar.getInstance();
+ date2.setTime(end);
+ return date1.before(date2);
+ }
@@ -692,7 +750,6 @@
// Date date= new Date();
// Date after = new Date();
// System.out.println(calTimeDifference(date,after));
- System.out.println(getYearMonthStart(2021,2));
}
}
--
Gitblit v1.7.1