fix: new add api getDriverSchedulingInfo

guzijian
1 parent 777fd955
Showing 5 changed files with 28 additions and 8 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.java
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/resources/mapper/driver/DriverMapper.xml
@@ -68,4 +68,12 @@ public interface DriverMapper
     void saveDrivers(@Param("drivers") List<Driver> driverList);
     void saveDriverScheduling(@Param("responseSchedulings") List<ResponseScheduling> responseSchedulings);
+
+    /**
+     * 获取驾驶员排班信息
+     * @param date
+     * @param jobCode
+     * @return
+     */
+    List<ResponseScheduling> getDriverSchedulingList(@Param("date") String date,@Param("jobCode") String jobCode);
 }
 package com.ruoyi.driver.service.impl;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
@@ -105,8 +102,14 @@ public class DriverServiceImpl implements IDriverService {
     @Override
     public AjaxResult getDriverSchedulingInfo(String date, String jobCode) {
         List<ResponseScheduling> cacheMapValue = redisCache.getCacheMapValue(DRIVER_SCHEDULING_PRE + date, jobCode);
-        Boolean aBoolean = redisCache.redisTemplate.opsForHash().hasKey(DRIVER_SCHEDULING_PRE + date, jobCode);
-        return AjaxResult.success(redisCache.getCacheMapValue(DRIVER_SCHEDULING_PRE + date, jobCode));
+        // 优先从缓存中读取
+        if (cacheMapValue != null && cacheMapValue.size() > 0) {
+            return AjaxResult.success(redisCache.getCacheMapValue(DRIVER_SCHEDULING_PRE + date, jobCode));
+        }
+        // 数据库中读取所有接收到的排班信息
+        List<ResponseScheduling> responseSchedulings = driverMapper.getDriverSchedulingList(date, jobCode);
+        // 缓存中读取当天的排班信息
+        return AjaxResult.success(responseSchedulings);
     }
     @Override
@@ -212,6 +212,5 @@ public class DriverJob implements InitializingBean {
         DRIVER_SERVICE = driverService;
         REDIS_CACHE = redisCache;
         GET_SCHEDULING_INFO_URL = getSchedulingInfoUrl;
-
     }
 }
@@ -41,5 +41,5 @@ public class ResponseScheduling {
     private String adjustExps;
     private Boolean sflj;
     private String remarks;
-//    private List<CTasks> cTasks;
+    private List<CTasks> cTasks;
 }
 \ No newline at end of file
@@ -78,6 +78,16 @@
         <include refid="selectDriverVo"/>
         where id = #{id}
     </select>
+    <select id="getDriverSchedulingList" resultType="com.ruoyi.pojo.response.ResponseScheduling">
+        select id, scheduleDate, lineName, lineCode, lpName,
+               nbbm, job_code as jobCode,jsy, spy, upDown, qdzCode,
+               qdzName, zdzCode, zdzName, fcsjT, dfsjT,
+               zdsjT, fcsjActualTime, zdsjActualTime,
+               jhlc, jhlcOrig, bcsj, bcType, status, adjustExps,
+               sflj, remarks
+        from driver_scheduling
+        where scheduleDate = #{date} and job_code = #{jobCode}
+    </select>
     <insert id="insertDriver" parameterType="Driver" useGeneratedKeys="true" keyProperty="id">
         insert into driver