fix: 修复bug

guzijian
1 parent 479764a3
Showing 38 changed files with 647 additions and 703 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/ConstSignInConstSignInProperties.java
ruoyi-admin/src/main/java/com/ruoyi/common/ErrorTypeProperties.java
ruoyi-admin/src/main/java/com/ruoyi/common/cache/NowSchedulingCache.java
ruoyi-admin/src/main/java/com/ruoyi/common/cache/SchedulingCache.java
ruoyi-admin/src/main/java/com/ruoyi/controller/ReportController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/mapper/DriverSchedulingMapper.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/eexception/controller/EquipmentExceptionController.java
ruoyi-admin/src/main/java/com/ruoyi/eexception/domain/EquipmentException.java
ruoyi-admin/src/main/java/com/ruoyi/eexception/mapper/EquipmentExceptionMapper.java
ruoyi-admin/src/main/java/com/ruoyi/eexception/service/IEquipmentExceptionService.java
ruoyi-admin/src/main/java/com/ruoyi/eexception/service/impl/EquipmentExceptionServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/equipment/mapper/EquipmentMapper.java
ruoyi-admin/src/main/java/com/ruoyi/global_exception/controller/GlobalExceptionController.java
ruoyi-admin/src/main/java/com/ruoyi/global_exception/domain/GlobalException.java
ruoyi-admin/src/main/java/com/ruoyi/global_exception/mapper/GlobalExceptionMapper.java
ruoyi-admin/src/main/java/com/ruoyi/global_exception/service/IGlobalExceptionService.java
ruoyi-admin/src/main/java/com/ruoyi/global_exception/service/impl/GlobalExceptionServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
@@ -13,6 +13,8 @@ public interface ConstSignInConstSignInProperties {
     String SIGN_NO_SCHEDULING_EX_NUM_STRING = "无排班异常";
     Integer SIGN_ALCOHOL_EX_NUM = 3;
     String SIGN_ALCOHOL_EX_NUM_STRING = "酒精超标异常";
+    Integer EQUIPMENT_ALCOHOL_EX_NUM = 4;
+    String EQUIPMENT_ALCOHOL_EX_NUM_STRING = "设备异常";
  
     String HAVE_EX = "有异常";
     String NO_EX = "无异常";
@@ -58,7 +60,7 @@ public interface ConstSignInConstSignInProperties {
      */
     Integer ALCOHOL_FLAG_YES = 1;
     String ALCOHOL_FLAG_YES_STRING = "已测试";
-    Integer ALCOHOL_FLAG_NO = 2;
+    Integer ALCOHOL_FLAG_NO = 0;
     String ALCOHOL_FLAG_NO_STRING = "未测试";
  
     /**
@@ -8,7 +8,7 @@ public interface ErrorTypeProperties {
     String EQUIPMENT_ERROR = "设备异常";
     String ALCOHOL_SIGN_IN_ERROR = "酒精测试超标,";
     String WORK_DAY_ERROR = "当天没有排班,";
-    String SIGN_IN_TIMEOUT = "签到异常,";
-    String SIGN_OUT_TIMEOUT = "签退异常,";
+    String SIGN_IN_TIMEOUT = "没有在规定时间内签到,";
+    String SIGN_OUT_TIMEOUT = "没有在规定时间内签退,";
  
 }
+package com.ruoyi.common.cache;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.ruoyi.driver.mapper.DriverSchedulingMapper;
+import com.ruoyi.pojo.entity.DriverScheduling;
+import com.ruoyi.utils.ConstDateUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Component
+public class NowSchedulingCache {
+    private final DriverSchedulingMapper schedulingMapper;
+    Logger log = LoggerFactory.getLogger(SchedulingCache.class);
+    /**
+     * 当天初版排班
+     */
+    private static ConcurrentHashMap<String, Map<String, List<DriverScheduling>>> cacheNowDayScheduling = new ConcurrentHashMap<>();
+
+
+    public NowSchedulingCache(DriverSchedulingMapper driverSchedulingMapper) {
+        this.schedulingMapper = driverSchedulingMapper;
+        log.info("项目启动加载中获取排班表-----");
+        cacheNowDaySchedulingInit();
+    }
+
+    private void cacheNowDaySchedulingInit() {
+        // 查询今天和昨天
+        for (int i = 0; i > -2; i--) {
+            Map<String, List<DriverScheduling>> resultMap =new HashMap<>(800);
+            String date = ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(i));
+            List<DriverScheduling> schedulingList = schedulingMapper.queryToDay(date, null, null, null);
+            handleResultMap(resultMap,schedulingList);
+            cacheNowDayScheduling.put(date,resultMap);
+        }
+    }
+
+    private void handleResultMap(Map<String, List<DriverScheduling>> resultMap, List<DriverScheduling> schedulingList) {
+        for (DriverScheduling scheduling : schedulingList) {
+            List<DriverScheduling> list = resultMap.get(scheduling.getJobCode());
+            if (CollectionUtil.isEmpty(list)){
+                resultMap.put(scheduling.getJobCode(),new ArrayList<>(Arrays.asList(scheduling)));
+            }else {
+                list.add(scheduling);
+            }
+        }
+    }
+
+    public void setCacheScheduling(String key, Map<String, List<DriverScheduling>> mapValue) {
+        cacheNowDayScheduling.put(key, mapValue);
+    }
+    public Map<String,List<DriverScheduling>> getCacheScheduling(String key) {
+       return cacheNowDayScheduling.get(key);
+    }
+
+    public void removeCacheSchedulingByKey(String key) {
+        cacheNowDayScheduling.remove(key);
+    }
+
+    public List<String> getKeys(){
+        return new ArrayList<>(cacheNowDayScheduling.keySet());
+    }
+
+    public Integer size(){
+        return cacheNowDayScheduling.size();
+    }
+
+    public List<DriverScheduling> getCacheSchedulingMapValueByHKey(String key, String HKey) {
+        if (Objects.isNull(cacheNowDayScheduling.get(key))) {
+            return null;
+        }
+        List<DriverScheduling> list = cacheNowDayScheduling.get(key).get(HKey);
+
+        return Objects.isNull(list) ? null : list;
+    }
+
+    public List<String> getHKeysByKey(String key) {
+        return new ArrayList<>(cacheNowDayScheduling.get(key).keySet());
+    }
+
+    public List<String> getKes() {
+        return new ArrayList<>(cacheNowDayScheduling.keySet());
+    }
+}
 package com.ruoyi.common.cache;
  
+import cn.hutool.core.collection.CollectionUtil;
+import com.ruoyi.pojo.entity.DriverScheduling;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
+import com.ruoyi.service.SchedulingService;
 import com.ruoyi.utils.ConstDateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,7 +12,6 @@ import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
  
