From 28d2f345a7baf5fd1c54435f4d512d271d18bd10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=80=E5=90=96=E5=91=80=E5=90=96=E5=91=80?= <1246144261@qq.com> Date: Mon, 17 Jul 2023 06:59:50 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B0=86dto=E4=B8=AD=E7=9A=84type=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E6=97=B6=E9=97=B4=E7=9A=84=E9=AA=9A=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 呀吖呀吖呀 <1246144261@qq.com> --- Java/TimeConversion.java | 98 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 Java/TimeConversion.java diff --git a/Java/TimeConversion.java b/Java/TimeConversion.java new file mode 100644 index 0000000..571566d --- /dev/null +++ b/Java/TimeConversion.java @@ -0,0 +1,98 @@ +package com.xz.unity.busi.user.controller; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; + +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +public class TimeConversion { + + private void convertTypeToTime(UserCourseUsageDetailParamDto userCourseUsageDetailParamDto, int type, String startTime, String endTime) { + try { + DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + if(type ==6){ + DateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd"); + Calendar cal = Calendar.getInstance(); + if(!StringUtils.isEmpty(startTime)){ + cal.setTime(dateFormat1.parse(startTime)); + userCourseUsageDetailParamDto.setStartDate(dateFormat.format(cal.getTime())); + } + if(!StringUtils.isEmpty(endTime)){ + userCourseUsageDetailParamDto.setEndDate(dateFormat.format(dateFormat1.parse(endTime))); + } + }else { + Map dateMap = getDateByType(type); + userCourseUsageDetailParamDto.setStartDate(dateMap.get("startDate")); + userCourseUsageDetailParamDto.setEndDate(dateMap.get("endDate")); + } + } catch (ParseException e) { + DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + Date startDate = new Date(); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(startDate); + String startStr = null , endStr = null; + endStr=dateFormat.format(startDate); + calendar.add(Calendar.YEAR, 0); + calendar.set(Calendar.DAY_OF_YEAR, 1); + startStr = dateFormat.format(calendar.getTime()); + userCourseUsageDetailParamDto.setStartDate(startStr); + userCourseUsageDetailParamDto.setEndDate(endStr); + } + } + + private Map getDateByType(int type){ + Map seDate = new HashMap<>(); + DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + Date startDate = new Date(); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(startDate); + String startStr = null , endStr = null; + if(type==0){ + endStr=dateFormat.format(startDate); + calendar.add(Calendar.DATE,-1); + startStr = dateFormat.format(calendar.getTime()); + }else if(type==1){ + endStr=dateFormat.format(startDate); + calendar.add(Calendar.DATE,-7); + startStr = dateFormat.format(calendar.getTime()); + }else if(type==2){ + endStr=dateFormat.format(startDate); + calendar.add(Calendar.DATE,-30); + startStr = dateFormat.format(calendar.getTime()); + }else if(type==3){ + endStr=dateFormat.format(startDate); + calendar.add(Calendar.MONTH, 0); + calendar.set(Calendar.DAY_OF_MONTH, 1); + startStr = dateFormat.format(calendar.getTime()); + }else if(type==4){ + DateFormat dateFormat1 = new SimpleDateFormat("MM-dd"); + DateFormat dateFormat2 = new SimpleDateFormat("yyyy"); + endStr=dateFormat.format(startDate); + String newStr = dateFormat1.format(startDate); + if(Integer.valueOf(newStr)>=201 && Integer.valueOf(newStr) <= 813){ + startStr = dateFormat2.format(startDate)+"0201"; + }else { + if(Integer.valueOf(newStr)>=101){ + startStr = (Integer.valueOf(dateFormat2.format(startDate))-1)+"0814"; + }else { + startStr = dateFormat2.format(startDate)+"0814"; + } + } + }else if(type==5){ + endStr=dateFormat.format(startDate); + calendar.add(Calendar.YEAR, 0); + calendar.set(Calendar.DAY_OF_YEAR, 1); + startStr = dateFormat.format(calendar.getTime()); + } + seDate.put("startDate",startStr); + seDate.put("endDate",endStr); + return seDate; + } +} -- Gitee From f92453a92954c1c5824c1d06b53fd1a0c50180e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=80=E5=90=96=E5=91=80=E5=90=96=E5=91=80?= <1246144261@qq.com> Date: Mon, 17 Jul 2023 07:00:18 +0000 Subject: [PATCH 2/3] update Java/TimeConversion.java. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 呀吖呀吖呀 <1246144261@qq.com> --- Java/TimeConversion.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Java/TimeConversion.java b/Java/TimeConversion.java index 571566d..bf06de8 100644 --- a/Java/TimeConversion.java +++ b/Java/TimeConversion.java @@ -1,7 +1,4 @@ -package com.xz.unity.busi.user.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; + import org.apache.commons.lang3.StringUtils; import java.text.DateFormat; -- Gitee From 21a1ab2a1552221d162488775803c89023d905c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=80=E5=90=96=E5=91=80=E5=90=96=E5=91=80?= <1246144261@qq.com> Date: Mon, 17 Jul 2023 07:01:29 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=86dto=E4=B8=AD=E7=9A=84type=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E6=97=B6=E9=97=B4=E7=9A=84=E9=AA=9A=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 呀吖呀吖呀 <1246144261@qq.com> --- Java/TimeConversion.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Java/TimeConversion.java b/Java/TimeConversion.java index bf06de8..bde026c 100644 --- a/Java/TimeConversion.java +++ b/Java/TimeConversion.java @@ -1,4 +1,3 @@ - import org.apache.commons.lang3.StringUtils; import java.text.DateFormat; -- Gitee