优化首页功能

liujun001
1 parent 8005ae85
Showing 10 changed files with 331 additions and 79 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/in/domain/SignInV1.java
Bsth-admin/src/main/java/com/ruoyi/pojo/vo/bigViewVo/FleetState.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/service/SchedulingServiceV1.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/service/impl/SchedulingServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/service/BigViewServiceV1.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceV1Impl.java
Bsth-admin/src/main/resources/mapper/driver/DriverMapper.xml
 package com.ruoyi.driver.mapper;
-import java.util.List;
-import java.util.Set;
-
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.pojo.request.DriverRequestVo;
-import com.ruoyi.pojo.response.DriverResponseVo;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
 import com.ruoyi.pojo.vo.PeopleResponseVo;
 import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
 /**
  * 驾驶员信息Mapper接口
  * 
@@ -26,6 +24,8 @@ public interface DriverMapper
      */
     public Driver selectDriverById(Long id);
+     Driver selectDriverByJobCode(String jobCode);
+
     /**
      * 查询驾驶员信息列表
      * 
 package com.ruoyi.driver.service;
-import java.io.IOException;
-import java.util.List;
-
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.file.InvalidExtensionException;
 import com.ruoyi.common.global.Result;
@@ -15,6 +12,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 /**
  * 驾驶员信息Service接口
@@ -32,6 +31,8 @@ public interface IDriverService
      */
     public Driver selectDriverById(Long id);
+    Driver selectDriverByJobCode(String jobCode);
+
     /**
      * 查询驾驶员信息列表
      * 
 package com.ruoyi.driver.service.impl;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Paths;
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.*;
-import java.util.stream.Collectors;
-
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.http.HttpUtil;
 import com.github.pagehelper.util.StringUtil;
@@ -25,12 +16,15 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
+import com.ruoyi.domain.DriverScheduling;
+import com.ruoyi.domain.EquipmentDriverExpand;
+import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.driver.mapper.DriverMapper;
+import com.ruoyi.driver.service.IDriverService;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.job.DriverJob;
 import com.ruoyi.pojo.DriverSignInRecommendation;
-import com.ruoyi.domain.EquipmentDriverExpand;
-import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.pojo.request.DriverRequestVo;
 import com.ruoyi.pojo.request.DriverSignInRequestVo;
 import com.ruoyi.pojo.request.FaceUpdateReqVo;
@@ -52,15 +46,20 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import com.ruoyi.driver.mapper.DriverMapper;
-import com.ruoyi.driver.domain.Driver;
-import com.ruoyi.driver.service.IDriverService;
 import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Paths;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.stream.Collectors;
 import static com.ruoyi.common.ApiProperties.PERSONNEL_API_KEY;
 import static com.ruoyi.common.ConstDriverProperties.*;
@@ -133,6 +132,11 @@ public class DriverServiceImpl implements IDriverService {
         return driverMapper.selectDriverById(id);
     }
+    @Override
+    public Driver selectDriverByJobCode(String jobCode) {
+        return driverMapper.selectDriverByJobCode(jobCode);
+    }
+
     /**
      * 查询驾驶员信息列表
      *
@@ -128,6 +128,8 @@ public class SignInV1 {
     private String siteName;
     @TableField(exist = false)
     private String address;
+    @TableField(exist = false)
+    private Integer signStatus;
     @Override
     public String toString() {
@@ -10,6 +10,7 @@ import lombok.Data;
 public class FleetState {
     private String lineName;
     private Integer state;
+    private String fleetName;
     @Override
     public String toString() {
@@ -9,4 +9,6 @@ import java.util.List;
 public interface SchedulingServiceV1 extends IService<DriverSchedulingV1> {
     List<DriverSchedulingV1> queryByJobCodeAndSchedulingDate(String jobCode, Date date);
+
+    List<DriverSchedulingV1>  queryByNbbmAndDate(String nbbm, Date date);
 }
@@ -20,4 +20,12 @@ public class SchedulingServiceV1Impl extends ServiceImpl&lt;SchedulingMapperV1, Dri
         wrapper.orderByAsc(DriverSchedulingV1::getFcsjT);
         return list(wrapper);
     }
+
+    @Override
+    public List<DriverSchedulingV1> queryByNbbmAndDate(String nbbm, Date date) {
+        LambdaQueryWrapper<DriverSchedulingV1> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(DriverSchedulingV1::getNbbm, nbbm).eq(DriverSchedulingV1::getScheduleDate, date);
+      
+        return list(wrapper);
+    }
 }
@@ -11,13 +11,13 @@ import java.util.Date;
 public interface BigViewServiceV1 {
-    void asyncRefreshRedisValue(SignIn signIn, Driver driver, DriverScheduling driverScheduling,String dateStr) throws InterruptedException;
+    void asyncRefreshRedisValue(SignIn signIn, Driver driver, DriverScheduling driverScheduling,String dateStr, Date date) throws InterruptedException;
     AjaxResult queryBigViewQueryLineInfo(Date date);
-    LineInfo.PersonInfoVo refreshRedisDriver(SignIn signIn, Driver driver);
+    LineInfo refreshRedisDriver(SignIn signIn, Driver driver, String dateStr, DriverScheduling driverScheduling, Date date);
-    FleetState refreshRedisLine(SignIn signIn, DriverScheduling driverScheduling) throws InterruptedException;
+    FleetState refreshRedisLine(SignIn signIn, DriverScheduling driverScheduling, String dateStr) throws InterruptedException;
     /***
      * 判断酒测次数
@@ -69,4 +69,14 @@ public interface BigViewServiceV1 {
      * @return boolean
      */
     boolean isSignStatusZoneEnum(SignIn signIn);