-import javax.annotation.Resource;
 import java.security.MessageDigest;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -27,21 +29,28 @@ public class SchedulingCache {
  
     Logger log = LoggerFactory.getLogger(SchedulingCache.class);
  
+
+
     //    @Value("${api.url.getSchedulingInfoNew}")
     private static final String getSchedulingInfoUrl = "http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s";
     //    @Value("${api.config.nonce}")
     private static final String NONCE = "adfsad";
     //    @Value("${api.config.password}")
     private static final String PASSWORD = "c4dd3d8cb9a82f6d6a625818618b28ca7bebb464";
-    @Resource
-    private SchedulingCache schedulingCache;
+
+    /**
+     * 实时更新排班
+     */
     private static ConcurrentHashMap<String, Map<String, List<ResponseSchedulingDto>>> cacheScheduling = new ConcurrentHashMap<>();
  
+
     public SchedulingCache() {
         log.info("项目启动加载中-----");
 //        schedulingInit();
     }
  
+
+
     private void schedulingInit() {
         String formatNowDate = ConstDateUtil.formatDate(new Date());
         String url = getUrl(formatNowDate);
@@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
+import com.ruoyi.pojo.response.ExportReportViewResponseVo;
 import com.ruoyi.pojo.response.ReportErrorResponseVo;
 import com.ruoyi.pojo.response.ReportViewResponseVo;
 import com.ruoyi.service.ReportService;
@@ -37,6 +38,12 @@ public class ReportController {
         return AjaxResult.success(reportService.getReportScrollViewTable(requestVo,response));
     }
  
+    @ApiOperation("签到报表集合查询")
+    @GetMapping("/bigView")
+    public AjaxResult getBigView(HttpServletResponse response, @ApiParam @ModelAttribute ReportViewRequestVo requestVo) {
+        return AjaxResult.success(reportService.getBigView(requestVo,response));
+    }
+
     @ApiOperation("获取详情")
     @GetMapping("/detail")
     public AjaxResult getDetail(HttpServletResponse response, @ApiParam @ModelAttribute @Validated ReportViewRequestVo requestVo) {
@@ -53,12 +60,9 @@ public class ReportController {
     @ApiOperation("签到报表导出")
     @PostMapping("/export")
     public void exportReport(@ApiParam ReportViewRequestVo requestVo, HttpServletResponse response) {
-        List<ReportViewResponseVo> list = reportService.exportReportList(requestVo, response);
+        List<ExportReportViewResponseVo> list = reportService.exportReportList(requestVo, response);
         // 不导出图片清空路径信息
-        if (!EXPORT.equals(requestVo.getExportFlag())){
-//            list = list.stream().map(item->{item.setImage("");return item;}).collect(Collectors.toList());
-        }
-        ExcelUtil<ReportViewResponseVo> util = new ExcelUtil<ReportViewResponseVo>(ReportViewResponseVo.class);
+        ExcelUtil<ExportReportViewResponseVo> util = new ExcelUtil<ExportReportViewResponseVo>(ExportReportViewResponseVo.class);
         util.exportEasyExcel(response, list, "签到报表");
     }
  
@@ -6,6 +6,8 @@ import com.ruoyi.pojo.response.ReportViewResponseVo;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
 import org.apache.ibatis.annotations.Param;
  
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
  
 /**
@@ -19,6 +21,6 @@ public interface DriverSchedulingMapper {
  
     List<DriverScheduling> queryToDay(@Param("date") String date, @Param("name") String name,@Param("jobCode") String jobCode,@Param("lineName")String lineName );
  
-    void updateRoster(@Param("scheduling") DriverScheduling scheduling, @Param("signInId") Long id, @Param("exType") Integer exType);
+    void updateRoster(@Param("scheduling") DriverScheduling scheduling, @Param("signInId") Long id, @Param("exType") Integer exType, @Param("signTime")Date signTime, @Param("remark") String remark, @Param("signType") Integer signType, @Param("alcoholFlag") Integer alcoholFlag, @Param("alcoholIntake")BigDecimal alcoholIntake);
  
 }
@@ -21,7 +21,6 @@ import com.ruoyi.common.global.ResultCode;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
-import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.job.DriverJob;
@@ -155,7 +154,7 @@ public class DriverServiceImpl implements IDriverService {
             // 如果当前有效范围内签到记录无效如酒精测试异常则重复当前操作
             if ((Math.abs(nowBetween) <= 60) && timeMap.get(index).getExType().equals(SIGN_ALCOHOL_EX_NUM) && timeMap.get(index).getBcType().equals(BC_TYPE_OUT)) {
                 return timeMap.get(index);
-            }else {
+            } else {
                 index = index < timeMap.size() - 1 ? index + 1 : index;
             }
         }
@@ -311,31 +310,17 @@ public class DriverServiceImpl implements IDriverService {
         List<Driver> drivers = driverMapper.getDrivers(driver);
         Long now = System.currentTimeMillis();
         List<DriverResponseVo> vos = new ArrayList<>(drivers.size());
-//        List<ResponseSchedulingDto> schedulingList = schedulingCache.getCacheSchedulingMapValueByHKey(ConstDateUtil.formatDate(new Date()), driver.getJobCode());
         List<DriverScheduling> dto = null;
         Boolean schedulingFlag = true;
         Boolean alcoholFlag = true;
-        dto = schedulingService.queryScheduling(driver.getJobCode(), now);
  
-        DriverResponseVo vo = null;
-        // 给出计划操作
-        if (!CollectionUtil.isEmpty(dto)) {
-            DriverSignRecommendation item = checkTime(dto, now);
-            if (BC_TYPE_OUT.equals(item.getBcType()) && !CollectionUtil.isEmpty(drivers)) {
-                // 售票员无需酒精测试
-                if (item.getPosts().equals(PERSONNEL_POSTS_DRIVER))
-                    vo = new DriverResponseVo(item.getTimestamps(), drivers.get(0), SIGN_IN_STRING, alcoholFlag, schedulingFlag,item.getNbbm(),item.getLpName(),item.getLineName());
-                else
-                    vo = new DriverResponseVo(item.getTimestamps(), drivers.get(0), SIGN_IN_STRING, !alcoholFlag, schedulingFlag,item.getNbbm(),item.getLpName(),item.getLineName());
-            } else if (BC_TYPE_IN.equals(item.getBcType()) && !CollectionUtil.isEmpty(drivers)) {
-                vo = new DriverResponseVo(item.getTimestamps(), drivers.get(0), SIGN_IN_OUT_STRING, !alcoholFlag, !schedulingFlag,item.getNbbm(),item.getLpName(),item.getLineName());
-            }
-        }
         // 更新信息
         for (Driver item : drivers) {
+            dto = schedulingService.queryScheduling(item.getJobCode(), now);
+            DriverResponseVo vo = handleRecommendation(item, now, dto, schedulingFlag, alcoholFlag);
             // 无排班
             if (Objects.isNull(vo)) {
-                vos.add(new DriverResponseVo(null, item, null, false, false,"","",""));
+                vos.add(new DriverResponseVo(null, item, null, false, false, "", "", ""));
             } else {
                 vos.add(vo);
             }
@@ -343,6 +328,24 @@ public class DriverServiceImpl implements IDriverService {
         return vos;
     }
  
+    private DriverResponseVo handleRecommendation(Driver drivers, Long now, List<DriverScheduling> dto, Boolean schedulingFlag, Boolean alcoholFlag) {
+        DriverResponseVo vo = null;
+        // 给出计划操作
+        if (!CollectionUtil.isEmpty(dto)) {
+            DriverSignRecommendation recommendation = checkTime(dto, now);
+            if (BC_TYPE_OUT.equals(recommendation.getBcType())) {
+                // 售票员无需酒精测试
+                if (recommendation.getPosts().equals(PERSONNEL_POSTS_DRIVER))
+                    vo = new DriverResponseVo(recommendation.getTimestamps(), drivers, SIGN_IN_STRING, alcoholFlag, schedulingFlag, recommendation.getNbbm(), recommendation.getLpName(), recommendation.getLineName());
+                else
+                    vo = new DriverResponseVo(recommendation.getTimestamps(), drivers, SIGN_IN_STRING, !alcoholFlag, schedulingFlag, recommendation.getNbbm(), recommendation.getLpName(), recommendation.getLineName());
+            } else if (BC_TYPE_IN.equals(recommendation.getBcType())) {
+                vo = new DriverResponseVo(recommendation.getTimestamps(), drivers, SIGN_IN_OUT_STRING, !alcoholFlag, !schedulingFlag, recommendation.getNbbm(), recommendation.getLpName(), recommendation.getLineName());
+            }
+        }
+        return vo;
+    }
+
  
     @Override
     public AjaxResult faceRegistrationFeedback(String deviceId, List<String> jobCodes) {
@@ -3,6 +3,7 @@ package com.ruoyi.eexception.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
  
+import com.ruoyi.pojo.response.EquipmentExceptionResponseVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,7 +34,6 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RestController
 @RequestMapping("/eexception/eexception")
 @Api(tags = "设备异常接口")
-@Deprecated
 public class EquipmentExceptionController extends BaseController
 {
     @Autowired
@@ -48,7 +48,7 @@ public class EquipmentExceptionController extends BaseController
     public TableDataInfo list(EquipmentException equipmentException)
     {
         startPage();
-        List<EquipmentException> list = equipmentExceptionService.selectEquipmentExceptionList(equipmentException);
+        List<EquipmentExceptionResponseVo> list = equipmentExceptionService.selectEquipmentExceptionList(equipmentException);
         return getDataTable(list);
     }
  
@@ -61,8 +61,8 @@ public class EquipmentExceptionController extends BaseController
     @ApiOperation("导出设备异常记录列表")
     public void export(HttpServletResponse response, EquipmentException equipmentException)
     {
-        List<EquipmentException> list = equipmentExceptionService.selectEquipmentExceptionList(equipmentException);
-        ExcelUtil<EquipmentException> util = new ExcelUtil<EquipmentException>(EquipmentException.class);
+        List<EquipmentExceptionResponseVo> list = equipmentExceptionService.selectEquipmentExceptionList(equipmentException);
+        ExcelUtil<EquipmentExceptionResponseVo> util = new ExcelUtil<EquipmentExceptionResponseVo>(EquipmentExceptionResponseVo.class);
         util.exportExcel(response, list, "设备异常记录数据");
     }
  
@@ -47,5 +47,7 @@ public class EquipmentException extends BaseEntity
     @ApiModelProperty("处理状态")
     private Integer status;
  
+    @ApiModelProperty("异常类型")
+    private Integer exType;
  
 }
@@ -3,6 +3,7 @@ package com.ruoyi.eexception.mapper;
 import java.util.List;
 import com.ruoyi.eexception.domain.EquipmentException;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
+import com.ruoyi.pojo.response.EquipmentExceptionResponseVo;
  
 /**
  * 设备异常记录Mapper接口
@@ -26,7 +27,15 @@ public interface EquipmentExceptionMapper
      * @param equipmentException 设备异常记录
      * @return 设备异常记录集合
      */
-    public List<EquipmentException> selectEquipmentExceptionList(EquipmentException equipmentException);
+    public List<EquipmentExceptionResponseVo> selectEquipmentExceptionList(EquipmentException equipmentException);
+    /**
+     * 查询设备异常记录列表
+     *
+     * @param requestVo 设备异常记录
+     * @return 设备异常记录集合
+     */
+    public List<EquipmentExceptionResponseVo> selectEquipmentExceptionListByVo(ReportErrorRequestVo requestVo);
+
  
     /**
      * 新增设备异常记录
@@ -61,4 +70,6 @@ public interface EquipmentExceptionMapper
     public int deleteEquipmentExceptionByIds(Long[] ids);
  
     List<EquipmentException> getEquipmentErrorList(ReportErrorRequestVo request);
+
+    EquipmentException selectEquipmentExceptionByDeviceIdStatus(EquipmentException equipmentException);
 }
@@ -2,6 +2,7 @@ package com.ruoyi.eexception.service;
  
 import java.util.List;
 import com.ruoyi.eexception.domain.EquipmentException;
+import com.ruoyi.pojo.response.EquipmentExceptionResponseVo;
  
 /**
  * 设备异常记录Service接口
@@ -25,7 +26,7 @@ public interface IEquipmentExceptionService
      * @param equipmentException 设备异常记录
      * @return 设备异常记录集合
      */
-    public List<EquipmentException> selectEquipmentExceptionList(EquipmentException equipmentException);
+    public List<EquipmentExceptionResponseVo> selectEquipmentExceptionList(EquipmentException equipmentException);
  
     /**
      * 新增设备异常记录
 package com.ruoyi.eexception.service.impl;
  
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
  
@@ -8,14 +9,15 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
+import com.ruoyi.pojo.response.EquipmentExceptionResponseVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.eexception.mapper.EquipmentExceptionMapper;
 import com.ruoyi.eexception.domain.EquipmentException;
 import com.ruoyi.eexception.service.IEquipmentExceptionService;
  
-import static com.ruoyi.common.ConstEquipmentProperties.EQUIPMENT_PROCESS_FLOW_COMMIT;
-import static com.ruoyi.common.ConstEquipmentProperties.EQUIPMENT_STATUS_ILLNESS;
+import static com.ruoyi.common.ConstEquipmentProperties.*;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.EQUIPMENT_ALCOHOL_EX_NUM;
  
 /**
  * 设备异常记录Service业务层处理
@@ -51,7 +53,7 @@ public class EquipmentExceptionServiceImpl implements IEquipmentExceptionService
      * @return 设备异常记录
      */
     @Override
-    public List<EquipmentException> selectEquipmentExceptionList(EquipmentException equipmentException)
+    public List<EquipmentExceptionResponseVo> selectEquipmentExceptionList(EquipmentException equipmentException)
     {
         return equipmentExceptionMapper.selectEquipmentExceptionList(equipmentException);
     }
@@ -73,9 +75,16 @@ public class EquipmentExceptionServiceImpl implements IEquipmentExceptionService
         if (Objects.isNull(equipment)){
             throw new RuntimeException("设备不存在");
         }
+        EquipmentException exception = equipmentExceptionMapper.selectEquipmentExceptionByDeviceIdStatus(equipmentException);
+        if (!Objects.isNull(exception)){
+            throw new RuntimeException("已经提交过报修，等待维修人员处理。");
+        }
+        if (Objects.isNull(equipmentException.getExType()))
+            equipmentException.setExType(EQUIPMENT_ALCOHOL_EX_NUM);
         equipment.setStatus(EQUIPMENT_STATUS_ILLNESS);
         equipmentMapper.updateEquipment(equipment);
         equipmentException.setStatus(EQUIPMENT_PROCESS_FLOW_COMMIT);
+        equipmentException.setCreateTime(new Date());
         return equipmentExceptionMapper.insertEquipmentException(equipmentException);
     }
  
@@ -88,6 +97,12 @@ public class EquipmentExceptionServiceImpl implements IEquipmentExceptionService
     @Override
     public int updateEquipmentException(EquipmentException equipmentException)
     {
+        EquipmentException equipmentException1 = equipmentExceptionMapper.selectEquipmentExceptionById(equipmentException.getId());
+        if (EQUIPMENT_ALCOHOL_EX_NUM.equals(equipmentException1.getExType()) && equipmentException.getStatus().equals(EQUIPMENT_PROCESS_FLOW_COMPLETE)){
+            Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(equipmentException.getDeviceId());
+            equipment.setStatus(EQUIPMENT_STATUS_HEALTH);
+            equipmentMapper.updateEquipment(equipment);
+        }
         return equipmentExceptionMapper.updateEquipmentException(equipmentException);
     }
  
@@ -4,7 +4,6 @@ import java.util.List;
  
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.equipment.domain.Equipment;
-import com.ruoyi.global_exception.domain.GlobalException;
 import com.ruoyi.pojo.domain.EquipmentDriverExpand;
 import org.apache.ibatis.annotations.Param;
  
-package com.ruoyi.global_exception.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.common.global.Result;
-import com.ruoyi.pojo.request.GlobalExceptionRequestVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.global_exception.domain.GlobalException;
-import com.ruoyi.global_exception.service.IGlobalExceptionService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * global_exceptionController
- * 
- * @author global_exception
- * @date 2023-08-14
- */
-@RestController
-@RequestMapping("/global_exception/global_exception")
-@Api(tags = "异常管理")
-public class GlobalExceptionController extends BaseController
-{
-    @Autowired
-    private IGlobalExceptionService globalExceptionService;
-
-    /**
-     * 查询global_exception列表
-     */
-    @PreAuthorize("@ss.hasPermi('global_exception:global_exception:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(GlobalException globalException)
-    {
-        startPage();
-        List<GlobalException> list = globalExceptionService.selectGlobalExceptionList(globalException);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出global_exception列表
-     */
-    @PreAuthorize("@ss.hasPermi('global_exception:global_exception:export')")
-    @Log(title = "global_exception", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, GlobalException globalException)
-    {
-        List<GlobalException> list = globalExceptionService.selectGlobalExceptionList(globalException);
-        ExcelUtil<GlobalException> util = new ExcelUtil<GlobalException>(GlobalException.class);
-        util.exportExcel(response, list, "global_exception数据");
-    }
-
-    /**
-     * 获取global_exception详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('global_exception:global_exception:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(globalExceptionService.selectGlobalExceptionById(id));
-    }
-
-    /**
-     * 新增global_exception
-     */
-    @PreAuthorize("@ss.hasPermi('global_exception:global_exception:add')")
-//    @Log(title = "global_exception", businessType = BusinessType.INSERT)
-    @ApiOperation("新增异常")
-    @PostMapping
-    public Result<?> add(@RequestBody @ApiParam @Validated GlobalExceptionRequestVo globalException)
-    {
-        return Result.OK(globalExceptionService.insertGlobalException(globalException));
-    }
-
-    /**
-     * 修改global_exception
-     */
-    @PreAuthorize("@ss.hasPermi('global_exception:global_exception:edit')")
-//    @Log(title = "global_exception", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody GlobalException globalException)
-    {
-        return toAjax(globalExceptionService.updateGlobalException(globalException));
-    }
-
-    /**
-     * 删除global_exception
-     */
-    @PreAuthorize("@ss.hasPermi('global_exception:global_exception:remove')")
-    @Log(title = "global_exception", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(globalExceptionService.deleteGlobalExceptionByIds(ids));
-    }
-}
-package com.ruoyi.global_exception.domain;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * global_exception对象 global_exception
- *
- * @author global_exception
- * @date 2023-08-14
- */
-@ApiModel("异常对象")
-@Data
-public class GlobalException implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @ApiModelProperty("主键")
-    private Long id;
-
-    /**
-     * 提交工号
-     */
-    @Excel(name = "提交工号")
-    @ApiModelProperty("提交工号")
-    @NotBlank
-    private String jobCode;
-
-    /**
-     * 设备号
-     */
-    @Excel(name = "设备号")
-    @ApiModelProperty("设备号")
-    @NotBlank
-    private String deviceId;
-
-    /**
-     * 问题类型
-     */
-    @Excel(name = "问题类型")
-    @ApiModelProperty("问题类型（1：识别异常，2：设备异常")
-    @NotNull
-    private Long type;
-
-    /**
-     * 处理情况
-     */
-    @Excel(name = "处理情况")
-    @ApiModelProperty("处理情况 （3：未处理，2：处理中，1：已处理")
-    @NotNull
-    private Integer handle;
-
-    @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @ApiModelProperty("修改时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-    @Excel(name = "问题描述")
-    @ApiModelProperty("问题描述")
-    @NotBlank
-    private String remark;
-
-}
-package com.ruoyi.global_exception.mapper;
-
-import java.util.List;
-import com.ruoyi.global_exception.domain.GlobalException;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * global_exceptionMapper接口
- * 
- * @author global_exception
- * @date 2023-08-14
- */
-public interface GlobalExceptionMapper 
-{
-    /**
-     * 查询global_exception
-     * 
-     * @param id global_exception主键
-     * @return global_exception
-     */
-    public GlobalException selectGlobalExceptionById(Long id);
-
-    /**
-     * 查询global_exception列表
-     * 
-     * @param globalException global_exception
-     * @return global_exception集合
-     */
-    public List<GlobalException> selectGlobalExceptionList(GlobalException globalException);
-
-    /**
-     * 新增global_exception
-     * 
-     * @param globalException global_exception
-     * @return 结果
-     */
-    public int insertGlobalException(GlobalException globalException);
-
-    /**
-     * 修改global_exception
-     * 
-     * @param globalException global_exception
-     * @return 结果
-     */
-    public int updateGlobalException(GlobalException globalException);
-
-    /**
-     * 删除global_exception
-     * 
-     * @param id global_exception主键
-     * @return 结果
-     */
-    public int deleteGlobalExceptionById(Long id);
-
-    /**
-     * 批量删除global_exception
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteGlobalExceptionByIds(Long[] ids);
-
-}
-package com.ruoyi.global_exception.service;
-
-import java.util.List;
-import com.ruoyi.global_exception.domain.GlobalException;
-import com.ruoyi.pojo.request.GlobalExceptionRequestVo;
-
-/**
- * global_exceptionService接口
- * 
- * @author global_exception
- * @date 2023-08-14
- */
-public interface IGlobalExceptionService 
-{
-    /**
-     * 查询global_exception
-     * 
-     * @param id global_exception主键
-     * @return global_exception
-     */
-    public GlobalException selectGlobalExceptionById(Long id);
-
-    /**
-     * 查询global_exception列表
-     * 
-     * @param globalException global_exception
-     * @return global_exception集合
-     */
-    public List<GlobalException> selectGlobalExceptionList(GlobalException globalException);
-
-    /**
-     * 新增global_exception
-     * 
-     * @param globalException global_exception
-     * @return 结果
-     */
-    public String insertGlobalException(GlobalExceptionRequestVo globalException);
-
-    /**
-     * 修改global_exception
-     * 
-     * @param globalException global_exception
-     * @return 结果
-     */
-    public int updateGlobalException(GlobalException globalException);
-
-    /**
-     * 批量删除global_exception
-     * 
-     * @param ids 需要删除的global_exception主键集合
-     * @return 结果
-     */
-    public int deleteGlobalExceptionByIds(Long[] ids);
-
-    /**
-     * 删除global_exception信息
-     * 
-     * @param id global_exception主键
-     * @return 结果
-     */
-    public int deleteGlobalExceptionById(Long id);
-}
-package com.ruoyi.global_exception.service.impl;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.driver.domain.Driver;
-import com.ruoyi.driver.mapper.DriverMapper;
-import com.ruoyi.equipment.domain.Equipment;
-import com.ruoyi.equipment.mapper.EquipmentMapper;
-import com.ruoyi.pojo.request.GlobalExceptionRequestVo;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.global_exception.mapper.GlobalExceptionMapper;
-import com.ruoyi.global_exception.domain.GlobalException;
-import com.ruoyi.global_exception.service.IGlobalExceptionService;
-
-import static com.ruoyi.common.ConstEquipmentProperties.*;
-
-/**
- * global_exceptionService业务层处理
- *
- * @author global_exception
- * @date 2023-08-14
- */
-@Service
-public class GlobalExceptionServiceImpl implements IGlobalExceptionService {
-    @Autowired
-    private GlobalExceptionMapper globalExceptionMapper;
-
-    @Autowired
-    private DriverMapper driverMapper;
-
-    @Autowired
-    private EquipmentMapper equipmentMapper;
-
-    /**
-     * 查询global_exception
-     *
-     * @param id global_exception主键
-     * @return global_exception
-     */
-    @Override
-    public GlobalException selectGlobalExceptionById(Long id) {
-        return globalExceptionMapper.selectGlobalExceptionById(id);
-    }
-
-    /**
-     * 查询global_exception列表
-     *
-     * @param globalException global_exception
-     * @return global_exception
-     */
-    @Override
-    public List<GlobalException> selectGlobalExceptionList(GlobalException globalException) {
-        return globalExceptionMapper.selectGlobalExceptionList(globalException);
-    }
-
-    /**
-     * 新增global_exception
-     *
-     * @param globalException global_exception
-     * @return 结果
-     */
-    @Override
-    public String insertGlobalException(GlobalExceptionRequestVo globalException) {
-        if (Objects.isNull(driverMapper.getDriverInfoByJobCode(globalException.getJobCode()))) {
-            throw new RuntimeException("工号不存在");
-        }
-        Equipment equipment = new Equipment();
-        equipment.setDeviceId(globalException.getDeviceId());
-        if (Objects.isNull(equipmentMapper.selectEquipmentList(equipment))) {
-            throw new RuntimeException("设备号不存在");
-        }
-        if (EQUIPMENT_STATUS_ILLNESS.equals(globalException.getType())) {
-            equipment.setStatus(EQUIPMENT_STATUS_ILLNESS);
-            updateEquipment(equipment);
-        }
-        GlobalException exception = new GlobalException();
-        BeanUtils.copyProperties(globalException, exception);
-        exception.setCreateTime(DateUtils.getNowDate());
-        exception.setUpdateTime(DateUtils.getNowDate());
-        exception.setHandle(EQUIPMENT_PROCESS_FLOW_COMMIT);
-        if (globalExceptionMapper.insertGlobalException(exception) == 1) {
-            return "新增成功";
-        }
-        return "新增失败";
-    }
-
-    private void updateEquipment(Equipment equipment) {
-        equipmentMapper.updateEquipment(equipment);
-    }
-
-
-    /**
-     * 修改global_exception
-     *
-     * @param globalException global_exception
-     * @return 结果
-     */
-    @Override
-    public int updateGlobalException(GlobalException globalException) {
-        globalException.setUpdateTime(DateUtils.getNowDate());
-        return globalExceptionMapper.updateGlobalException(globalException);
-    }
-
-    /**
-     * 批量删除global_exception
-     *
-     * @param ids 需要删除的global_exception主键
-     * @return 结果
-     */
-    @Override
-    public int deleteGlobalExceptionByIds(Long[] ids) {
-        return globalExceptionMapper.deleteGlobalExceptionByIds(ids);
-    }
-
-    /**
-     * 删除global_exception信息
-     *
-     * @param id global_exception主键
-     * @return 结果
-     */
-    @Override
-    public int deleteGlobalExceptionById(Long id) {
-        return globalExceptionMapper.deleteGlobalExceptionById(id);
-    }
-}
@@ -75,7 +75,7 @@ public class SignInServiceImpl implements ISignInService {
     private RedisCache redisCache;
  
     @Resource
-    private ThreadJobService threadJobConfig;
+    private ThreadJobService threadJobService;
  
     /**
      * 查询签到
@@ -91,12 +91,11 @@ public class SignInServiceImpl implements ISignInService {
     /**
      * 查询签到列表
      *
-     * @param signIn 签到
+     * @param vo 签到
      * @return 签到
      */
     @Override
-    public List<SignInResponseVo> selectSignInList(SignInResponseVo signIn) {
-        SignInResponseVo vo = new SignInResponseVo(signIn);
+    public List<SignInResponseVo> selectSignInList(SignInResponseVo vo) {
         List<SignInResponseVo> vos = signInMapper.selectSignInList(vo);
         return vos;
     }
@@ -188,7 +187,7 @@ public class SignInServiceImpl implements ISignInService {
         if (Objects.isNull(driver)) return AjaxResult.warn("这个工号的员工不存在！");
         // 查询地址
         Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
-        SignInResponseVo vo = getSignInResponseVo(driver,signIn, equipment);
+        SignInResponseVo vo = getSignInResponseVo(driver, signIn, equipment);
         signIn.setCreateTime(new Date());
         signIn.setRemark("");
         GlobalIndex globalIndex = new GlobalIndex();
@@ -198,6 +197,7 @@ public class SignInServiceImpl implements ISignInService {
         if (checkSignIn(now, dto, globalIndex, signIn, driver)) {
             signIn.setStatus(SIGN_IN_SUCCESS);
             signIn.setExType(SIGN_NO_EX_NUM);
+            signIn.setRemark("正常");
         } else {
             signIn.setStatus(SIGN_IN_FAIL);
             signIn.setRemark(signIn.getRemark().replaceFirst(",$", "。"));
@@ -205,14 +205,13 @@ public class SignInServiceImpl implements ISignInService {
         // base64转图片
         signIn.setIp(IpUtils.getIpAddr());
  
-        uploadImage(signIn);
+        uploadImage(signIn, vo);
         signInMapper.insertSignIn(signIn);
         // 更新考勤
         schedulingService.computedSignInBySignIn(dto, signIn, globalIndex);
-        // 测试用户特殊处理 TODO 更新签到记录
-        if (signIn.getJobCode().equals("700002") || signIn.getJobCode().equals("700001")) {
-            return AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo);
-        }
+
+        // 异常保存到异常异常中
+        threadJobService.asyncInsertExceptionRecord(signIn);
  
         // 驾驶人员二次签到酒精测试异常
         if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && SIGN_IN_FAIL.equals(signIn.getStatus()) && signIn.getRemark().contains(ALCOHOL_SIGN_IN_ERROR)) {
@@ -354,7 +353,7 @@ public class SignInServiceImpl implements ISignInService {
                 if (currentScheduling.getBcType().equals(BC_TYPE_OUT) && Objects.isNull(currentScheduling.getSignInId())) {
                     DriverSignRecommendation lastClosestTimestamp = schedulingService.computedTheCurrentClosestTimestamp(dto, now, -1);
                     // 上一次无记|签到,type:签退  当前时间小于最近签到时间 -> 超时签退
-                    if (nowBetween < -60L && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_OUT) && lastClosestTimestamp.getBcType().equals(BC_TYPE_IN)){
+                    if (nowBetween < -60L && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_OUT) && lastClosestTimestamp.getBcType().equals(BC_TYPE_IN)) {
                         signIn.setRemark(SIGN_OUT_TIMEOUT);
                         globalIndex.setIndex(lastClosestTimestamp.getIndex());
                         result = false;
@@ -366,7 +365,7 @@ public class SignInServiceImpl implements ISignInService {
                         result = false;
                     }
                     // 当前最近无记录|签到,type:签到|签退  -> 签到超时给上
-                    else  {
+                    else {
                         signIn.setRemark(SIGN_IN_TIMEOUT);
                         globalIndex.setIndex(currentScheduling.getIndex());
                         result = false;
@@ -376,13 +375,13 @@ public class SignInServiceImpl implements ISignInService {
                 if (currentScheduling.getBcType().equals(BC_TYPE_IN) && Objects.isNull(currentScheduling.getSignInId())) {
                     DriverSignRecommendation lastClosestTimestamp = schedulingService.computedTheCurrentClosestTimestamp(dto, now, -1);
                     // 上一次无记|签退,type:签到  当前时间小于最近签退时间 -> 签到异常
-                    if (nowBetween < -60L && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_OUT)) {
+                    if (nowBetween < -60L && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_IN)) {
                         signIn.setRemark(SIGN_IN_TIMEOUT);
                         globalIndex.setIndex(lastClosestTimestamp.getIndex());
                         result = false;
                     }
                     // 当前无记|签退 ， type：签退|签到  ——> 签退异常
-                    else  {
+                    else {
                         signIn.setRemark(SIGN_OUT_TIMEOUT);
                         globalIndex.setIndex(currentScheduling.getIndex());
                         result = false;
@@ -404,7 +403,7 @@ public class SignInServiceImpl implements ISignInService {
         }
     }
  
-    private void uploadImage(SignIn signIn) throws IOException {
+    private void uploadImage(SignIn signIn, SignInResponseVo vo) throws IOException {
         String base64 = signIn.getImage();
         // 图片路径
         String filePath = RuoYiConfig.getUploadPath();
@@ -419,9 +418,10 @@ public class SignInServiceImpl implements ISignInService {
         // 获取文件上传路径
         String pathFileName = getPathFileName(filePath, fileName);
         signIn.setImage(pathFileName);
+        vo.setImage(signIn.getImage());
         log.info("开始上传签到图片");
         // 异步上传文件
-        threadJobConfig.asyncStartUploadBase64Image(absPath, base64);
+        threadJobService.asyncStartUploadBase64Image(absPath, base64);
     }
  
     /**
@@ -3,6 +3,7 @@ package com.ruoyi.job;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
+import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.cache.SchedulingCache;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.StringUtils;
@@ -51,6 +52,8 @@ import static com.ruoyi.common.redispre.GlobalRedisPreName.*;
 @Slf4j
 public class DriverJob implements InitializingBean {
  
+    @Resource
+    private NowSchedulingCache nowSchedulingCache;
  
     @Autowired
     private RedisCache redisCache;
@@ -92,6 +95,7 @@ public class DriverJob implements InitializingBean {
     @Value("${api.config.nonce}")
     private String nonce;
  
+    private static NowSchedulingCache NOW_SCHEDULING_CACHE;
     private static ThreadJobService THREAD_JOB_SERVICE;
     private static SchedulingCache SCHEDULING_CACHE;
     private static EquipmentMapper EQUIPMENT_MAPPER;
@@ -177,6 +181,7 @@ public class DriverJob implements InitializingBean {
         return result;
     }
  
+    // 弃用  无用方法
     public void clearExceptionYesterdayRecord() {
         // 获取当前日期时间
         Calendar calendar = Calendar.getInstance();
@@ -219,15 +224,30 @@ public class DriverJob implements InitializingBean {
     }
  
     private void deleteScheduling() {
-        String nowKey = DRIVER_SCHEDULING_PRE + ConstDateUtil.formatDate(new Date());
-        String yesterdayKey = DRIVER_SCHEDULING_PRE + ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1));
+        String nowDate = ConstDateUtil.formatDate(new Date());
+        String yesterdayDate = ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1));
+
+        String nowKey = DRIVER_SCHEDULING_PRE + nowDate;
+        String yesterdayKey = DRIVER_SCHEDULING_PRE + yesterdayDate;
+        // 考情keys
+        List<String> nowKeys = NOW_SCHEDULING_CACHE.getKes();
+        // 实时keys
         List<String> keys = SCHEDULING_CACHE.getKeys();
+
+        // 删除实时排班
         for (int i = 0; i < keys.size(); i++) {
             if (nowKey.equals(keys.get(i)) || yesterdayKey.equals(keys.get(i))){
                 continue;
             }
             SCHEDULING_CACHE.removeCacheSchedulingByKey(keys.get(i));
         }
+        // 删除考勤
+        for (int i = 0; i < nowKeys.size(); i++) {
+            if (nowDate.equals(nowKeys.get(i)) || yesterdayDate.equals(nowKeys.get(i))){
+                continue;
+            }
+            NOW_SCHEDULING_CACHE.removeCacheSchedulingByKey(nowKeys.get(i));
+        }
     }
  
     /**
@@ -286,11 +306,10 @@ public class DriverJob implements InitializingBean {
             List<ResponseSchedulingDto> schedulingList = driverSchedulingMap.get(key);
             schedulingList.sort(Comparator.comparing(ResponseSchedulingDto::getFcsjT));
         }
-        // 存入数据库
+        // 存入签到报表
         THREAD_JOB_SERVICE.asyncComputedScheduling(driverSchedulingMap);
-        // 存入缓存
+        // 实时排班直接存入缓存
         SCHEDULING_CACHE.setCacheScheduling(DRIVER_SCHEDULING_PRE + dateKey, driverSchedulingMap);
-//        REDIS_CACHE.setCacheMap(DRIVER_SCHEDULING_PRE + dateKey, driverSchedulingMap, 2, TimeUnit.DAYS);
         log.info("拉取排班完毕:{}", dateKey);
         return driverSchedulingMap;
     }
@@ -484,5 +503,6 @@ public class DriverJob implements InitializingBean {
         APP_SECRET = appSecret;
         SCHEDULING_CACHE = schedulingCache;
         EQUIPMENT_MAPPER = equipmentMapper;
+        NOW_SCHEDULING_CACHE = nowSchedulingCache;
     }
 }
 package com.ruoyi.pojo.entity;
  
 import lombok.Data;
+import org.apache.poi.hpsf.Decimal;
  
+import java.math.BigDecimal;
 import java.util.Date;
  
 @Data
@@ -19,4 +21,13 @@ public class DriverScheduling {
     private Long zdsjT;
     private Long signInId;
     private Integer exType;
+    private Integer signType;
+    private Date signTime;
+    private Integer alcoholFlag;
+    private BigDecimal alcoholIntake;
+    private String remark;
+    /**
+     * 不是当前表的属性
+     */
+    private String fleetName;
 }
@@ -26,16 +26,21 @@ public class ReportErrorRequestVo {
      * 错误类型
      */
     @ApiModelProperty("错误类型")
-    private String errorType;
+    private Integer exType;
     /**
-     * 开始时间
+     * 错误类型
+     */
+    @ApiModelProperty("场地名称")
+    private String siteName;
+    /**
+     * 指定日期
      */
-    @ApiModelProperty("开始时间")
-    private String startTime;
+    @ApiModelProperty("指定日期")
+    private String date;
     /**
-     * 结束时间
+     * 主键
      */
-    @ApiModelProperty("结束时间")
-    private String endTime;
+    @ApiModelProperty("主键")
+    private String id;
  
 }
+package com.ruoyi.pojo.response;
+
+import com.ruoyi.eexception.domain.EquipmentException;
+import lombok.Data;
+
+/**
+ *
+ * @author 20412
+ */
+@Data
+public class EquipmentExceptionResponseVo extends EquipmentException {
+    /**
+     * 姓名
+     */
+    private String personnelName;
+    /**
+     * 场地名称
+     */
+    private String siteName;
+
+}
 package com.ruoyi.pojo.response;
  
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.pojo.entity.DriverScheduling;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
  
+import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
  
 /**
  * @author 20412
  */
 @Data
 @ApiModel("报表对象表")
+@HeadRowHeight(25)
+@HeadFontStyle(fontHeightInPoints = 10,fontName = "黑体")
 public class ExportReportViewResponseVo {
     @ExcelProperty(value = "工号")
     private String jobCode;
@@ -23,41 +35,127 @@ public class ExportReportViewResponseVo {
     @ExcelProperty(value = "线路")
     private String lineName;
  
-    @ApiModelProperty("车队名称")
-    @ExcelProperty(value = "车队名称")
+    @ApiModelProperty("部门")
+    @ExcelProperty(value = "部门")
+    @ColumnWidth(12)
     private String fleetName;
  
     @ExcelProperty(value = "车辆自编号")
+    @ColumnWidth(12)
     private String nbbm;
  
     @ExcelProperty(value = "计划签到时间")
+    @ColumnWidth(20)
     private Date planSignInTime;
     @ExcelProperty(value = "实际签到时间")
+    @ColumnWidth(20)
     private Date actualSignInTime;
+    @ExcelProperty(value = "是否酒精测试")
+    @ColumnWidth(12)
+    private String alcoholStringIn;
+    @ExcelProperty(value = "酒精测试含量")
+    @ColumnWidth(12)
+    private BigDecimal alcoholIntakeIn;
     @ExcelProperty(value = "签到结果")
+    @ColumnWidth(12)
     private String signInResultString;
     @ExcelProperty(value = "计划签退时间")
+    @ColumnWidth(20)
     private Date planSignOutTime;
     @ExcelProperty(value = "实际签退时间")
+    @ColumnWidth(20)
     private Date actualSignOutTime;
+    @ExcelProperty(value = "是否酒精测试")
+    @ColumnWidth(12)
+    private String alcoholStringOut;
+    @ExcelProperty(value = "酒精测试含量")
+    @ColumnWidth(12)
+    private BigDecimal alcoholIntakeOut;
     @ExcelProperty(value = "签退结果")
     private String signOutResultString;
  
+    @ExcelProperty(value = "有无分班")
+    private String haveSecondFlagString;
  
     @ExcelProperty(value = "分班计划签到时间")
+    @ColumnWidth(20)
     private Date secondPlanSignInTime;
     @ExcelProperty(value = "分班实际签到时间")
+    @ColumnWidth(20)
     private Date secondActualSignInTime;
+
+    @ExcelProperty(value = "是否酒精测试")
+    @ColumnWidth(12)
+    private String secondAlcoholStringIn;
+    @ExcelProperty(value = "酒精测试含量")
+    @ColumnWidth(12)
+    private BigDecimal secondAlcoholIntakeIn;
     @ExcelProperty(value = "分班签到结果")
+    @ColumnWidth(12)
     private String secondSignInResultString;
     @ExcelProperty(value = "分班计划签退时间")
+    @ColumnWidth(20)
     private Date secondPlanSignOutTime;
     @ExcelProperty(value = "分班实际签退时间")
+    @ColumnWidth(20)
     private Date secondActualSignOutTime;
+
+    @ExcelProperty(value = "是否酒精测试")
+    @ColumnWidth(12)
+    private String secondAlcoholStringOut;
+    @ExcelProperty(value = "酒精测试含量")
+    @ColumnWidth(12)
+    private BigDecimal secondAlcoholIntakeOut;
     @ExcelProperty(value = "分班签退结果")
+    @ColumnWidth(12)
     private String secondSignOutResultString;
  
     @ExcelProperty(value = "排班日期")
-    private Date schedulingDate;
+    @ColumnWidth(20)
+    private Date scheduleDate;
+
+    public ExportReportViewResponseVo(List<DriverScheduling> driverSchedulings) {
+        BeanUtils.copyProperties(driverSchedulings.get(0), this);
+        int size = driverSchedulings.size();
+        this.setHaveSecondFlagString(size >= 4 ? "有分班":"无分班");
+        if (size <= 3) {
+            handleFirst(driverSchedulings, size);
+        }
+        // 有分班
+        else {
+            // 签到
+            handleFirst(driverSchedulings, 2);
+            handelSecond(driverSchedulings, size);
+        }
+    }
+
+    private void handelSecond(List<DriverScheduling> driverSchedulings, int size) {
+        // 签到
+        this.setSecondPlanSignInTime(new Date(driverSchedulings.get(2).getFcsjT()));
+        this.setSecondActualSignInTime(driverSchedulings.get(2).getSignTime());
+        this.setSecondAlcoholStringIn(ALCOHOL_FLAG_YES.equals(driverSchedulings.get(2).getAlcoholFlag()) ? ALCOHOL_FLAG_YES_STRING : ALCOHOL_FLAG_NO_STRING);
+        this.setSecondAlcoholIntakeIn(driverSchedulings.get(2).getAlcoholIntake());
+        this.setSecondSignInResultString(Objects.isNull(driverSchedulings.get(2).getSignInId()) ? "未签到" : driverSchedulings.get(2).getRemark());
+        // 签退
+        this.setSecondPlanSignOutTime(new Date(driverSchedulings.get(size - 1).getZdsjT()));
+        this.setSecondActualSignOutTime(driverSchedulings.get(size - 1).getSignTime());
+        this.setSecondAlcoholStringOut(ALCOHOL_FLAG_YES.equals(driverSchedulings.get(size - 1).getAlcoholFlag()) ? ALCOHOL_FLAG_YES_STRING : ALCOHOL_FLAG_NO_STRING);
+        this.setSecondAlcoholIntakeOut(driverSchedulings.get(size - 1).getAlcoholIntake());
+        this.setSecondSignInResultString(Objects.isNull(driverSchedulings.get(size -1).getSignInId()) ? "未签退" : driverSchedulings.get(size -1).getRemark());
+    }
  
+    private void handleFirst(List<DriverScheduling> driverSchedulings, int size) {
+        // 签到
+        this.setPlanSignInTime(new Date(driverSchedulings.get(0).getFcsjT()));
+        this.setActualSignInTime(driverSchedulings.get(0).getSignTime());
+        this.setAlcoholStringIn(ALCOHOL_FLAG_YES.equals(driverSchedulings.get(0).getAlcoholFlag()) ? ALCOHOL_FLAG_YES_STRING : ALCOHOL_FLAG_NO_STRING);
+        this.setAlcoholIntakeIn(driverSchedulings.get(0).getAlcoholIntake());
+        this.setSignInResultString(Objects.isNull(driverSchedulings.get(0).getSignInId()) ? "未签到": driverSchedulings.get(0).getRemark());
+        // 签退
+        this.setPlanSignOutTime(new Date(driverSchedulings.get(size - 1).getZdsjT()));
+        this.setActualSignOutTime(driverSchedulings.get(size - 1).getSignTime());
+        this.setAlcoholStringOut(ALCOHOL_FLAG_YES.equals(driverSchedulings.get(size - 1).getAlcoholFlag()) ? ALCOHOL_FLAG_YES_STRING : ALCOHOL_FLAG_NO_STRING);
+        this.setAlcoholIntakeOut(driverSchedulings.get(size - 1).getAlcoholIntake());
+        this.setSignOutResultString(Objects.isNull(driverSchedulings.get(size - 1).getSignInId()) ? "未签退": driverSchedulings.get(size - 1).getRemark());
+    }
 }
@@ -11,10 +11,14 @@ import java.util.Date;
 @Data
 @ApiModel("签到报表查看详情vo")
 public class ReportDetailResponseVo {
+    private String jobCode;
     private String name;
     private String posts;
     private String lineName;
     private String lpName;
+    private String fleetName;
+    private String nbbm;
+    private String exString;
     /**
      * 计划操作
      */
@@ -24,15 +28,19 @@ public class ReportDetailResponseVo {
      */
     private String actualAction;
     /**
-     * 是否酒精测试
+     * 打卡时间
      */
-    private Boolean alcoholFlag;
+    private Date planTime;
     /**
-     * 签到时间
+     * 实际打卡时间
      */
-    private Date createTime;
+    private Date actualTime;
     /**
      * 原因
      */
     private String remark;
+    /**
+     * 是否酒精测试
+     */
+    private String alcoholString;
 }
@@ -18,7 +18,7 @@ import java.util.Date;
 public class ReportErrorResponseVo {;
     @ApiModelProperty("异常类型")
     @ExcelProperty(value = "异常类型")
-    private String errorType;
+    private Integer exType;
     @ApiModelProperty("姓名")
     @ExcelProperty(value = "姓名")
     private String name;
@@ -31,14 +31,18 @@ public class ReportErrorResponseVo {;
     @ApiModelProperty("设备id")
     @ExcelProperty(value = "设备id")
     private String deviceId;
-    @ApiModelProperty("时间")
-    @ExcelProperty(value = "时间")
+    @ExcelProperty(value = "场地名称")
+    private String siteName;
+    @ApiModelProperty("发生时间")
+    @ExcelProperty(value = "发生时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date createTime;
-    @ApiModelProperty("备注")
-    @ExcelProperty(value = "备注")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+
+    @ApiModelProperty("标题")
+    @ExcelProperty(value = "标题")
+    private String title;
+    @ApiModelProperty("详情")
+    @ExcelProperty(value = "详情")
     private String remark;
 }
@@ -37,6 +37,7 @@ public class ReportViewResponseVo {
     @ApiModelProperty("车辆自编号")
     private String lpName;
  
+
     private Integer planSignInCount;
     private Integer actualSignInCount;
     private Integer planSignOutCount;
@@ -24,6 +24,12 @@ public class SignInResponseVo extends SignIn {
     @Excel( name = "场地名称")
     String siteName;
  
+    @ExcelIgnore
+    /**
+     * 打卡日期
+     */
+    String date;
+
     public SignInResponseVo(SignIn signIn){
         this.setDeviceId(signIn.getDeviceId());
         this.setId(signIn.getId());
@@ -10,21 +10,28 @@ import com.ruoyi.in.mapper.SignInMapper;
 import com.ruoyi.pojo.entity.DriverScheduling;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
-import com.ruoyi.pojo.response.ReportDetailResponseVo;
-import com.ruoyi.pojo.response.ReportErrorResponseVo;
-import com.ruoyi.pojo.response.ReportSignInResponseVo;
-import com.ruoyi.pojo.response.ReportViewResponseVo;
+import com.ruoyi.pojo.response.*;
+import com.ruoyi.utils.ConstDateUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotBlank;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
  
+import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
 import static com.ruoyi.common.ErrorTypeProperties.EQUIPMENT_ERROR;
 import static com.ruoyi.common.ErrorTypeProperties.SIGN_IN_ERROR;
+import static com.ruoyi.common.ReportProperties.DAY;
+import static com.ruoyi.common.ReportProperties.MONTH;
  
 /**
  * @author 20412
@@ -51,86 +58,138 @@ public class ReportService {
      * 查询报表信息
      */
     public List<ReportViewResponseVo> getReportScrollViewTable(ReportViewRequestVo requestVo, HttpServletResponse response) {
-        List<ReportViewResponseVo> reportScrollViewTable = schedulingService.queryReportTableResponseVo(requestVo,response);
+        List<ReportViewResponseVo> reportScrollViewTable = schedulingService.queryReportTableResponseVo(requestVo, response);
         return reportScrollViewTable;
     }
  
     public List<ReportErrorResponseVo> getErrorReportList(ReportErrorRequestVo request) {
-        // 获取基础报表信息
-        List<SignIn> signInList = signInMapper.getSignErrorList(request);
-        List<EquipmentException> exceptionList = exceptionMapper.getEquipmentErrorList(request);
-        // 封装到集合返回前端
-        List<ReportErrorResponseVo> responses = new ArrayList<>();
-        // 获取对应名称
-        Set<String> jobCodes = new HashSet<>();
-        signInList.stream().forEach(item -> {
-            jobCodes.add(item.getJobCode());
-        });
-        exceptionList.stream().forEach(item -> {
-            jobCodes.add(item.getJobCode());
-        });
-        Map<String, String> names = driverMapper.getNameByJobCode(jobCodes).stream().collect(Collectors.toMap(Driver::getJobCode, Driver::getPersonnelName));
-        if (SIGN_IN_ERROR.equals(request.getErrorType())) {
-            copyToResponse(names, signInList, responses);
-        } else if (EQUIPMENT_ERROR.equals(request.getErrorType())) {
-            copyToResponseByException(names, exceptionList, responses);
-        } else {
-            copyToResponse(names, signInList, responses);
-            copyToResponseByException(names, exceptionList, responses);
-        }
-        responses = sortListByCreateTime(responses);
-
-        // 清除缓存
-        jobCodes.clear();
-        signInList.clear();
-        exceptionList.clear();
-        return responses;
+        List<EquipmentExceptionResponseVo> list = exceptionMapper.selectEquipmentExceptionListByVo(request);
+        return list.stream().map(item->{
+            ReportErrorResponseVo vo = new ReportErrorResponseVo();
+            vo.setRemark(item.getRemark());
+            vo.setName(item.getPersonnelName());
+            vo.setSiteName(item.getSiteName());
+            vo.setImage(item.getImage());
+            vo.setJobCode(item.getJobCode());
+            vo.setDeviceId(item.getDeviceId());
+            vo.setExType(item.getExType());
+            vo.setCreateTime(item.getCreateTime());
+            vo.setTitle(item.getTitle());
+            return vo;
+        }).collect(Collectors.toList());
     }
  
-    private List<ReportErrorResponseVo> sortListByCreateTime(List<ReportErrorResponseVo> responses) {
-        responses = responses.stream().sorted(Comparator.comparing(ReportErrorResponseVo::getCreateTime, Comparator.reverseOrder())).collect(Collectors.toList());
-        return responses;
+
+
+    public List<ExportReportViewResponseVo> exportReportList(ReportViewRequestVo requestVo, HttpServletResponse response) {
+        //  处理天
+        if (requestVo.getExportFlag().equals(DAY)){
+            return getDayReportTableResponseVo(requestVo.getDate(),response);
+        }
+        // 处理月
+        else if (requestVo.getExportFlag().equals(MONTH)) {
+            return getMonthReportTableResponseVo(requestVo, response);
+        }
+        return null;
     }
  
-    private void copyToResponseByException(Map<String, String> names, List<EquipmentException> exceptionList, List<ReportErrorResponseVo> responses) {
-        exceptionList.forEach(item -> {
-            ReportErrorResponseVo vo = new ReportErrorResponseVo();
-            vo.setName(names.get(item.getJobCode()));
-            vo.setImage(item.getImage());
-            vo.setRemark(item.getRemark());
-            vo.setCreateTime(item.getCreateTime());
-            vo.setDeviceId(item.getDeviceId());
-            vo.setErrorType(EQUIPMENT_ERROR);
-            responses.add(vo);
-        });
+    private List<ExportReportViewResponseVo> getDayReportTableResponseVo(String date, HttpServletResponse response) {
+        List<DriverScheduling> schedulingList = schedulingMapper.queryToDay(date, null, null, null);
+        Map<String,List<DriverScheduling>> resultMap = new HashMap<>(800);
+        List<ExportReportViewResponseVo> vo = new ArrayList<>(800);
+        handleResultMap(date,resultMap,schedulingList);
+        handleResultList(vo,resultMap);
+        return vo;
     }
  
-    private void copyToResponse(Map<String, String> names, List<SignIn> signInList, List<ReportErrorResponseVo> responses) {
-        signInList.forEach(item -> {
-            ReportErrorResponseVo vo = new ReportErrorResponseVo();
-            vo.setName(names.get(item.getJobCode()));
-            vo.setImage(item.getImage());
-            vo.setRemark(item.getRemark());
-            vo.setCreateTime(item.getCreateTime());
-            vo.setJobCode(item.getJobCode());
-//            vo.setDeviceId();
-            vo.setErrorType(SIGN_IN_ERROR);
-            responses.add(vo);
-        });
+    private void handleResultList(List<ExportReportViewResponseVo> vo, Map<String, List<DriverScheduling>> resultMap) {
+        for (String key : resultMap.keySet()) {
+            resultMap.get(key).sort(Comparator.comparing(DriverScheduling::getFcsjT));
+            vo.add(new ExportReportViewResponseVo(resultMap.get(key)) );
+        }
     }
  
-    public String getDateDay(Date createTime) {
-        SimpleDateFormat simple = new SimpleDateFormat("yyyy-MM-dd");
-        return simple.format(createTime);
+    private void handleResultMap(@NotBlank String date, Map<String, List<DriverScheduling>> resultMap, List<DriverScheduling> schedulingList) {
+        for (DriverScheduling item : schedulingList) {
+            String key = date + item.getJobCode();
+            if (Objects.isNull(resultMap.get(key))){
+                resultMap.put(key,new ArrayList<>(Arrays.asList(item)));
+            }else {
+                resultMap.get(key).add(item);
+            }
+        }
     }
  
-    public List<ReportViewResponseVo> exportReportList(ReportViewRequestVo requestVo, HttpServletResponse response) {
+    private List<ExportReportViewResponseVo> getMonthReportTableResponseVo(ReportViewRequestVo requestVo, HttpServletResponse response) {
+        List<ExportReportViewResponseVo> responseVos = new ArrayList<>(10000);
+        List<String> days = getNowMonthAllDay(requestVo.getDate());
+        for (String day : days) {
+            List<ExportReportViewResponseVo> dayReportTableResponseVo = getDayReportTableResponseVo(day, response);
+            responseVos.addAll(dayReportTableResponseVo);
+        }
+        return responseVos;
+    }
  
-        return null;
+    private List<String> getNowMonthAllDay(@NotBlank String dateString) {
+        // 获取当前年月
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDate formatDate = LocalDate.parse(dateString, formatter);
+        int month = formatDate.getMonthValue();
+        int year = formatDate.getYear();
+        YearMonth yearMonth = YearMonth.of(year,month);
+
+        // 获取当前月份的第一天和最后一天日期
+        LocalDate firstDay = yearMonth.atDay(1);
+        LocalDate lastDay = yearMonth.atEndOfMonth();
+
+        // 获取当前月份的所有日期集合
+        List<String> datesInMonth = new ArrayList<>();
+        LocalDate date = firstDay;
+        while (!date.isAfter(lastDay)) {
+            datesInMonth.add(date.toString());
+            date = date.plusDays(1);
+        }
+        return datesInMonth;
     }
  
     public List<ReportDetailResponseVo> getReportDetail(ReportViewRequestVo vo, HttpServletResponse response) {
+        List<ReportDetailResponseVo> responseVos = new ArrayList<>();
         List<DriverScheduling> toDay = schedulingMapper.queryToDay(vo.getDate(), vo.getName(), vo.getJobCode(), vo.getLineName());
-        return null;
+        for (DriverScheduling scheduling : toDay) {
+            ReportDetailResponseVo reportDetailResponseVo = new ReportDetailResponseVo();
+            handleReportDetail(reportDetailResponseVo, scheduling);
+            responseVos.add(reportDetailResponseVo);
+        }
+        responseVos.sort(Comparator.comparing(ReportDetailResponseVo::getPlanTime));
+        return responseVos;
+    }
+
+    private void handleReportDetail(ReportDetailResponseVo reportDetailResponseVo, DriverScheduling scheduling) {
+        BeanUtils.copyProperties(scheduling, reportDetailResponseVo);
+        reportDetailResponseVo.setPlanAction(scheduling.getBcType().equals(BC_TYPE_OUT) ? SIGN_IN_STRING : SIGN_IN_OUT_STRING);
+        reportDetailResponseVo.setPlanTime(scheduling.getBcType().equals(BC_TYPE_OUT) ? new Date(scheduling.getFcsjT()) : new Date(scheduling.getZdsjT()));
+        reportDetailResponseVo.setExString(SIGN_NO_EX_NUM.equals(scheduling.getExType()) ? NO_EX : HAVE_EX);
+
+        // 设置操作 当前有操作的
+        if (!Objects.isNull(scheduling.getSignInId())) {
+            reportDetailResponseVo.setActualTime(scheduling.getSignTime());
+            reportDetailResponseVo.setActualAction(scheduling.getSignType().equals(SIGN_IN) ? SIGN_IN_STRING : SIGN_IN_OUT_STRING);
+            reportDetailResponseVo.setRemark(scheduling.getRemark());
+            reportDetailResponseVo.setAlcoholString(ALCOHOL_FLAG_YES.equals(scheduling.getAlcoholFlag()) ? ALCOHOL_FLAG_YES_STRING : ALCOHOL_FLAG_NO_STRING);
+        }
+        // 当前无操作
+        else {
+            reportDetailResponseVo.setRemark(scheduling.getBcType().equals(BC_TYPE_OUT) ? "未签到" : "未签退");
+            reportDetailResponseVo.setAlcoholString(ALCOHOL_FLAG_NO_STRING);
+        }
+
+    }
+
+    public List<SignInResponseVo> getBigView(ReportViewRequestVo requestVo, HttpServletResponse response) {
+        SignInResponseVo vo = new SignInResponseVo();
+        vo.setDate(requestVo.getDate());
+        vo.setJobCode(requestVo.getJobCode());
+        List<SignInResponseVo> vos = signInMapper.selectSignInList(vo);
+        return vos;
     }
 }
 package com.ruoyi.service;
  
 import cn.hutool.core.collection.CollectionUtil;
+import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.mapper.SignInMapper;
@@ -14,6 +15,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -34,6 +36,9 @@ import static com.ruoyi.common.ReportProperties.NOW;
 @Service
 public class SchedulingService {
  
+    @Resource
+    private NowSchedulingCache nowSchedulingCache;
+
     @Autowired
     private DriverSchedulingMapper schedulingMapper;
  
@@ -48,10 +53,9 @@ public class SchedulingService {
      * @return
      */
     public List<DriverScheduling> queryScheduling(String jobCode, Long now) {
-        // TODO 查表变成缓存查询
         List<DriverScheduling> dto = null;
         for (int i = 0; i > -2; i--) {
-            dto = schedulingMapper.queryToDay(ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(i)), null, jobCode, null);
+            dto = nowSchedulingCache.getCacheSchedulingMapValueByHKey(ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(i)),jobCode);
             if (!CollectionUtil.isEmpty(dto)) {
                 dto.sort(Comparator.comparing(DriverScheduling::getZdsjT));
                 if (i == -1) {
@@ -69,6 +73,7 @@ public class SchedulingService {
         return dto;
     }
  
+
     /**
      * 计算签到逻辑
      *
@@ -105,14 +110,19 @@ public class SchedulingService {
      * @param globalIndex
      */
     public void computedSignInBySignIn(List<DriverScheduling> dto, SignIn signIn, GlobalIndex globalIndex) {
+        // 无排班不记录不在考勤表不更新
+        if (CollectionUtil.isEmpty(dto)) {
+            return;
+        }
+
         // 更新最新的签到记录判断是否需要更新考勤
         // 记录为空直接插入记录
         if (Objects.isNull(dto.get(globalIndex.getIndex()).getSignInId())) {
-            schedulingMapper.updateRoster(dto.get(globalIndex.getIndex()), signIn.getId(), signIn.getExType());
+            schedulingMapper.updateRoster(dto.get(globalIndex.getIndex()), signIn.getId(), signIn.getExType(), signIn.getCreateTime(), signIn.getRemark(), signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
         }
         // 之前的无效
         else if (!dto.get(globalIndex.getIndex()).getExType().equals(SIGN_NO_EX_NUM)) {
-            schedulingMapper.updateRoster(dto.get(globalIndex.getIndex()), signIn.getId(), signIn.getExType());
+            schedulingMapper.updateRoster(dto.get(globalIndex.getIndex()), signIn.getId(), signIn.getExType(), signIn.getCreateTime(), signIn.getRemark(), signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
         }
         // 之前的有效
         else {
@@ -134,9 +144,8 @@ public class SchedulingService {
             signIn.setRemark(signIn.getRemark().replaceFirst(",$", "。"));
             signInMapper.updateSignIn(signIn);
         }
-
         // 之前是签到 |  目前无效 -》往后更新
-        schedulingMapper.updateRoster(dto.get(globalIndex.getIndex() + 1), signIn.getId(), signIn.getExType());
+        schedulingMapper.updateRoster(dto.get(globalIndex.getIndex() + 1), signIn.getId(), signIn.getExType(), signIn.getCreateTime(), signIn.getRemark(), signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
     }
  
     public List<ReportViewResponseVo> queryReportTableResponseVo(ReportViewRequestVo requestVo, HttpServletResponse response) {
@@ -3,6 +3,7 @@ package com.ruoyi.service;
  
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.http.HttpUtil;
+import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.exception.file.FileUploadException;
 import com.ruoyi.common.utils.StringUtils;
@@ -10,6 +11,9 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
+import com.ruoyi.eexception.domain.EquipmentException;
+import com.ruoyi.eexception.mapper.EquipmentExceptionMapper;
+import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.job.DriverJob;
 import com.ruoyi.pojo.entity.DriverScheduling;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
@@ -29,12 +33,15 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.springframework.web.client.RestTemplate;
 import sun.misc.BASE64Decoder;
  
+import javax.annotation.Resource;
 import java.io.*;
 import java.util.*;
 import java.util.stream.Collectors;
  
 import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_IN;
 import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
+import static com.ruoyi.common.ConstEquipmentProperties.*;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.SIGN_NO_EX_NUM;
  
  
 /**
@@ -53,10 +60,16 @@ public class ThreadJobService {
     @Autowired
     private DriverSchedulingMapper schedulingMapper;
  
+    @Resource
+    private NowSchedulingCache nowSchedulingCache;
+
  
     @Autowired
     private PlatformTransactionManager transactionManager;
  
+    @Autowired
+    private EquipmentExceptionMapper exceptionMapper;
+
     @Value("${api.headImage}")
     private String headImagePre;
  
@@ -115,6 +128,22 @@ public class ThreadJobService {
     }
  
     @Async
+    public void asyncInsertExceptionRecord(SignIn signIn){
+        if (!SIGN_NO_EX_NUM.equals(signIn.getExType())){
+            EquipmentException exception = new EquipmentException();
+            exception.setExType(signIn.getExType());
+            exception.setDeviceId(signIn.getDeviceId());
+            exception.setJobCode(signIn.getJobCode());
+            exception.setStatus(EQUIPMENT_PROCESS_FLOW_COMMIT);
+            exception.setImage(signIn.getImage());
+            exception.setTitle("打卡异常");
+            exception.setRemark(signIn.getRemark());
+            exception.setCreateTime(signIn.getCreateTime());
+            exceptionMapper.insertEquipmentException(exception);
+        }
+    }
+
+    @Async
     public void asyncUploadDriverWithUpdateImageUrl(List<Driver> drivers, String token) {
         // 插入数据
         for (Driver driver : drivers) {
@@ -254,10 +283,18 @@ public class ThreadJobService {
     public void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap) {
         //查询当天是否保存过考情表  如果存在则保存
         List<DriverScheduling> dto = schedulingMapper.queryToDay(ConstDateUtil.formatDate("yyyy-MM-dd"), null,null,null);
+        // 存入缓存
         if (!CollectionUtil.isEmpty(dto) || originSchedulingMap.size() == 0) {
-//            log.info("今天已获取过考勤数据");
+            String date = ConstDateUtil.formatDate(new Date());
+            if (CollectionUtil.isEmpty(nowSchedulingCache.getCacheScheduling(date))){
+                Map<String, List<DriverScheduling>> resultMap =new HashMap<>(800);
+                handleResultMap(resultMap,dto);
+                nowSchedulingCache.setCacheScheduling(date,resultMap);
+            }
             return;
         }
+
+
         List<DriverScheduling> bcList = new ArrayList<>(1000);
         for (String key : originSchedulingMap.keySet()) {
             List<ResponseSchedulingDto> schedulingList = originSchedulingMap.get(key);
@@ -279,4 +316,15 @@ public class ThreadJobService {
         schedulingMapper.insertRoster(bcList);
     }
  
+    private void handleResultMap(Map<String, List<DriverScheduling>> resultMap, List<DriverScheduling> schedulingList) {
+        for (DriverScheduling scheduling : schedulingList) {
+            List<DriverScheduling> list = resultMap.get(scheduling.getJobCode());
+            if (CollectionUtil.isEmpty(list)){
+                resultMap.put(scheduling.getJobCode(),new ArrayList<>(Arrays.asList(scheduling)));
+            }else {
+                list.add(scheduling);
+            }
+        }
+    }
+
 }
 package com.ruoyi.utils;
  
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -21,6 +22,7 @@ public class ConstDateUtil {
         return simpleDateFormat.format(date);
     }
  
+
     public static Date getTheSpecifiedNumberOfDaysOfTime(Integer amount) {
         // 获取当前日期时间
         Calendar calendar = Calendar.getInstance();
@@ -19,7 +19,9 @@
         <result column="zdsj_t" property="zdsjT" jdbcType="BIGINT"/>
         <result column="sign_in_id" property="signInId" jdbcType="BIGINT"/>
         <result column="ex_type" property="exType" jdbcType="TINYINT"/>
-
+        <result column="sign_time" property="signTime" jdbcType="DATETIMEOFFSET"/>
+        <result column="alcohol_flag" property="alcoholFlag" jdbcType="DATETIMEOFFSET"/>
+        <result column="alcohol_intake" property="alcoholIntake"/>
     </resultMap>
     <insert id="insertRoster" useGeneratedKeys="true" keyProperty="id">
         insert into scheduling (schedule_date,line_name,job_code,`name`,posts,lp_name,nbbm,bc_type,fcsj_t,zdsj_t)
@@ -45,22 +47,27 @@
     <update id="updateRoster">
         update scheduling
         set sign_in_id = #{signInId},
-            ex_type    = #{exType}
+            ex_type    = #{exType},
+            sign_time = #{signTime},
+            remark = #{remark},
+            sign_type = #{signType},
+            alcohol_flag = #{alcoholFlag},
+            alcohol_intake = #{alcoholIntake}
         where id = #{scheduling.id}
     </update>
  
     <select id="queryToDay" resultType="com.ruoyi.pojo.entity.DriverScheduling" resultMap="Scheduling">
-        select * from
-        scheduling
+        select scheduling.*,driver.fleet_name fleetName from
+        scheduling join driver on driver.job_code = scheduling.job_code
         where schedule_date = #{date}
         <if test="jobCode !=null and jobCode != ''">
-            and job_code = #{jobCode}
+            and driver.job_code = #{jobCode}
         </if>
         <if test="name !=null and name != ''">
             and `name` = #{name}
         </if>
         <if test="lineName !=null and lineName != ''">
-            and line_name = #{lineName}
+            and scheduling.line_name like  concat('%', #{lineName}, '%')
         </if>
  
     </select>
@@ -4,6 +4,19 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.eexception.mapper.EquipmentExceptionMapper">
  
+    <resultMap type="com.ruoyi.pojo.response.EquipmentExceptionResponseVo" id="EquipmentExceptionResponseResult">
+        <result property="id"    column="id"    />
+        <result property="title"    column="title"    />
+        <result property="deviceId"    column="device_id"    />
+        <result property="jobCode"    column="job_code"    />
+        <result property="image"    column="image"    />
+        <result property="status"    column="status"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="exType"    column="ex_type"    />
+        <result property="personnelName"    column="personnel_name"    />
+        <result property="siteName"    column="site_name"    />
+    </resultMap>
     <resultMap type="EquipmentException" id="EquipmentExceptionResult">
         <result property="id"    column="id"    />
         <result property="title"    column="title"    />
@@ -13,19 +26,22 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="status"    column="status"    />
         <result property="createTime"    column="create_time"    />
         <result property="remark"    column="remark"    />
+        <result property="exType"    column="ex_type"    />
     </resultMap>
  
     <sql id="selectEquipmentExceptionVo">
-        select id, title, device_id, job_code, image, status, create_time, remark from equipment_exception
+        select id, title, device_id, job_code, image, status, create_time, remark,ex_type from equipment_exception
     </sql>
  
-    <select id="selectEquipmentExceptionList" parameterType="EquipmentException" resultMap="EquipmentExceptionResult">
-        <include refid="selectEquipmentExceptionVo"/>
-        <where>  
+    <select id="selectEquipmentExceptionList" parameterType="com.ruoyi.pojo.response.EquipmentExceptionResponseVo" resultMap="EquipmentExceptionResponseResult">
+        select equipment_exception.id, title, equipment.site_name , equipment_exception.device_id,driver.personnel_name,driver.job_code, equipment_exception.image, equipment_exception.status, equipment_exception.create_time, equipment_exception.ex_type,equipment_exception.remark
+        from
+            equipment_exception join driver on driver.job_code = equipment_exception.job_code join equipment on equipment.device_id = equipment_exception.device_id
+        <where>
+            ex_type = 4
             <if test="title != null  and title != ''"> and title = #{title}</if>
             <if test="deviceId != null "> and device_id = #{deviceId}</if>
-            <if test="jobCode != null  and jobCode != ''"> and job_code = #{jobCode}</if>
-            <if test="image != null  and image != ''"> and image = #{image}</if>
+            <if test="jobCode != null  and jobCode != ''"> and driver.job_code = #{jobCode}</if>
             <if test="status != null "> and status = #{status}</if>
         </where>
         order by id desc
@@ -46,6 +62,25 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             and job_code = #{jobCode}
         </if>
     </select>
+    <select id="selectEquipmentExceptionListByVo"
+            resultType="com.ruoyi.pojo.response.EquipmentExceptionResponseVo" resultMap="EquipmentExceptionResponseResult">
+
+        select equipment_exception.id, title, equipment.site_name , equipment_exception.device_id,driver.personnel_name,driver.job_code, equipment_exception.image, equipment_exception.status, equipment_exception.create_time, equipment_exception.ex_type,equipment_exception.remark
+        from
+        equipment_exception join driver on driver.job_code = equipment_exception.job_code join equipment on equipment.device_id = equipment_exception.device_id
+        <where>
+            equipment_exception.`status` != 1
+            <if test="siteName != null  and siteName != ''"> and equipment.site_name = #{siteName}</if>
+            <if test="jobCode != null  and jobCode != ''"> and driver.job_code = #{jobCode}</if>
+            <if test="exType != null "> and ex_type = #{exType}</if>
+            <if test="id != null "> and equipment_exception.id #{id}</if>
+            <if test="date != null "> and equipment_exception.create_time like concat(#{date},'%')</if>
+        </where>
+    </select>
+    <select id="selectEquipmentExceptionByDeviceIdStatus"
+            resultType="com.ruoyi.eexception.domain.EquipmentException">
+        select id from equipment_exception where device_id = #{deviceId} and ex_type = 4 and  `status` != 1 limit 1
+    </select>
  
     <insert id="insertEquipmentException" parameterType="EquipmentException" useGeneratedKeys="true" keyProperty="id">
         insert into equipment_exception
@@ -57,6 +92,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="status != null">status,</if>
             <if test="createTime != null">create_time,</if>
             <if test="remark != null and remark != ''">remark,</if>
+            <if test="exType != null and exType != ''">ex_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="title != null">#{title},</if>
@@ -66,6 +102,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="status != null">#{status},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
+            <if test="exType != null and exType != ''">#{exType},</if>
          </trim>
     </insert>
  
@@ -130,7 +130,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <if test="id !=null">
             and id = #{id}
         </if>
-        <if test="device_id !=null and id == null">
+        <if test="deviceId !=null and id == null">
             and device_id = #{deviceId}
         </if>
     </update>
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.global_exception.mapper.GlobalExceptionMapper">
-    
-    <resultMap type="GlobalException" id="GlobalExceptionResult">
-        <result property="id"    column="id"    />
-        <result property="jobCode"    column="job_code"    />
-        <result property="deviceId"    column="device_id"    />
-        <result property="type"    column="type"    />
-        <result property="remark"    column="remark"    />
-        <result property="handle"    column="handle"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectGlobalExceptionVo">
-        select id, job_code, device_id, type, remark, handle, create_time, update_time from global_exception
-    </sql>
-
-    <select id="selectGlobalExceptionList" parameterType="GlobalException" resultMap="GlobalExceptionResult">
-        <include refid="selectGlobalExceptionVo"/>
-        <where>  
-            <if test="jobCode != null  and jobCode != ''"> and job_code = #{jobCode}</if>
-            <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
-            <if test="type != null "> and type = #{type}</if>
-            <if test="handle != null "> and handle = #{handle}</if>
-        </where>
-    </select>
-    
-    <select id="selectGlobalExceptionById" parameterType="Long" resultMap="GlobalExceptionResult">
-        <include refid="selectGlobalExceptionVo"/>
-        where id = #{id}
-    </select>
-
-
-    <insert id="insertGlobalException" parameterType="GlobalException">
-        insert into global_exception
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="jobCode != null">job_code,</if>
-            <if test="deviceId != null">device_id,</if>
-            <if test="type != null">type,</if>
-            <if test="remark != null">remark,</if>
-            <if test="handle != null">handle,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="jobCode != null">#{jobCode},</if>
-            <if test="deviceId != null">#{deviceId},</if>
-            <if test="type != null">#{type},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="handle != null">#{handle},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updateGlobalException" parameterType="GlobalException">
-        update global_exception
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="jobCode != null">job_code = #{jobCode},</if>
-            <if test="deviceId != null">device_id = #{deviceId},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="handle != null">handle = #{handle},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteGlobalExceptionById" parameterType="Long">
-        delete from global_exception where id = #{id}
-    </delete>
-
-    <delete id="deleteGlobalExceptionByIds" parameterType="String">
-        delete from global_exception where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
 \ No newline at end of file
@@ -50,12 +50,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="jobCode != null  and jobCode != ''"> and jobCode = #{jobCode}</if>
             <if test="ip != null  and ip != ''"> and ip = #{ip}</if>
             <if test="image != null  and image != ''"> and image = #{image}</if>
-            <if test="status != null "> and status = #{status}</if>
+            <if test="status != null "> and sign_in.status = #{status}</if>
             <if test="singnIn != null  and singnIn != ''"> and singn_in = #{singnIn}</if>
             <if test="alcoholFlag != null "> and alcohol_flag = #{alcoholFlag}</if>
             <if test="type != null "> and type = #{type}</if>
             <if test="alcoholIntake != null "> and alcohol_intake = #{alcoholIntake}</if>
             <if test="siteName != null "> and site_name = #{siteName}</if>
+            <if test="date != null "> and sign_in.create_time LIKE concat(#{date},'%')</if>
         order by create_time desc
     </select>
  
@@ -24,6 +24,11 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.metadata.style.WriteFont;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.RegExUtils;
 import org.apache.commons.lang3.reflect.FieldUtils;