fix. 更改时间解析工具

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDeviceDeliveryServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qmth.sop.business.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -28,7 +29,6 @@ import com.qmth.sop.common.util.GsonUtil;
 import com.qmth.sop.common.util.ServletUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -1158,12 +1158,12 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
 
         Long dbDeliveryTime = e.getDeliverTime();
         e.setDeliverTimeStr(dbDeliveryTime != null && dbDeliveryTime > 0 ?
-                DateFormatUtils.format(dbDeliveryTime, SystemConstant.DEFAULT_DATE_PATTERN) :
+                DateUtil.format(new Date(dbDeliveryTime), SystemConstant.DEFAULT_DATE_PATTERN) :
                 "--");
 
         Long dbReceiveTime = e.getReceiveTime();
         e.setReceiveTimeStr(dbReceiveTime != null && dbReceiveTime > 0 ?
-                DateFormatUtils.format(dbReceiveTime, SystemConstant.DEFAULT_DATE_PATTERN) :
+                DateUtil.format(new Date(dbReceiveTime), SystemConstant.DEFAULT_DATE_PATTERN) :
                 "--");
 
         String path = e.getExpressPhotoPath();

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingApplyServiceImpl.java

@@ -24,7 +24,6 @@ import org.activiti.engine.TaskService;
 import org.activiti.engine.task.IdentityLink;
 import org.activiti.engine.task.Task;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -382,9 +381,9 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
                             sysUser.getId(), null);
                 }
                 tbDing.setSignDate(
-                        DateFormatUtils.format(tbDingApply.getApplyTime(), SystemConstant.DEFAULT_DATE_DAY_PATTERN));
+                        DateUtil.format(new Date(tbDingApply.getApplyTime()), SystemConstant.DEFAULT_DATE_DAY_PATTERN));
                 tbDing.setSignYear(
-                        DateFormatUtils.format(tbDingApply.getApplyTime(), SystemConstant.DEFAULT_DATE_YEAR_PATTERN));
+                        DateUtil.format(new Date(tbDingApply.getApplyTime()), SystemConstant.DEFAULT_DATE_YEAR_PATTERN));
                 if (tbDingApply.getType() == InOutTypeEnum.IN) {
                     tbDing.setSignInTime(tbDingApply.getApplyTime());
                     tbDing.setSignInAddress("(补卡)");

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qmth.sop.business.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -22,7 +23,6 @@ import com.qmth.sop.common.util.FileStoreUtil;
 import com.qmth.sop.common.util.FileUtil;
 import com.qmth.sop.common.util.ServletUtil;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -102,7 +102,7 @@ public class TBDingServiceImpl extends ServiceImpl<TBDingMapper, TBDing> impleme
         DingElementResult dingElementResult = this.findDingRule(userId, serviceId);
         if (Objects.nonNull(dingElementResult)) {
             Long userArchivesId = dingElementResult.getUserArchivesId();
-            String currentDayStr = DateFormatUtils.format(System.currentTimeMillis(), SystemConstant.DEFAULT_DATE_DAY_PATTERN);
+            String currentDayStr = DateUtil.format(new Date(System.currentTimeMillis()), SystemConstant.DEFAULT_DATE_DAY_PATTERN);
             QueryWrapper<TBDing> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(TBDing::getServiceId, serviceId).eq(TBDing::getUserArchivesId, userArchivesId).eq(TBDing::getSignDate, currentDayStr);
             if (SystemConstant.strNotNull(sopNo)) {
@@ -279,7 +279,7 @@ public class TBDingServiceImpl extends ServiceImpl<TBDingMapper, TBDing> impleme
                 // 当天补卡中的记录
                 List<TBDingApply> applyRecordList = resigningList.stream().filter(e -> {
                     Long applyTime = e.getApplyTime();
-                    String applyTimeStr = DateFormatUtils.format(applyTime, SystemConstant.DEFAULT_DATE_YMD_S_PATTERN);
+                    String applyTimeStr = DateUtil.format(new Date(applyTime), SystemConstant.DEFAULT_DATE_YMD_S_PATTERN);
                     String applyYear = applyTimeStr.substring(0, yearEnd);
                     String applyDay = applyTimeStr.substring(dayStart);
                     return year.equals(applyYear) && signDate.equals(applyDay);
@@ -345,8 +345,8 @@ public class TBDingServiceImpl extends ServiceImpl<TBDingMapper, TBDing> impleme
             Long endTime = dingTimeDto.getEndTime();
             if (signTime < startTime || signTime > endTime) {
                 throw ExceptionResultEnum.ERROR.exception(
-                        String.format("区域协调人请在%s - %s打卡", DateFormatUtils.format(startTime, "yyyy/MM/dd"),
-                                DateFormatUtils.format(endTime, "yyyy/MM/dd")));
+                        String.format("区域协调人请在%s - %s打卡", DateUtil.format(new Date(startTime), "yyyy/MM/dd"),
+                                DateUtil.format(new Date(endTime), "yyyy/MM/dd")));
             }
         }
 
@@ -390,9 +390,9 @@ public class TBDingServiceImpl extends ServiceImpl<TBDingMapper, TBDing> impleme
             facePass = score.compareTo(limit) > -1;
         }
 
-        String signDate = DateFormatUtils.format(signTime, SystemConstant.DEFAULT_DATE_DAY_PATTERN);
-        String signYear = DateFormatUtils.format(signTime, SystemConstant.DEFAULT_DATE_YEAR_PATTERN);
-        String currentDayStr = DateFormatUtils.format(System.currentTimeMillis(), SystemConstant.DEFAULT_DATE_DAY_PATTERN);
+        String signDate = DateUtil.format(new Date(signTime), SystemConstant.DEFAULT_DATE_DAY_PATTERN);
+        String signYear = DateUtil.format(new Date(signTime), SystemConstant.DEFAULT_DATE_YEAR_PATTERN);
+        String currentDayStr = DateUtil.format(new Date(System.currentTimeMillis()), SystemConstant.DEFAULT_DATE_DAY_PATTERN);
         if (!currentDayStr.equals(signDate)) {
             throw ExceptionResultEnum.ERROR.exception("打卡失败，时间异常");
         }

sop-common/src/main/java/com/qmth/sop/common/util/DateDisposeUtils.java

@@ -1,7 +1,7 @@
 package com.qmth.sop.common.util;
 
+import cn.hutool.core.date.DateUtil;
 import com.qmth.sop.common.contant.SystemConstant;
-import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 
 import java.lang.management.ManagementFactory;
@@ -88,7 +88,7 @@ public class DateDisposeUtils extends DateUtils {
      */
     public static final String datePath() {
         Date now = new Date();
-        return DateFormatUtils.format(now, "yyyy/MM/dd");
+        return DateUtil.format(now, "yyyy/MM/dd");
     }
 
     /**
@@ -96,7 +96,7 @@ public class DateDisposeUtils extends DateUtils {
      */
     public static final String dateTime() {
         Date now = new Date();
-        return DateFormatUtils.format(now, "yyyyMMdd");
+        return DateUtil.format(now, "yyyyMMdd");
     }
 
     /**