+    /***
+     *  是否是驾驶员
+     * @author liujun
+     * @date 2024/10/9 13:53
+     *
+     * @param driver
+     * @return boolean
+     */
+    boolean isDriver(Driver driver);
+
 }
@@ -4,13 +4,18 @@ import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.SignStatusEnum;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.domain.DriverScheduling;
+import com.ruoyi.domain.DriverSchedulingV1;
 import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.driver.service.IDriverService;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.domain.SignInV1;
+import com.ruoyi.in.service.SignInServiceV1;
 import com.ruoyi.pojo.vo.bigViewVo.FleetInfoVo;
 import com.ruoyi.pojo.vo.bigViewVo.FleetState;
 import com.ruoyi.pojo.vo.bigViewVo.LineInfo;
+import com.ruoyi.scheduling.service.SchedulingServiceV1;
 import com.ruoyi.service.BigViewServiceV1;
 import com.ruoyi.template.domain.FleetLineTemplate;
 import com.ruoyi.template.service.IFleetLineTemplateService;
@@ -43,75 +48,105 @@ public class BigViewServiceV1Impl implements BigViewServiceV1 {
     @Autowired
     private IFleetLineTemplateService fleetLineTemplateService;
     @Autowired
+    private SchedulingServiceV1 schedulingServiceV1;
+    @Autowired
+    private IDriverService driverService;
+    @Autowired
+    private SignInServiceV1 signInServiceV1;
+
+    @Autowired
     private RedisCache redisCache;
-    private static final String DRIVER_SIGN_KEY = "sign:driver:{0}:{1}";
-    private static final String LINE_SIGN_KEY = "sign:line:{0}:{1}";
+    private static final String LINE_SIGN_NBBM_KEY = "sign:report:nbbm:{0}:{1}";
+    private static final String LINE_SIGN_NBBM_LOCK_KEY = "sign:report:lock:nbbm:{0}:{1}";
-    private static final String LOCK_LINE_SIGN_KEY = "sign:lock:{0}:{1}";
+    private static final String LINE_SIGN_STATUS_KEY = "sign:report:status:{0}:{1}";
+    private static final String LINE_SIGN_STATUS_LOCK_KEY = "sign:report:lock:status:{0}:{1}";
-    private static final String SIGN_REPORT_LIST = "sign:report:list:{0}";
+    private static final String LINE_SIGN_REPORT_FLEET_KEY = "sign:report:fleet:{0}";
+
+    private static final String BIG_VIEW_LINE_KEY = "big:view:line:{0}";
-    @Override
-    public void asyncRefreshRedisValue(SignIn signIn, Driver driver, DriverScheduling driverScheduling, String dateStr) throws InterruptedException {
-        String key = MessageFormat.format(SIGN_REPORT_LIST, dateStr);
-        refreshRedisDriver(signIn, driver);
-        refreshRedisLine(signIn, driverScheduling);
+    @Override
+    public void asyncRefreshRedisValue(SignIn signIn, Driver driver, DriverScheduling driverScheduling, String dateStr, Date date) throws InterruptedException {
+        refreshRedisDriver(signIn, driver, dateStr, driverScheduling, date);
+        refreshRedisLine(signIn, driverScheduling, dateStr);
     }
     @Override
     public AjaxResult queryBigViewQueryLineInfo(Date date) {
-        return null;
+        String dateStr = DateUtils.FAST_YYYY_MM_DD.format(date);
+        String key = MessageFormat.format(BIG_VIEW_LINE_KEY, dateStr);
+
+        List<FleetInfoVo> fleetInfoVos = getFleetInfoVoBtRedis(key);
+        if (CollectionUtils.isEmpty(fleetInfoVos)) {
+            fleetInfoVos = combationFleetInfoVoBtRedis(key, dateStr);
+        }
+
+        return AjaxResult.success(fleetInfoVos);
     }
     @Override
-    public LineInfo.PersonInfoVo refreshRedisDriver(SignIn signIn, Driver driver) {
-        LineInfo.PersonInfoVo personInfoVo = new LineInfo.PersonInfoVo();
-        personInfoVo.setName(driver.getPersonnelName());
+    public LineInfo refreshRedisDriver(SignIn signIn, Driver driver, String dateStr, DriverScheduling driverScheduling, Date date) {
+        LineInfo.PersonInfoVo personInfoVo = combationPersonInfoVo(driver, signIn);
-        if (isSignStatusZoneEnum(signIn)) {
-            personInfoVo.setSignStatus(SignStatusEnum.SIGN_STATUS_ZONE_ENUM);
-        } else if (isSignStatusWineEnum(signIn)) {
-            personInfoVo.setSignStatus(SignStatusEnum.SIGN_STATUS_WINE_ENUM);
-        } else if (isSignStatusDelayEnum(signIn)) {
-            personInfoVo.setSignStatus(SignStatusEnum.SIGN_STATUS_DELAY_ENUM);
-        }
-        personInfoVo.setPosts(driver.getPosts());
+        LineInfo lineInfo = null;
+        String key = MessageFormat.format(LINE_SIGN_NBBM_KEY, dateStr, driverScheduling.getNbbm());
-        String dateStr = ConstDateUtil.formatDate(signIn.getCreateTime());
+        for (int i = 0; i < 1000; i++) {
+            String lockKey = MessageFormat.format(LINE_SIGN_NBBM_LOCK_KEY, dateStr, driverScheduling.getNbbm());
+            if (redisCache.setNx(lockKey, 1, 10L, TimeUnit.SECONDS)) {
-        String key = MessageFormat.format(DRIVER_SIGN_KEY, dateStr, driver.getJobCode());
-        redisCache.setCacheObject(key, JSON.toJSONString(personInfoVo), 25, TimeUnit.HOURS);
+                try {
+                    lineInfo = getLineInfoByRedis(key);
+                    if (Objects.isNull(lineInfo)) {
+                        lineInfo = queryLineInfo(date, signIn, driverScheduling);
+                    }
-        return personInfoVo;
+                    if (Objects.isNull(lineInfo)) {
+                        return null;
+                    }
+
+                    setDriverByPost(driver, lineInfo, personInfoVo);
+                    redisCache.setCacheObject(key, JSON.toJSONString(lineInfo), 25, TimeUnit.HOURS);
+                    return lineInfo;
+                } finally {
+                    redisCache.deleteObject(lockKey);
+                }
+
+            }
+
+            try {
+                log.info("没有获取到redis锁，等待1秒钟后再试");
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                log.error("刷新redis中首页的driver数据异常，[{}],[{}],[{}]", signIn, driver, driverScheduling, e);
+            }
+        }
+        log.info("已1000秒获取锁等待没有获取到锁，已放弃操作，[{}],[{}],[{}]", signIn, driver, driverScheduling);
+        return lineInfo;
     }
     @Override
-    public FleetState refreshRedisLine(SignIn signIn, DriverScheduling driverScheduling) throws InterruptedException {
-        String dateStr = ConstDateUtil.formatDate(signIn.getCreateTime());
-        String key = MessageFormat.format(LINE_SIGN_KEY, dateStr, driverScheduling.getLineName());
-        FleetState source = redisCache.getCacheObject(key);
+    public FleetState refreshRedisLine(SignIn signIn, DriverScheduling driverScheduling, String dateStr) throws InterruptedException {
         FleetState fleetState = new FleetState();
         fleetState.setLineName(driverScheduling.getLineName());
+        fleetState.setState(switchSignStatus(signIn));
+        fleetState.setFleetName(driverScheduling.getFleetName());
-        if (isSignStatusWineEnum(signIn)) {
-            fleetState.setState(SignStatusEnum.SIGN_STATUS_WINE_ENUM.getStatus());
-        } else if (isSignStatusDelayEnum(signIn)) {
-            fleetState.setState(SignStatusEnum.SIGN_STATUS_DELAY_ENUM.getStatus());
-        } else {
-            fleetState.setState(SignStatusEnum.SIGN_STATUS_ZONE_ENUM.getStatus());
-        }
+        String key = MessageFormat.format(LINE_SIGN_STATUS_KEY, dateStr, driverScheduling.getLineName());
+        FleetState source = redisCache.getCacheObject(key);
         if (Objects.isNull(source) || Objects.isNull(source.getState()) || (fleetState.getState() > source.getState())) {
             boolean flag = true;
-            String lockKey = MessageFormat.format(LOCK_LINE_SIGN_KEY, dateStr, driverScheduling.getLineName());
+            String lockKey = MessageFormat.format(LINE_SIGN_STATUS_LOCK_KEY, dateStr, driverScheduling.getLineName());
             for (int i = 0; i < 10000; i++) {
-                if (redisCache.setNx(lockKey, fleetState, 10L, TimeUnit.SECONDS)) {
+                if (redisCache.setNx(lockKey, 1, 10L, TimeUnit.SECONDS)) {
                     try {
                         redisCache.setCacheObject(key, JSON.toJSONString(fleetState), 25, TimeUnit.HOURS);
                     } finally {
@@ -160,42 +195,43 @@ public class BigViewServiceV1Impl implements BigViewServiceV1 {
     @Override
     public boolean isSignStatusWineEnum(SignIn signIn) {
-        return Objects.equals(3, signIn.getExType()) || Objects.equals(23, signIn.getExType()) || Objects.equals(33, signIn.getExType());
+        return Objects.nonNull(signIn) && (Objects.equals(3, signIn.getExType()) || Objects.equals(23, signIn.getExType()) || Objects.equals(33, signIn.getExType()));
     }
     @Override
     public boolean isSignStatusDelayEnum(SignIn signIn) {
-        return Objects.nonNull(signIn.getExType()) && signIn.getExType() >= 30 && signIn.getExType() < 40;
+        return Objects.nonNull(signIn) && Objects.nonNull(signIn.getExType()) && signIn.getExType() >= 30 && signIn.getExType() < 40;
     }
     @Override
     public boolean isSignStatusZoneEnum(SignIn signIn) {
-        return Objects.equals(0, signIn.getExType());
+        return Objects.nonNull(signIn) && Objects.equals(0, signIn.getExType());
+    }
+
+    @Override
+    public boolean isDriver(Driver driver) {
+        return Objects.nonNull(driver) && StringUtils.isNotEmpty(driver.getPosts()) && StringUtils.indexOf(driver.getPosts(), "驾驶员") > -1;
     }
-    private boolean chooseRedisData(String key, SignIn signIn, Driver driver, DriverScheduling driverScheduling) {
+
+    private List<FleetInfoVo> getFleetInfoVoOfRedis(String key) {
         try {
             String jsonStr = redisCache.getCacheObject(key);
             if (StringUtils.isEmpty(jsonStr)) {
-                log.info("redis中没有当天的数据[{}],[{}],[{}],[{}]", key, signIn, driver, driverScheduling);
-                return false;
-            }
-            List<FleetInfoVo> fleetInfoVos = JSON.parseArray(jsonStr, FleetInfoVo.class);
-            if (CollectionUtils.isEmpty(fleetInfoVos)) {
-                log.info("redis中的数据为空[{}],[{}],[{}],[{}]", key, signIn, driver, driverScheduling);
-                return false;
+                log.info("redis中没有当天的数据[{}]", key);
+                return Collections.emptyList();
             }
-
-
+            return JSON.parseArray(jsonStr, FleetInfoVo.class);
         } catch (Exception e) {
-            log.error("刷新签到数据异常[{}],[{}],[{}],[{}]", key, signIn, driver, driverScheduling, e);
+            log.error("从redis中获取数据异常，[{}]", key, e);
         }
-        return false;
+        return null;
     }
-    private List<FleetInfoVo> saveFleetLineTemp() {
+    private List<FleetInfoVo> combationFleetInfoVo(String redisKey) {
+
         List<FleetLineTemplate> fleetLineTemplates = fleetLineTemplateService.selectFleetLineTemplateList();
         if (CollectionUtils.isEmpty(fleetLineTemplates)) {
             return null;
@@ -212,7 +248,7 @@ public class BigViewServiceV1Impl implements BigViewServiceV1 {
             if (CollectionUtils.isNotEmpty(vals)) {
                 List<FleetInfoVo.FleetInfo> fleetInfoVoFleetInfos = new ArrayList<>();
                 List<FleetState> fleetStates = new ArrayList<>();
-                vals.stream().forEach(fl -> {
+                vals.forEach(fl -> {
                     FleetInfoVo.FleetInfo fleetInfo = new FleetInfoVo.FleetInfo();
                     fleetInfo.setLineName(fl.getLineName());
                     fleetInfoVoFleetInfos.add(fleetInfo);
@@ -229,6 +265,189 @@ public class BigViewServiceV1Impl implements BigViewServiceV1 {
             fleetInfoVos.add(fleetInfoVo);
         });
+        redisCache.setCacheObject(redisKey, JSON.toJSONString(fleetInfoVos), 25, TimeUnit.HOURS);
+        return fleetInfoVos;
+    }
+
+    private LineInfo getLineInfoByRedis(String key) {
+        try {
+            String jsonStr = redisCache.getCacheObject(key);
+            if (StringUtils.isEmpty(jsonStr)) {
+                return null;
+            }
+            return JSON.parseObject(jsonStr, LineInfo.class);
+        } catch (Exception e) {
+            log.error("从redis中获取LineInfo 异常:[{}]", key, e);
+        }
+        return null;
+    }
+
+    private LineInfo queryLineInfo(Date date, SignIn signIn, DriverScheduling driverScheduling) {
+        List<DriverSchedulingV1> driverSchedulingV1List = schedulingServiceV1.queryByNbbmAndDate(driverScheduling.getNbbm(), date);
+        if (CollectionUtils.isEmpty(driverSchedulingV1List)) {
+            return null;
+        }
+
+        LineInfo lineInfo = new LineInfo();
+        lineInfo.setLineName(driverScheduling.getLineName());
+        lineInfo.setFleetName(driverScheduling.getFleetName());
+        lineInfo.setNbbm(driverScheduling.getNbbm());
+
+        List<DriverSchedulingV1> otherDriverSchedulingV1List = driverSchedulingV1List.stream().filter(dc -> !Objects.equals(dc.getJobCode(), signIn.getJobCode())
+                && Objects.nonNull(dc.getSignInId())).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(otherDriverSchedulingV1List)) {
+            return lineInfo;
+        }
+
+        Map<String, List<DriverScheduling>> maps = otherDriverSchedulingV1List.stream().collect(Collectors.groupingBy(DriverSchedulingV1::getJobCode, Collectors.toList()));
+
+        for (Map.Entry<String, List<DriverScheduling>> entry : maps.entrySet()) {
+            if (Objects.isNull(entry.getValue())) {
+                continue;
+            }
+            Driver otherDriver = driverService.selectDriverByJobCode(entry.getKey());
+            if (Objects.isNull(otherDriver)) {
+                continue;
+            }
+            SignInV1 otherSign = null;
+            SignIn otherTagetSign = null;
+
+            for (DriverScheduling sourceDriverScheduling : entry.getValue()) {
+                SignInV1 otherSign1 = signInServiceV1.getById(sourceDriverScheduling.getSignInId());
+                if (Objects.isNull(otherSign1)) {
+                    continue;
+                }
+                SignIn signIn1 = new SignIn();
+                BeanUtils.copyProperties(otherSign1, signIn1);
+                otherSign1.setSignStatus(switchSignStatus(signIn1));
+
+                if (Objects.isNull(otherSign)) {
+                    otherSign = otherSign1;
+                    otherTagetSign = signIn1;
+                } else if (Objects.nonNull(otherSign.getExType()) && Objects.nonNull(otherSign1.getExType()) && Objects.nonNull(otherSign1.getSignStatus()) && Objects.nonNull(otherSign.getSignStatus())
+                        && otherSign1.getSignStatus() > otherSign.getSignStatus()) {
+                    otherSign = otherSign1;
+                    otherTagetSign = signIn1;
+                } else if (Objects.nonNull(otherSign.getExType()) && Objects.nonNull(otherSign1.getExType()) && Objects.nonNull(otherSign1.getSignStatus()) && Objects.isNull(otherSign.getSignStatus())) {
+                    otherSign = otherSign1;
+                    otherTagetSign = signIn1;
+                }
+            }
+
+
+            LineInfo.PersonInfoVo personInfoVo = combationPersonInfoVo(otherDriver, otherTagetSign);
+            setDriverByPost(otherDriver, lineInfo, personInfoVo);
+        }
+
+        return lineInfo;
+    }
+
+    private LineInfo.PersonInfoVo combationPersonInfoVo(Driver driver, SignIn signIn) {
+        LineInfo.PersonInfoVo personInfoVo = new LineInfo.PersonInfoVo();
+        personInfoVo.setName(driver.getPersonnelName());
+
+        personInfoVo.setSignStatus(switchSignStatus(signIn));
+        personInfoVo.setPosts(driver.getPosts());
+
+        return personInfoVo;
+    }
+
+    private Integer switchSignStatus(SignIn signIn) {
+        if (Objects.isNull(signIn.getExType())) {
+            return null;
+        }
+        if (isSignStatusWineEnum(signIn)) {
+            return SignStatusEnum.SIGN_STATUS_WINE_ENUM.getStatus();
+        }
+
+        if (isSignStatusDelayEnum(signIn)) {
+            return SignStatusEnum.SIGN_STATUS_DELAY_ENUM.getStatus();
+        }
+
+        if (isSignStatusZoneEnum(signIn)) {
+            return SignStatusEnum.SIGN_STATUS_ZONE_ENUM.getStatus();
+        }
+        return SignStatusEnum.SIGN_STATUS_EMPTY_ENUM.getStatus();
+
+    }
+
+    private void setDriverByPost(Driver driver, LineInfo lineInfo, LineInfo.PersonInfoVo personInfoVo) {
+        if (isDriver(driver)) {
+            lineInfo.setDriverInfoVo(personInfoVo);
+        } else {
+            lineInfo.setDriverInfoVo(personInfoVo);
+        }
+    }
+
+    private <T> List<T> getRedisData(String key, String dateStr, Class<T> calzz) {
+        key = MessageFormat.format(key, dateStr, "*");
+        List<String> jsonStrs = redisCache.getCacheList(key);
+        if (CollectionUtils.isEmpty(jsonStrs)) {
+            return Collections.emptyList();
+        }
+        return jsonStrs.stream().map(json -> {
+            T t = JSON.parseObject(json, calzz);
+            return t;
+        }).collect(Collectors.toList());
+    }
+
+    private List<FleetInfoVo> getFleetInfoVoBtRedis(String key) {
+        try {
+            String json = redisCache.getCacheObject(key);
+            if (StringUtils.isEmpty(json)) {
+                return Collections.emptyList();
+            }
+            return JSON.parseArray(json, FleetInfoVo.class);
+        } catch (Exception e) {
+            log.error("[{}]从redis中获取页面数据异常", key, e);
+        }
+        return Collections.emptyList();
+    }
+
+    private List<FleetInfoVo> combationFleetInfoVoBtRedis(String redisKey, String dateStr) {
+
+        String key = MessageFormat.format(LINE_SIGN_REPORT_FLEET_KEY, dateStr);
+        List<FleetInfoVo> fleetInfoVos = getFleetInfoVoOfRedis(key);
+        if (CollectionUtils.isEmpty(fleetInfoVos)) {
+            fleetInfoVos = combationFleetInfoVo(key);
+        }
+
+        if (CollectionUtils.isEmpty(fleetInfoVos)) {
+            return Collections.emptyList();
+        }
+        List<LineInfo> lineInfoList = getRedisData(LINE_SIGN_NBBM_KEY, dateStr, LineInfo.class);
+        List<FleetState> fleetStates = getRedisData(LINE_SIGN_STATUS_KEY, dateStr, FleetState.class);
+
+        int lineInfoListSize = CollectionUtils.size(lineInfoList);
+        int fleetStatesSize = CollectionUtils.size(fleetStates);
+
+        fleetInfoVos = fleetInfoVos.stream().map(fv -> {
+            if (lineInfoListSize > 0) {
+                if (CollectionUtils.isNotEmpty(fv.getFleetInfos())) {
+                    List<FleetInfoVo.FleetInfo> fleetInfos = fv.getFleetInfos().stream().map(fi -> {
+                        List<LineInfo> lineInfos = lineInfoList.stream().filter(l -> Objects.equals(fv.getTitle(), l.getFleetName()) &&
+                                Objects.equals(fi.getLineName(), l.getLineName())).collect(Collectors.toList());
+                        if (CollectionUtils.isNotEmpty(lineInfos)) {
+                            fi.setLineInfos(lineInfos);
+                        }
+                        return fi;
+                    }).collect(Collectors.toList());
+
+                    fv.setFleetInfos(fleetInfos);
+                }
+            }
+
+            if (fleetStatesSize > 0) {
+                List<FleetState> fss = fleetStates.stream().filter(fs -> Objects.equals(fs.getFleetName(), fv.getTitle())).collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(fss)) {
+                    fv.setFleetStates(fss);
+                }
+            }
+            return fv;
+        }).collect(Collectors.toList());
+
+        redisCache.setCacheObject(redisKey, JSON.toJSONString(fleetInfoVos), 10, TimeUnit.SECONDS);
         return fleetInfoVos;
     }
+
 }
@@ -120,6 +120,11 @@
         <include refid="selectDriverVo"/>
         where id = #{id}
     </select>
+
+    <select id="selectDriverByJobCode" parameterType="java.lang.String" resultMap="DriverResult">
+        <include refid="selectDriverVo"/>
+        where job_code = #{jobCode}
+    </select>
     <select id="getNameByJobCode" resultMap="DriverResult">
         select personnel_name,job_code
         from driver