fix: 删除dateFormat注解

guzijian
1 parent 7d287e1b
Showing 5 changed files with 29 additions and 17 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ResponseScheduling.java
ruoyi-admin/src/main/java/com/ruoyi/utils/ConstDateUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -102,12 +102,12 @@ public class DriverServiceImpl implements IDriverService {
     @Override
     public AjaxResult getDriverSchedulingInfo(String schedulingDate, String jobCode) {
-//        String key = DRIVER_SCHEDULING_PRE + schedulingDate;
-//        List<ResponseScheduling> cacheMapValue = redisCache.getCacheMapValue(key , jobCode);
-//        // 优先从缓存中读取
-//        if (cacheMapValue != null && cacheMapValue.size() > 0) {
-//            return AjaxResult.success(cacheMapValue);
-//        }
+        String key = DRIVER_SCHEDULING_PRE + schedulingDate;
+        List<ResponseScheduling> cacheMapValue = redisCache.getCacheMapValue(key , jobCode);
+        // 优先从缓存中读取
+        if (cacheMapValue != null && cacheMapValue.size() > 0) {
+            return AjaxResult.success(cacheMapValue);
+        }
         // 数据库中读取所有接收到的排班信息
         List<ResponseScheduling> responseSchedulings = driverMapper.getDriverSchedulingList(schedulingDate, jobCode);
         // 缓存中读取当天的排班信息
@@ -125,7 +125,8 @@ public class DriverServiceImpl implements IDriverService {
     @Override
     public AjaxResult getDriverSchedulingAll() {
-        Set yyyyMMdd = redisCache.redisTemplate.opsForHash().keys(DateUtils.getDate("yyyyMMdd"));
-        return AjaxResult.success(yyyyMMdd);
+//        Set yyyyMMdd = redisCache.redisTemplate.opsForHash().keys(DateUtils.getDate("yyyyMMdd"));
+//        return AjaxResult.success(yyyyMMdd);
+        return AjaxResult.success();
     }
 }
@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.service.IDriverService;
 import com.ruoyi.pojo.response.ResponseScheduling;
+import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.ListUtils;
 import org.apache.commons.math3.distribution.RealDistribution;
 import org.springframework.beans.factory.InitializingBean;
@@ -73,7 +74,7 @@ public class DriverJob implements InitializingBean {
             // 获取驾驶员信息
             List<Driver> drivers = getDrivers(getDriverInfoUrl, String.valueOf(timestamp));
             // 格式化请求
-            String getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", DateUtils.getDate("yyyyMMdd"), timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
+            String getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", ConstDateUtil.formatDate("yyyyMMdd"), timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
             // 获取排班信息并存入redis
             saveSchedulingToRedis(getSchedulingInfoUrl, drivers);
             // 分片插入
@@ -115,7 +116,7 @@ public class DriverJob implements InitializingBean {
         // 存入数据库
         DRIVER_SERVICE.saveDriverScheduling(driverSchedulingMap);
         // 存入redis
-        REDIS_CACHE.setCacheMap(DRIVER_SCHEDULING_PRE + DateUtils.getDate("yyyyMMdd"), driverSchedulingMap, 1, TimeUnit.DAYS);
+        REDIS_CACHE.setCacheMap(DRIVER_SCHEDULING_PRE + ConstDateUtil.formatDate("yyyyMMdd"), driverSchedulingMap, 1, TimeUnit.DAYS);
     }
     private static List<Driver> getDrivers(String format, String timestamp) throws Exception {
 package com.ruoyi.pojo.response;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -17,8 +16,7 @@ import java.util.List;
 public class ResponseScheduling {
     private Long id;
-    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date scheduleDate;
     private String lineName;
     private String lineCode;
+package com.ruoyi.utils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class ConstDateUtil {
+    public static String formatDate(String str){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(str);
+        return simpleDateFormat.format(new Date());
+    }
+
+    public static void main(String[] args) {
+        String formatDate = formatDate("yyyyMMdd");
+        System.out.println(formatDate);
+    }
+}
@@ -53,10 +53,6 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return dateTimeNow(YYYY_MM_DD);
     }
-    public static String getDate(String format)
-    {
-        return dateTimeNow(format);
-    }
     public static final String getTime()
     {