Commit 36d4fa41 authored by 董建华's avatar 董建华

优化时间工具类

parent 8b15fb9f
......@@ -599,7 +599,7 @@ public class IReportServiceImpl implements ReportService {
Map<String, String> param = new HashMap<>();
param.put("startDate", DateUtil.getCurrentDay(-1, DateUtil.YYYY_MM_DD));
param.put("endDate", DateUtil.getCurrentDay(0, DateUtil.YYYY_MM_DD));
log.info("开始上报月逾期数据");
log.info("开始上报月逾期数据param:{}",param);
List<Map<String, Object>> overMonthData = dataMapper.getOverMonthData(param);
if (overMonthData == null || overMonthData.size() == 0) {
return;
......
......@@ -28,14 +28,10 @@ public class DateUtil {
public static final String YYYYMM = "yyyyMM";
public static String getCurrentDay(int day) {
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_MONTH, day);
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
return new SimpleDateFormat(YYYY_MM_DD_MM_HH_SS).format(calendar.getTime());
return getCurrentDay(day, YYYY_MM_DD_MM_HH_SS);
}
public static String getCurrentDay(int day,String pattner) {
public static String getCurrentDay(int day, String pattner) {
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_MONTH, day);
calendar.set(Calendar.HOUR_OF_DAY, 0);
......@@ -43,26 +39,16 @@ public class DateUtil {
calendar.set(Calendar.SECOND, 0);
return new SimpleDateFormat(pattner).format(calendar.getTime());
}
public static String getCurrentDay(String date, int day) {
Date time = null;
try {
time = new SimpleDateFormat(YYYY_MM_DD_MM_HH_SS).parse(date);
}catch (Exception e){
e.printStackTrace();
}
Calendar calendar = Calendar.getInstance();
calendar.setTime(time);
calendar.add(Calendar.DAY_OF_MONTH, day);
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
return new SimpleDateFormat(YYYY_MM_DD_MM_HH_SS).format(calendar.getTime());
return getCurrentDay(date, day, YYYY_MM_DD_MM_HH_SS, YYYY_MM_DD_MM_HH_SS);
}
public static String getCurrentDay(String date, int day,String inPartner,String outPartner) {
public static String getCurrentDay(String date, int day, String inPartner, String outPartner) {
Date time = null;
try {
time = new SimpleDateFormat(inPartner).parse(date);
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
Calendar calendar = Calendar.getInstance();
......@@ -73,17 +59,26 @@ public class DateUtil {
calendar.set(Calendar.SECOND, 0);
return new SimpleDateFormat(outPartner).format(calendar.getTime());
}
public static String getCurrentMonth(String date, int month,String inPartner,String outPartner) {
/**
*
* @param date 时间
* @param month 月份
* @param inPartner 入参时间格式
* @param outPartner 出参时间格式
* @return
*/
public static String getCurrentMonth(String date, int month, String inPartner, String outPartner) {
Date time = null;
try {
time = new SimpleDateFormat(inPartner).parse(date);
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
Calendar calendar = Calendar.getInstance();
calendar.setTime(time);
calendar.add(Calendar.MONTH, month);
calendar.set(Calendar.DAY_OF_MONTH,1);
calendar.set(Calendar.DAY_OF_MONTH, 1);
return new SimpleDateFormat(outPartner).format(calendar.getTime());
}
......@@ -130,17 +125,18 @@ public class DateUtil {
public static String formatterDate(Object date, String pattern) {
SimpleDateFormat dateFormat = new SimpleDateFormat(pattern);
if(date instanceof Date){
if (date instanceof Date) {
return dateFormat.format(date);
}else {
} else {
return date.toString();
}
}
public static String formatterDate(String date, String oldPattern, String newPattern) {
SimpleDateFormat dateFormat = new SimpleDateFormat(oldPattern);
try {
SimpleDateFormat dateFormatNew = new SimpleDateFormat(newPattern);
return dateFormatNew.format(dateFormat.parse(date));
return dateFormatNew.format(dateFormat.parse(date));
} catch (ParseException e) {
e.printStackTrace();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment