fix: change get data step

guzijian
1 parent f453fa53
Showing 4 changed files with 37 additions and 12 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
@@ -42,13 +42,23 @@ public class DriverController extends BaseController {
     /**
      * 获取驾驶员排班信息
      */
-    @GetMapping("/{date}/{jobCode}")
+    @GetMapping("/{schedulingDate}/{jobCode}")
     @ApiOperation("获取驾驶员排班信息")
-    public AjaxResult getDriverSchedulingInfo(@ApiParam(name = "date",value = "yyyyMMdd") @PathVariable("date") String date, @PathVariable("jobCode") String jobCode) {
-        return driverService.getDriverSchedulingInfo(date,jobCode);
+    public AjaxResult getDriverSchedulingInfo(@ApiParam(name = "date",value = "yyyyMMdd",type = "String") @PathVariable("schedulingDate") String schedulingDate, @PathVariable("jobCode") String jobCode) {
+        return driverService.getDriverSchedulingInfo(schedulingDate,jobCode);
     }
     /**
+     * 获取当前所有有班次信息的工号集合
+     */
+    @GetMapping("/getDriverSchedulingAll")
+    @ApiOperation("获取当前所有有班次信息的工号集合")
+    public AjaxResult getDriverSchedulingAll(){
+        return driverService.getDriverSchedulingAll();
+    }
+
+
+    /**
      * 查询驾驶员信息列表
      */
 //    @PreAuthorize("@ss.hasPermi('driver:driver:list')")
@@ -69,7 +69,10 @@ public interface IDriverService
      */
     void insertDrivers(List<Driver> driverList);
-    AjaxResult getDriverSchedulingInfo(String date,String jobCode);
+    AjaxResult getDriverSchedulingInfo(String schedulingDate,String jobCode);
     void saveDriverScheduling(Map<String, List<ResponseScheduling>> driverSchedulingMap);
+
+    AjaxResult getDriverSchedulingAll();
+
 }
@@ -4,6 +4,7 @@ import java.util.*;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.pojo.response.ResponseScheduling;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -100,14 +101,15 @@ public class DriverServiceImpl implements IDriverService {
     }
     @Override
-    public AjaxResult getDriverSchedulingInfo(String date, String jobCode) {
-        List<ResponseScheduling> cacheMapValue = redisCache.getCacheMapValue(DRIVER_SCHEDULING_PRE + date, jobCode);
-        // 优先从缓存中读取
-        if (cacheMapValue != null && cacheMapValue.size() > 0) {
-            return AjaxResult.success(cacheMapValue);
-        }
+    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);
+//        }
         // 数据库中读取所有接收到的排班信息
-        List<ResponseScheduling> responseSchedulings = driverMapper.getDriverSchedulingList(date, jobCode);
+        List<ResponseScheduling> responseSchedulings = driverMapper.getDriverSchedulingList(schedulingDate, jobCode);
         // 缓存中读取当天的排班信息
         return AjaxResult.success(responseSchedulings);
     }
@@ -120,4 +122,10 @@ public class DriverServiceImpl implements IDriverService {
         }
     }
+
+    @Override
+    public AjaxResult getDriverSchedulingAll() {
+        Set yyyyMMdd = redisCache.redisTemplate.opsForHash().keys(DateUtils.getDate("yyyyMMdd"));
+        return AjaxResult.success(yyyyMMdd);
+    }
 }
@@ -19,6 +19,7 @@ import javax.annotation.Resource;
 import java.security.MessageDigest;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 import static com.ruoyi.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
@@ -131,7 +132,10 @@ public class DriverJob implements InitializingBean {
                 HttpMethod.GET,
                 null,
                 new ParameterizedTypeReference<List<Driver>>() {
-                }).getBody();
+                }).getBody().stream().map(item ->{
+                    item.setJobCode(item.getJobCode().split("-")[1]);
+                    return item;
+                }).collect(Collectors.toList());
         return drivers;
     }