酒测未通过审核

liujun001
1 parent a31933a6
Showing 16 changed files with 249 additions and 70 deletions
Bsth-admin/src/main/java/com/ruoyi/common/cache/NowSchedulingCache.java
Bsth-admin/src/main/java/com/ruoyi/controller/TestController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssEquipmentController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssFaceController.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/equipment/vo/EquipmentConfigVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/LinggangScheduling.java
Bsth-admin/src/main/java/com/ruoyi/driver/mapper/DriverSchedulingMapper.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/service/ReportService.java
Bsth-admin/src/main/java/com/ruoyi/service/SchedulingService.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/RuleNumSettingServiceImpl.java
Bsth-admin/src/main/resources/application-druid-devTest.yml
Bsth-admin/src/main/resources/mapper/driver_scheduling/DriverSchedulingMapper.xml
Bsth-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
@@ -3,19 +3,19 @@ package com.ruoyi.common.cache;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapUtil;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.errorScheduling.domain.ErrorJobcode;
 import com.ruoyi.errorScheduling.service.IErrorJobcodeService;
 import com.ruoyi.in.domain.SignIn;
-import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.utils.ConstDateUtil;
-import lombok.extern.slf4j.Slf4j;
+import com.ruoyi.utils.DateUtil;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -44,8 +44,10 @@ public class NowSchedulingCache {
         // 查询今天和昨天
         for (int i = 0; i > -2; i--) {
             Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
-            String date = ConstDateUtil.formatDate("yyyy-MM-dd", ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(i));
-            List<DriverScheduling> schedulingList = schedulingMapper.queryToDay(date, null, null, null);
+            Date comDate = ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(i);
+            String date = ConstDateUtil.formatDate("yyyy-MM-dd", comDate);
+            String endDate = DateUtil.YYYY_MM_DD_LINK.format(DateUtils.addDays(comDate,1));
+            List<DriverScheduling> schedulingList = schedulingMapper.queryToDay(date, endDate,null, null, null);
             handlerResultMap(resultMap, schedulingList);
             // 获取错误排班
             List<ErrorJobcode> errorScheduling = ThreadJobService.getErrorScheduling(resultMap);
@@ -152,9 +154,15 @@ public class NowSchedulingCache {
      * @param signIn
      */
     public void updateCacheByJobCode(String remark, String key, Integer index, SignIn signIn) {
+        if(Objects.isNull(cacheNowDayScheduling.get(key)) || Objects.isNull(cacheNowDayScheduling.get(key).get(signIn.getJobCode()))){
+            return;
+        }
         if (key.equals(ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(0)))
                 || key.equals(ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1)))) {
             DriverScheduling scheduling = cacheNowDayScheduling.get(key).get(signIn.getJobCode()).get(index);
+            if(Objects.isNull(scheduling)){
+                return;
+            }
             scheduling.setSignInId(signIn.getId());
             scheduling.setRemark(remark);
             scheduling.setExType(signIn.getExType());
@@ -39,8 +39,8 @@ public class TestController {
 //        calendar.set(Calendar.SECOND,30);
 //        Date date = calendar.getTime();
         Date date = new Date();
-        for (int i = 0; i < 30; i++) {
-            driverJob.getSchedulingInfo(DateUtils.addDays(date,i).getTime());
+        for (int i = 0; i < 2; i++) {
+            driverJob.runScheduling(DateUtils.addDays(date,i).getTime());
         }
         return ResponseResult.success();
@@ -74,7 +74,7 @@ public class DssEquipmentController extends BaseController {
     private LingangEquimentSelfCheckService lingangEquimentSelfCheckServicelingangEquimentSelfCheckService;
-    private static final String[] GET_CONFIG_DICT_KEY = {"drinking", "drunkenness", "videoParam", "addressParam"};
+    private static final String[] GET_CONFIG_DICT_KEY = {"drinking", "drunkenness", "videoParam", "addressParam", "resource_base_url"};
     @ApiOperation("设备获取访问令牌")
@@ -136,10 +136,17 @@ public class DssEquipmentController extends BaseController {
         List<SysDictData> list = sysDictDataService.queryDictDateList(sysDictData, keys);
         Equipment equipment = equipmentService.getOneByDeviceId(device);
-        EquipmentConfigVo configVo = combitionEquipmentConfigVo(list,equipment);
+        EquipmentConfigVo configVo = combitionEquipmentConfigVo(list, equipment);
         return ResponseResult.success(configVo);
     }
+    @GetMapping(value = "/device/getConfig/v1.1")
+    @ApiOperation("设备获取远程参数配置")
+    @Parameter(name = "device", description = "设备号", required = true)
+    public ResponseResult<EquipmentConfigVo> getConfigV1_1(@RequestParam(value = "device") String device) {
+        return getConfig(device);
+    }
+
     @PostMapping("/device/selfcheck")
     @ApiOperation("设备获取远程参数配置")
@@ -212,6 +219,8 @@ public class DssEquipmentController extends BaseController {
                 } else if (StringUtils.equals(sysDictData.getDiscKey(), "integer")) {
                     equimentAddressParamVo.setInteger(Convert.toInt(sysDictData.getDictValue()));
                 }
+            } else if (Objects.equals(sysDictData.getDictType(), "resource_base_url") && Objects.nonNull(sysDictData.getDictValue())) {
+                configVo.setResourceBashURL(sysDictData.getDictValueStr());
             }
         }
@@ -68,7 +68,9 @@ public class DssFaceController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
-        List<NewDriver> drivers = newDriverService.list();
+        NewDriver driver = new NewDriver();
+        driver.setPosts("驾驶员");
+        List<NewDriver> drivers = newDriverService.list(driver);
         List<ReqDataVo> vos = convertReqDataVo(drivers);
         return ResponseResult.success(vos);
     }
@@ -27,16 +27,16 @@ public class EquipmentConfigVo implements java.io.Serializable {
     @ApiModelProperty(value = "是否开启")
     private Integer promiseSwitch;
-    @ApiModelProperty(value = "是否开启健康检测 0：不开启  1：开启",example = "1")
+    @ApiModelProperty(value = "是否开启健康检测 0：不开启  1：开启", example = "1")
     private Integer healthCheck;
-    @ApiModelProperty(value = "是否开启情绪检测 0：不开启  1：开启",example = "1")
+    @ApiModelProperty(value = "是否开启情绪检测 0：不开启  1：开启", example = "1")
     private Integer moodCheck;
-    @ApiModelProperty(value = "是否开启安全考试 0：不开启  1：开启",example = "1")
+    @ApiModelProperty(value = "是否开启安全考试 0：不开启  1：开启", example = "1")
     private Integer safetyExam;
-    @ApiModelProperty(value = "开启体温检测 0：不开启  1：开启",example = "1")
+    @ApiModelProperty(value = "开启体温检测 0：不开启  1：开启", example = "1")
     private Integer temperatureSwitch;
@@ -48,6 +48,8 @@ public class EquipmentConfigVo implements java.io.Serializable {
     private EquimentVideoParamVo videoParam;
     @ApiModelProperty(value = "升级设置")
     private EquimentAddressParamVo addressParam;
+    @ApiModelProperty(value = "资源访问URL")
+    private String resourceBashURL;
     @Override
     public String toString() {
@@ -7,9 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.Excel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
 import java.util.Date;
@@ -19,8 +17,6 @@ import java.util.Date;
 @Slf4j
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
 @TableName("scheduling")
 /** 实体*/
 public class LinggangScheduling {
@@ -145,6 +141,7 @@ public class LinggangScheduling {
     /***1:实际排班表；100为计划排班表*/
     @Excel(name = "1:实际排班表；100为计划排班表")
+    @TableField(value = "scheduling_type")
     private java.lang.Integer type;
@@ -163,4 +160,5 @@ public class LinggangScheduling {
     public String toString() {
         return com.alibaba.fastjson2.JSON.toJSONString(this);
     }
+
 }
 \ No newline at end of file
 package com.ruoyi.driver.mapper;
 import com.ruoyi.domain.DriverScheduling;
-import com.ruoyi.driver.domain.Driver;
-import com.ruoyi.pojo.response.ExportReportViewResponseVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -19,7 +17,7 @@ public interface DriverSchedulingMapper {
     void insertRoster(List<DriverScheduling> list);
-    List<DriverScheduling> queryToDay(@Param("date") String date, @Param("name") String name,@Param("jobCode") String jobCode,@Param("lineName")String lineName );
+    List<DriverScheduling> queryToDay(@Param("date") String date,@Param("endDate") String endDate, @Param("name") String name,@Param("jobCode") String jobCode,@Param("lineName")String lineName );
@@ -37,6 +37,7 @@ import com.ruoyi.service.SchedulingService;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import com.ruoyi.utils.ConstDateUtil;
+import com.ruoyi.utils.DateUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
@@ -352,7 +353,7 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
             throw new RuntimeException("只能对当前月的数据进行补签！");
         }
         if (CollectionUtil.isEmpty(dto)) {
-            dto = schedulingMapper.queryToDay(ConstDateUtil.formatDate("yyyy-MM-dd", signIn.getCreateTime()), null, driver.getJobCode(), null);
+            dto = schedulingMapper.queryToDay(ConstDateUtil.formatDate("yyyy-MM-dd", signIn.getCreateTime()), DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(signIn.getCreateTime(),1)), null, driver.getJobCode(), null);
         }
         handleSignBody(signIn, driver, globalIndex, now, dto);
         signIn.setUpdateBy(SecurityUtils.getUsername());
@@ -8,6 +8,7 @@ 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;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.service.IDriverService;
 import com.ruoyi.equipment.domain.Equipment;
@@ -23,10 +24,12 @@ import com.ruoyi.service.DriverSchedulingExpandSmartService;
 import com.ruoyi.service.RuleAttendanceMainService;
 import com.ruoyi.service.RuleNumSettingService;
 import com.ruoyi.service.ThreadJobService;
+import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.DateUtil;
 import com.ruoyi.utils.ListUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.InitializingBean;
@@ -35,6 +38,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 import javax.annotation.Resource;
@@ -95,6 +99,8 @@ public class DriverJob implements InitializingBean {
     @Autowired
     private RuleAttendanceMainService attendanceMainService;
+    @Autowired
+    private LinggangSchedulingService schedulingService;
     @Value("${api.url.getDriverInfo}")
     private String getDriverInfoUrl;
@@ -233,21 +239,53 @@ public class DriverJob implements InitializingBean {
      * 获取排班任务请求
      * 24小时执行一次
      */
-    public void getSchedulingInfo(long timeLong) {
-        // TODO 获取当天的签到表
+    @Transactional(rollbackFor = Exception.class)
+    public void getSchedulingInfo() {
+        Date date = new Date();
+        for (int i = 0; i < 2; i++) {
+            runScheduling(DateUtils.addDays(date, i).getTime());
+        }
+
+
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void runScheduling(long timeLong) {
         long timestamp = System.currentTimeMillis();
         Date date = new Date(timeLong);
         String formatDate = DateUtil.YYYY_MM_DD.format(date);
         String timeOut = DateUtil.HH_MM_ss.format(date);
-//        String formatDate = ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1));
+
         log.info("获取排班任务触发时间:{}", formatDate);
         // 获取排班请求
         String getSchedulingInfoUrl = null;
         log.info("开始获取{}的排班数据", formatDate);
-        boolean isSameDay = DateUtils.isSameDay(new Date(),date);
-        String url = isSameDay?GET_SCHEDULING_INFO_URL:getSchedulingInfoPlan;
-        int type = isSameDay?1:100;
+        boolean isSameDay = DateUtils.isSameDay(new Date(), date);
+        String url = isSameDay ? GET_SCHEDULING_INFO_URL : getSchedulingInfoPlan;
+        int type = isSameDay ? 1 : 100;
+
+        LinggangScheduling scheduling = new LinggangScheduling();
+        scheduling.setStartScheduleDate(DateUtil.shortDate(date));
+        scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
+        scheduling.setType(type);
+        Integer count = schedulingService.countId(scheduling);
+        if (Objects.nonNull(count) && count > 0) {
+            log.info("[{}]排班数据已经存在", date);
+            return;
+        }
+
+
+        if (isSameDay) {
+            scheduling.setType(100);
+            List<LinggangScheduling> linggangSchedulings = schedulingService.list(scheduling);
+            Set<Long> IdSets = linggangSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
+            if (CollectionUtils.isNotEmpty(IdSets)) {
+                schedulingService.removeByIds(IdSets);
+            }
+        }
+
+
 //        String url = getSchedulingInfoPlan;
         try {
             getSchedulingInfoUrl = String.format(url, "77", formatDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
@@ -255,9 +293,11 @@ public class DriverJob implements InitializingBean {
             throw new RuntimeException(e);
         }
         // 获取排班信息并存入redis
-        saveSchedulingToRedis(getSchedulingInfoUrl, formatDate, timeOut,date,type);
+        saveSchedulingToRedis(getSchedulingInfoUrl, formatDate, timeOut, date, type);
         // 删除两天前排班信息
-        deleteScheduling();
+        if (isSameDay) {
+            deleteScheduling();
+        }
         log.info("获取{}的排班数据完毕", formatDate);
     }
@@ -350,14 +390,18 @@ public class DriverJob implements InitializingBean {
     }
-    public Map<String, List<ResponseSchedulingDto>> saveSchedulingToRedis(String getSchedulingInfoUrl, String dateKey, String timeOut,Date date,int type) {
-        log.info("开始拉取排班:{};[{}]", dateKey,getSchedulingInfoUrl);
+    public Map<String, List<ResponseSchedulingDto>> saveSchedulingToRedis(String getSchedulingInfoUrl, String dateKey, String timeOut, Date date, int type) {
+        log.info("开始拉取排班:{};[{}]", dateKey, getSchedulingInfoUrl);
         List<ResponseSchedulingDto> originSchedulingList = RESTTEMPLATE.exchange(
                 getSchedulingInfoUrl,
                 HttpMethod.GET,
                 null,
                 new ParameterizedTypeReference<List<ResponseSchedulingDto>>() {
                 }).getBody();
+
+        if (CollectionUtils.isEmpty(originSchedulingList)) {
+            return null;
+        }
         Map<String, List<ResponseSchedulingDto>> driverSchedulingMap = new HashMap<>(200);
         // 以员工号为key存入排班集合
         originSchedulingList.stream().forEach(item -> {
@@ -379,7 +423,7 @@ public class DriverJob implements InitializingBean {
             schedulingList.sort(Comparator.comparing(ResponseSchedulingDto::getFcsjT));
         }
         // 存入签到报表
-        THREAD_JOB_SERVICE.asyncComputedScheduling(driverSchedulingMap, timeOut,date,type);
+        THREAD_JOB_SERVICE.asyncComputedScheduling(driverSchedulingMap, timeOut, date, type);
         // 实时排班直接存入缓存
         SCHEDULING_CACHE.setCacheScheduling(DRIVER_SCHEDULING_PRE + dateKey, driverSchedulingMap);
         log.info("拉取排班完毕:{}", dateKey);
@@ -456,15 +500,15 @@ public class DriverJob implements InitializingBean {
         Map<String, Driver> driverMap = new HashMap<>();
         for (Driver driver : drivers) {
             if (driverMap.get(driver.getJobCode()) == null) {
-                driverMap.put(driver.getJobCode(),driver);
-            }else {
+                driverMap.put(driver.getJobCode(), driver);
+            } else {
                 System.out.println(driver);
             }
         }
         // 过滤出需要更新的driver
         List<Driver> updateDriverList = allDriverList.stream()
                 // 过滤暂时没有保存的人员
-                .filter(item->driverMap.get(item.getJobCode()) != null)
+                .filter(item -> driverMap.get(item.getJobCode()) != null)
                 // 过滤全部一致的人员信息
                 .filter(item -> !item.equals(driverMap.get(item.getJobCode())))
                 .map(item -> {
@@ -26,9 +26,10 @@ import com.ruoyi.pojo.vo.PersonSignDataResponseVo;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
 import com.ruoyi.utils.ConstDateUtil;
+import com.ruoyi.utils.DateUtil;
 import com.ruoyi.utils.ToolUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.quartz.Scheduler;
+import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,6 +40,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
 import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.time.LocalDate;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
@@ -265,7 +267,13 @@ public class ReportService {
     }
     private List<ExportReportViewResponseVo> getDayReportTableResponseVo(String date) {
-        List<DriverScheduling> schedulingList = schedulingMapper.queryToDay(date, null, null, null);
+        String endDateStr = null;
+        try {
+            endDateStr = DateUtil.YYYY_MM_DD_LINK.format(DateUtils.addDays(DateUtil.YYYY_MM_DD_LINK.parse(date),1));
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+        List<DriverScheduling> schedulingList = schedulingMapper.queryToDay(date,endDateStr, null, null, null);
         Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
         List<ExportReportViewResponseVo> signVo = new ArrayList<>(800);
         handlerResultMap(date, resultMap, schedulingList);
@@ -358,7 +366,13 @@ public class ReportService {
     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());
+        String endDateStr = null;
+        try {
+            endDateStr = DateUtil.YYYY_MM_DD_LINK.format(DateUtils.addDays(DateUtil.YYYY_MM_DD_LINK.parse(vo.getDate()),1));
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+        List<DriverScheduling> toDay = schedulingMapper.queryToDay(vo.getDate(),endDateStr, vo.getName(), vo.getJobCode(), vo.getLineName());
         for (DriverScheduling scheduling : toDay) {
             ToolUtils.updateReport(scheduling);
             ReportDetailResponseVo reportDetailResponseVo = new ReportDetailResponseVo();
@@ -3,28 +3,32 @@ package com.ruoyi.service;
 import cn.hutool.core.collection.CollectionUtil;
 import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.domain.DriverScheduling;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.mapper.SignInMapper;
 import com.ruoyi.in.service.impl.SignInServiceImpl;
 import com.ruoyi.pojo.DriverSignInRecommendation;
 import com.ruoyi.pojo.GlobalIndex;
-import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.response.ReportViewResponseVo;
+import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import com.ruoyi.utils.ConstDateUtil;
+import com.ruoyi.utils.DateUtil;
 import com.ruoyi.utils.ToolUtils;
+import org.apache.commons.collections4.CollectionUtils;
 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.text.ParseException;
 import java.time.LocalDateTime;
-import java.time.YearMonth;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.stream.Collectors;
 import static com.ruoyi.common.ConstDriverProperties.*;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
@@ -46,6 +50,8 @@ public class SchedulingService {
     @Autowired
     private SignInMapper signInMapper;
+    @Autowired
+    private LinggangSchedulingService schedulingService;
     /**
@@ -60,6 +66,22 @@ public class SchedulingService {
         List<DriverScheduling> dto = null;
         for (int i = 0; i > -2; i--) {
             dto = nowSchedulingCache.getCacheSchedulingMapValueByHKey(ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(i)), jobCode);
+            if(CollectionUtils.isEmpty(dto)){
+                Date date = new Date(now);
+                LinggangScheduling linggangScheduling = new LinggangScheduling();
+                linggangScheduling.setScheduleDate(DateUtil.shortDate(date));
+                linggangScheduling.setJobCode(jobCode);
+
+                List<LinggangScheduling> linggangSchedulings = schedulingService.list(linggangScheduling);
+                if(CollectionUtils.isNotEmpty(linggangSchedulings)){
+                    dto = linggangSchedulings.stream().map(l->{
+                        DriverScheduling driverScheduling = new DriverScheduling();
+                        BeanUtils.copyProperties(l,driverScheduling);
+                        return driverScheduling;
+                    }).collect(Collectors.toList());
+                }
+
+            }
             if (!CollectionUtil.isEmpty(dto)) {
                 dto.sort(Comparator.comparing(DriverScheduling::getZdsjT));
                 if (i == -1) {
@@ -235,8 +257,14 @@ public class SchedulingService {
     private List<ReportViewResponseVo> getDayReportTableResponseVo(ReportViewRequestVo vo) {
+        String endDateStr = null;
+        try {
+            endDateStr = DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(DateUtil.YYYY_MM_DD_LINK.parse(vo.getDate()),1));
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
         // 签到数据
-        List<DriverScheduling> toDay = schedulingMapper.queryToDay(vo.getDate(), vo.getName(), vo.getJobCode(), vo.getLineName());
+        List<DriverScheduling> toDay = schedulingMapper.queryToDay(vo.getDate(),endDateStr, vo.getName(), vo.getJobCode(), vo.getLineName());
         toDay.sort(Comparator.comparing(DriverScheduling::getFcsjT));
         // 转换日期 + jobCode为key
         Map<String, List<DriverScheduling>> orangeMap = new HashMap<>(1200);
@@ -325,7 +353,13 @@ public class SchedulingService {
     }
     public List<DriverScheduling> queryToDay(String date) {
-        return schedulingMapper.queryToDay(date, null, null, null);
+        String endDateStr = null;
+        try {
+            endDateStr = DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(DateUtil.YYYY_MM_DD_LINK.parse(date),1));
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+        return schedulingMapper.queryToDay(date,endDateStr, null, null, null);
     }
@@ -16,6 +16,7 @@ import com.ruoyi.config.domain.LineConfig;
 import com.ruoyi.config.service.ILineConfigService;
 import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.domain.RuleAttendanceMain;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.domain.sign.in.exception.report.EquipmentExceptionReport;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.mapper.DriverMapper;
@@ -32,12 +33,15 @@ import com.ruoyi.job.DriverJob;
 import com.ruoyi.pojo.GlobalIndex;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
+import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import com.ruoyi.service.sign.in.exception.report.EquipmentExceptionReportService;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -103,6 +107,9 @@ public class ThreadJobService {
     @Autowired
     private RuleAttendanceMainService attendanceMainService;
+    @Autowired
+    private LinggangSchedulingService schedulingService;
+
     @Autowired
     private PlatformTransactionManager transactionManager;
@@ -199,8 +206,8 @@ public class ThreadJobService {
             sendNotice(signIn, driver, dto, globalIndex);
-            EquipmentExceptionReport exceptionReport =new EquipmentExceptionReport();
-            BeanUtils.copyProperties(exception,exceptionReport);
+            EquipmentExceptionReport exceptionReport = new EquipmentExceptionReport();
+            BeanUtils.copyProperties(exception, exceptionReport);
             exceptionReport.setSignId(signIn.getId());
             equipmentExceptionReportService.save(exceptionReport);
         }
@@ -409,10 +416,18 @@ public class ThreadJobService {
      */
     @Async
     @Transactional(rollbackFor = {Exception.class})
-    public void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, String timeOut,Date date,int type) {
+    public void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, String timeOut, Date date, int type) {
         //查询当天是否保存过考情表  如果不存在则保存
-        List<DriverScheduling> bcList = schedulingMapper.queryToDay(DateUtil.YYYY_MM_DD_LINK.format(date), null, null, null);
-        Map<String, List<DriverScheduling>> dto = nowSchedulingCache.getCacheScheduling(ConstDateUtil.formatDate(new Date()));
+        List<DriverScheduling> bcList = schedulingMapper.queryToDay(DateUtil.YYYY_MM_DD_LINK.format(date),DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(date,1)), null, null, null);
+        Map<String, List<DriverScheduling>> dto = nowSchedulingCache.getCacheScheduling(ConstDateUtil.formatDate(date));
+        if(CollectionUtils.isNotEmpty(bcList) && MapUtils.isEmpty(dto)){
+            String dateStr = DateUtil.YYYY_MM_DD.format(date);
+            Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
+            NowSchedulingCache.handlerResultMap(resultMap, bcList);
+            // 更新缓存
+            nowSchedulingCache.setCacheScheduling(dateStr, resultMap);
+        }
+
         // 当天已有记录则不在保存  或者 调度记录为空则不在保存
         if ((CollectionUtil.isNotEmpty(dto) && CollectionUtil.isNotEmpty(bcList)) || originSchedulingMap.size() == 0) {
             log.info("调度最新数据：{},当天获取数据：{},时间:[{}]", originSchedulingMap.size(),bcList.size(),date);
@@ -420,15 +435,52 @@ public class ThreadJobService {
         }
         // TODO maybe delete
         TempCache.resetMapStatus();
-        bcList = getBcList(originSchedulingMap,type);
+        bcList = getBcList(originSchedulingMap, type);
         // 处理非司售人员的排班明细
-        bcList.addAll(handleOtherPostsScheduling());
+        bcList.addAll(handleOtherPostsScheduling(type));
         // 插入排班
-        schedulingMapper.insertRoster(bcList);
+        List<LinggangScheduling> schedulings = bcList.stream().map(b -> {
+            LinggangScheduling scheduling = new LinggangScheduling();
+            BeanUtils.copyProperties(b, scheduling);
+            return scheduling;
+        }).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(schedulings)) {
+            Map<String, List<LinggangScheduling>> distinctMap = new HashMap<>();
+            schedulings.stream().forEach(s -> {
+                String key = org.apache.commons.lang3.StringUtils.join(s.getJobCode(), "-", s.getBcType(), "-", s.getFcsjT(), "-", s.getScheduleDate());
+                List<LinggangScheduling> linggangSchedulings = distinctMap.get(key);
+                if (Objects.isNull(linggangSchedulings)) {
+                    linggangSchedulings = new ArrayList<>();
+                    distinctMap.put(key, linggangSchedulings);
+                }
+                linggangSchedulings.add(s);
+            });
+
+            schedulings.clear();
+            for (Map.Entry<String, List<LinggangScheduling>> entry : distinctMap.entrySet()) {
+                int size = CollectionUtils.size(entry.getValue());
+                if (size == 1) {
+                    schedulings.add(entry.getValue().get(0));
+                } else if (size > 1) {
+                   List<LinggangScheduling> values = entry.getValue().stream().filter(s->!Objects.equals(s.getZdsjT(),s.getFcsjT())).collect(Collectors.toList());
+                    size = CollectionUtils.size(values);
+                    if(size == 0){
+                        schedulings.add(entry.getValue().get(0));
+                    }else if(size == 1){
+                        schedulings.add(values.get(0));
+                    }else{
+                        values = values.stream().sorted(Comparator.comparing(LinggangScheduling::getZdsjT)).collect(Collectors.toList());
+                        schedulings.add(values.get(size-1));
+                    }
+                }
+            }
+
+            schedulingService.saveBatch(schedulings);
+        }
         String dateStr1 = DateUtil.YYYY_MM_DD_LINK.format(date);
         // 异常数据过多，不通过自增获取id再次查询获取
-        bcList = schedulingMapper.queryToDay(dateStr1, null, null, null);
+        bcList = schedulingMapper.queryToDay(dateStr1, DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(date,1)), null, null, null);
         // 处理缓存和错误排班
         String dateStr = DateUtil.YYYY_MM_DD.format(date);
         if (!CollectionUtil.isEmpty(bcList)) {
@@ -445,7 +497,12 @@ public class ThreadJobService {
         log.info("当天排班数据获取完毕,共：{}条", bcList.size());
     }
-    private List<DriverScheduling> handleOtherPostsScheduling() {
+    private <T> String combitionKey(T s1) {
+        LinggangScheduling s = (LinggangScheduling) s1;
+        return (s.getScheduleDate() + "-" + s.getBcType() + "-" + s.getFcsjT() + "-" + s.getScheduleDate());
+    }
+
+    private List<DriverScheduling> handleOtherPostsScheduling(int type) {
         QueryWrapper<RuleAttendanceMain> qw = new QueryWrapper<>();
         qw.lambda()
                 .eq(RuleAttendanceMain::getWorkFlag, WORK_FLAG)
@@ -459,6 +516,7 @@ public class ThreadJobService {
             scheduling.setBcType(BC_TYPE_OUT);
             scheduling.setZdsjT(ruleAttendanceMain.getFirstWorkSignInTime().getTime());
             scheduling.setScheduleDate(ruleAttendanceMain.getSchedulingDate());
+            scheduling.setType(type);
             bcList.add(scheduling);
             DriverScheduling scheduling1 = getDriverScheduling(ruleAttendanceMain);
@@ -466,6 +524,7 @@ public class ThreadJobService {
             scheduling1.setZdsjT(ruleAttendanceMain.getFirstQuittingSignInTime().getTime());
             scheduling1.setFcsjT(ruleAttendanceMain.getFirstQuittingSignInTime().getTime());
             scheduling1.setScheduleDate(ruleAttendanceMain.getSchedulingDate());
+            scheduling1.setType(type);
             bcList.add(scheduling1);
             // 第二段
             if (!Objects.isNull(ruleAttendanceMain.getSecondWorkSignInTime())) {
@@ -474,6 +533,7 @@ public class ThreadJobService {
                 scheduling2.setFcsjT(ruleAttendanceMain.getSecondWorkSignInTime().getTime());
                 scheduling2.setZdsjT(ruleAttendanceMain.getSecondWorkSignInTime().getTime());
                 scheduling2.setScheduleDate(ruleAttendanceMain.getSchedulingDate());
+                scheduling2.setType(type);
                 bcList.add(scheduling2);
                 DriverScheduling scheduling3 = getDriverScheduling(ruleAttendanceMain);
@@ -481,6 +541,7 @@ public class ThreadJobService {
                 scheduling3.setFcsjT(ruleAttendanceMain.getSecondQuittingSignInTime().getTime());
                 scheduling3.setZdsjT(ruleAttendanceMain.getSecondQuittingSignInTime().getTime());
                 scheduling3.setScheduleDate(ruleAttendanceMain.getSchedulingDate());
+                scheduling3.setType(type);
                 bcList.add(scheduling3);
             }
         }
@@ -515,7 +576,7 @@ public class ThreadJobService {
         return scheduling;
     }
-    private List<DriverScheduling> getBcList(Map<String, List<ResponseSchedulingDto>> originSchedulingMap,int type) {
+    private List<DriverScheduling> getBcList(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, int type) {
         List<DriverScheduling> bcList = new ArrayList<>(1000);
         Map<String, LineConfig> configMap = lineConfigService.selectLineConfigList(null).stream().collect(Collectors.toMap(item -> item.getLineName() + item.getLpName(), item -> item));
         for (String key : originSchedulingMap.keySet()) {
@@ -534,7 +595,7 @@ public class ThreadJobService {
             if (CollectionUtil.isNotEmpty(nowScheduling)) {
                 // 配置处理
-                nowScheduling = handlerScheduler(configMap, schedulingList, nowScheduling);
+                nowScheduling = handlerScheduler(configMap, schedulingList, nowScheduling, type);
                 //  ------|特殊处理|------
                 try {
                     DriverScheduling scheduling = nowScheduling.get(nowScheduling.size() - 1);
@@ -564,10 +625,10 @@ public class ThreadJobService {
      * @param nowScheduling
      * @return
      */
-    private List<DriverScheduling> handlerScheduler(Map<String, LineConfig> configMap, List<ResponseSchedulingDto> schedulingList, List<DriverScheduling> nowScheduling) {
+    private List<DriverScheduling> handlerScheduler(Map<String, LineConfig> configMap, List<ResponseSchedulingDto> schedulingList, List<DriverScheduling> nowScheduling, int type) {
         // 处理错误班次
         if (nowScheduling.size() % 2 == 1 && nowScheduling.size() > 2) {
-            nowScheduling = handleErrorBc(schedulingList);
+            nowScheduling = handleErrorBc(schedulingList, type);
         }
         // TODO 遍历配置表数据
@@ -749,12 +810,12 @@ public class ThreadJobService {
         return errorJobcode;
     }
-    private List<DriverScheduling> handleErrorBc(List<ResponseSchedulingDto> nowScheduling) {
+    private List<DriverScheduling> handleErrorBc(List<ResponseSchedulingDto> nowScheduling, int type) {
         // 处理两个进场
-        return handlerTowIn(nowScheduling);
+        return handlerTowIn(nowScheduling, type);
     }
-    private List<DriverScheduling> handlerTowIn(List<ResponseSchedulingDto> nowScheduling) {
+    private List<DriverScheduling> handlerTowIn(List<ResponseSchedulingDto> nowScheduling, int type) {
         nowScheduling = nowScheduling.stream().filter(item -> BC_TYPE_IN.equals(item.getBcType()) || BC_TYPE_OUT.equals(item.getBcType())).collect(Collectors.toList());
         if (nowScheduling.get(nowScheduling.size() - 1).getBcType().equals(BC_TYPE_IN)) {
             // 连续的进场 判断哪个适配
@@ -772,6 +833,7 @@ public class ThreadJobService {
         return nowScheduling.stream().map(item -> {
             DriverScheduling scheduling = new DriverScheduling();
             BeanUtils.copyProperties(item, scheduling);
+            scheduling.setType(type);
             return scheduling;
         }).collect(Collectors.toList());
     }
@@ -21,7 +21,9 @@ import com.ruoyi.service.RuleAttendanceMainHelpService;
 import com.ruoyi.service.RuleAttendanceMainService;
 import com.ruoyi.service.RuleNumSettingService;
 import com.ruoyi.utils.ConstDateUtil;
+import com.ruoyi.utils.DateUtil;
 import com.ruoyi.utils.ToolUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -321,7 +323,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl&lt;RuleNumSettingMapper,
     public void manualAddBcCache() {
         List<DriverScheduling> bcList = handleOtherPostsScheduling();
         schedulingMapper.insertRoster(bcList);
-        bcList = schedulingMapper.queryToDay(ConstDateUtil.formatDate("yyyy-MM-dd"), null, null, null);
+        bcList = schedulingMapper.queryToDay(ConstDateUtil.formatDate("yyyy-MM-dd"), DateUtil.YYYY_MM_DD_LINK.format(DateUtils.addDays(new Date(),1)), null, null, null);
         String date = ConstDateUtil.formatDate(new Date());
         Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
         NowSchedulingCache.handlerResultMap(resultMap, bcList);
@@ -137,7 +137,7 @@ ruoyi:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-    profile: D:/ruoyi/uploadPath
+    profile: /data/test/bath-alcoho-sign/apache-tomcat-8.5.61/webapps/uploadPath
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数字计算 char 字符验证
@@ -37,12 +37,12 @@
     <insert id="insertRoster" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        insert into scheduling (schedule_date,line_name,job_code,`name`,posts,lp_name,nbbm,bc_type,fcsj_t,zdsj_t,upDown,qdzCode,qdzName,zdzCode,zdzName)
+        insert into scheduling (schedule_date,line_name,job_code,`name`,posts,lp_name,nbbm,bc_type,fcsj_t,zdsj_t,upDown,qdzCode,qdzName,zdzCode,zdzName,scheduling_type)
         values
         <foreach collection="list" item="item" separator=",">
             (
             #{item.scheduleDate},  #{item.lineName},   #{item.jobCode},  #{item.name},  #{item.posts},   #{item.lpName},  #{item.nbbm},
-            #{item.bcType},#{item.fcsjT},#{item.zdsjT},#{item.upDown},#{item.qdzCode},#{item.qdzName},#{item.zdzCode},#{item.zdzName}
+            #{item.bcType},#{item.fcsjT},#{item.zdsjT},#{item.upDown},#{item.qdzCode},#{item.qdzName},#{item.zdzCode},#{item.zdzName},#{item.type}
             )
         </foreach>
         on duplicate key update
@@ -79,10 +79,10 @@
             <if test="lineName !=null and lineName != ''">
                 and scheduling.line_name like concat('%', #{lineName}, '%')
             </if>
-            <if test="date != null and date != ''">
-                and schedule_date = #{date}
+            <if test="date != null and date != '' and endDate != null and endDate != ''">
+                and schedule_date between #{date} and #{endDate}
             </if>
-            and scheduling.type = 1
+            and (scheduling.scheduling_type = 1 or scheduling.scheduling_type is null)
         </where>
@@ -9,6 +9,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.util.Objects;
 /**
  * 字典数据表 sys_dict_data
@@ -99,12 +100,16 @@ public class SysDictData extends BaseEntity {
         this.dictLabel = dictLabel;
     }
-    @NotBlank(message = "字典键值不能为空")
-    @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
     public Object getDictValue() {
         return dictValue;
     }
+    @NotBlank(message = "字典键值不能为空")
+    @Size(min = 0, max = 300, message = "字典键值长度不能超过100个字符")
+    public String getDictValueStr() {
+        return Objects.isNull(dictValue)? null:dictValue.toString();
+    }
+
     public void setDictValue(Object dictValue) {
         this.dictValue = dictValue;
     }