酒测未通过审核

liujun001
1 parent 6141b055
Showing 27 changed files with 472 additions and 123 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/TestController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/domain/DriverScheduling.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/key/box/dto/TakeKeyDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/key/box/dto/TakeKeyKeyItemDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/key/box/dto/TakeKeyPlanDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/key/box/vo/TakeKeyPlanVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/key/box/vo/TakeKeyVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/info/box/vo/KeyBoxVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/LinggangKeyWorkLocation.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/LinggangScheduling.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/dto/LinggangSchedulingAddDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/dto/LinggangSchedulingQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/dto/LinggangSchedulingUpdateDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/vo/LinggangSchedulingVO.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/mapper/key/location/LinggangKeyWorkLocationMapper.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/dss/KeyBoxVoServiceImpl.java
@@ -5,12 +5,15 @@ import com.ruoyi.job.DriverJob;
 import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import java.util.Date;
+
 /**
  * @author liujun
  * @date 2024年07月30日 14:37
@@ -28,7 +31,18 @@ public class TestController {
     @GetMapping(value = "/test")
     @ApiOperation("test")
     public ResponseResult<Boolean> test() {
-        driverJob.getSchedulingInfo("02:30:30");
+       // driverJob.getSchedulingInfo("02:30:30");
+//        Calendar calendar = Calendar.getInstance();
+//        calendar.setTime(new Date());
+//        calendar.set(Calendar.HOUR,2);
+//        calendar.set(Calendar.MINUTE,30);
+//        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());
+        }
+
         return ResponseResult.success();
     }
@@ -23,6 +23,7 @@ import com.ruoyi.domain.dss.sign.dto.DssGetWineRecordDTO;
 import com.ruoyi.domain.dss.sign.dto.DssSignDTO;
 import com.ruoyi.domain.dss.sign.dto.DssSignOutDTO;
 import com.ruoyi.domain.dss.sign.resource.UpLoadPictureDTO;
+import com.ruoyi.domain.dss.sign.resource.UpLoadPicturePicDataDTO;
 import com.ruoyi.domain.dss.sign.resource.UpLoadVideoDTO;
 import com.ruoyi.domain.dss.sign.vo.DssSignVo;
 import com.ruoyi.domain.dss.sign.vo.GetWineRecordVo;
@@ -457,19 +458,25 @@ public class DssDriverController extends BaseController {
             return Collections.emptyList();
         }
-        return dto.getPicData().stream().map(pic -> {
+        int size = CollectionUtils.size(dto.getPicData());
+
+        List<LinggangSignInResource> resources = new ArrayList<>();
+
+        for (int i = 0; i < size; i++) {
+            UpLoadPicturePicDataDTO pic = dto.getPicData().get(i);
+            int type = Objects.equals(pic.getIndex(), 0) ? 1 : 3;
             LinggangSignInResource resource = new LinggangSignInResource();
             resource.setSignId(dto.getTestId());
             resource.setIndex(pic.getIndex());
-            resource.setResourceType(1);
+            resource.setResourceType(type);
             resource.setTime(pic.getTime());
             resource.setCreateBy(getUserId());
             resource.setCreateTime(new Date());
             resource.setDevice(dto.getDevice());
             resource.setContent(pic.getPic());
+        }
-            return resource;
-        }).collect(Collectors.toList());
+        return resources;
     }
     private LinggangSignInResource cconvertLinggangSignInResource(UpLoadVideoDTO dto) {
@@ -548,7 +555,7 @@ public class DssDriverController extends BaseController {
                     }
                 }
                 vo.setRouteName(scheduling.getLineName());
-                vo.setFache(new Date(scheduling.getFcsjT()*100));
+                vo.setFache(new Date(scheduling.getFcsjT() * 100));
                 return vo;
             }).collect(Collectors.toList());
@@ -12,10 +12,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.caiinfo.CarInfo;
 import com.ruoyi.domain.driver.NewDriver;
-import com.ruoyi.domain.dss.key.box.dto.KeyBasicSyncDTO;
-import com.ruoyi.domain.dss.key.box.dto.SkipOperationDTO;
-import com.ruoyi.domain.dss.key.box.dto.TakeKeyDTO;
-import com.ruoyi.domain.dss.key.box.dto.YarnCabinetStatePageDTO;
+import com.ruoyi.domain.dss.key.box.dto.*;
 import com.ruoyi.domain.dss.key.box.vo.*;
 import com.ruoyi.domain.dss.key.location.dto.WorkPlateV2DTO;
 import com.ruoyi.domain.dss.key.location.vo.WorkPlateV2Vo;
@@ -41,6 +38,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -173,6 +171,7 @@ public class KeyBoxController extends BaseController {
             LinggangScheduling scheduling = new LinggangScheduling();
             scheduling.setCzCode(venueInfo.getParkCode());
             scheduling.setStartScheduleDate(DateUtil.shortDate(dto.getTime()));
+            scheduling.setType(1);
             List<LinggangScheduling> schedulings = schedulingService.listByCZ(scheduling);
             Set<String> jobCodes = null;
@@ -238,9 +237,19 @@ public class KeyBoxController extends BaseController {
         entity.setDevice(dto.getDevice());
         List<LinggangKeyWorkLocation> schedulings = linggangKeyWorkLocationService.list(entity);
-        NewDriver driver = newDriverService.getOne(dto.getDriverCode());
+        List<KeyInfo> keyInfos = null;
+        if(CollectionUtils.isNotEmpty(dto.getKeyItem())){
+            Set<String> codes = dto.getKeyItem().stream().map(TakeKeyKeyItemDTO::getKeyCode).filter(obj->Objects.nonNull(obj)).collect(Collectors.toSet());
+            keyInfos = keyInfoService.list(codes);
+        }
+
+        NewDriver driver = newDriverService.getOne(dto.getStaffCode());
+//        if (Objects.isNull(driver)) {
+//            logger.info("[{}]没有找到driver", dto);
+//            return ResponseResult.error404();
+//        }
-        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver);
+        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver,keyInfos);
         ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.TAKE_OUT);
         if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
@@ -260,20 +269,47 @@ public class KeyBoxController extends BaseController {
         }
         LinggangKeyWorkLocation entity = new LinggangKeyWorkLocation();
         entity.setDevice(dto.getDevice());
+        entity.setType(2);
+        entity.setStartScheduleDate(dto.getTime());
         List<LinggangKeyWorkLocation> schedulings = linggangKeyWorkLocationService.list(entity);
-        NewDriver driver = newDriverService.getOne(dto.getDriverCode());
+        NewDriver driver = newDriverService.getOne(dto.getStaffCode());
+        if (Objects.isNull(driver)) {
+            logger.info("[{}]没有找到driver", dto);
+            return ResponseResult.error404();
+        }
+
+        List<KeyInfo> keyInfos = null;
+        if(CollectionUtils.isNotEmpty(dto.getKeyItem())){
+            Set<String> codes = dto.getKeyItem().stream().map(TakeKeyKeyItemDTO::getKeyCode).filter(obj->Objects.nonNull(obj)).collect(Collectors.toSet());
+            keyInfos = keyInfoService.list(codes);
+
+            if(CollectionUtils.isEmpty(keyInfos)){
+                codes = dto.getKeyItem().stream().map(TakeKeyKeyItemDTO::getPlate).filter(obj->Objects.nonNull(obj)).collect(Collectors.toSet());
+                keyInfos = keyInfoService.list(null,codes);
+            }
+        }
-        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver);
+
+
+        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver,keyInfos);
+//        List<LinggangKeyWorkLocation> errorLocations = locations.stream().filter(l -> Objects.isNull(l.getKeyInfoId())).collect(Collectors.toList());
+//        locations = locations.stream().filter(l -> Objects.nonNull(l.getKeyInfoId())).collect(Collectors.toList());
         ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.REPAY);
         if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
         }
-        if (responseResult.isSuccess()) {
+        if (!responseResult.isSuccess()) {
             return ResponseResult.error(responseResult.getCode(), responseResult.getMsg());
         }
+//        if (CollectionUtils.isNotEmpty(errorLocations)) {
+//
+//            Set<String> errorCode = errorLocations.stream().map(LinggangKeyWorkLocation::getKey).collect(Collectors.toSet());
+//            return ResponseResult.error(responseResult.getCode(), JSON.toJSONString(errorCode) + "归还失败，请归还到指定位置");
+//        }
+
         Equipment equipment = equipmentService.getOneByDeviceId(dto.getDevice());
         TakeKeyVo vo = convertTakeKeyVo(dto, responseResult, equipment);
@@ -281,6 +317,48 @@ public class KeyBoxController extends BaseController {
         return new ResponseResult<>(responseResult.getCode(), responseResult.getMsg(), vo);
     }
+    @PostMapping(value = "Driver/TurnKey/plan")
+    @ApiOperation(value = "钥匙归还计划")
+    public ResponseResult<List<TakeKeyPlanVo>> getKeyWorkLocaltionPlan(@Valid @RequestBody TakeKeyPlanDTO dto,BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        LinggangKeyWorkLocation entity = new LinggangKeyWorkLocation();
+        entity.setDevice(dto.getDevice());
+        entity.setType(2);
+        entity.setDelFlag(Boolean.FALSE);
+        entity.setStartScheduleDate(dto.getTime());
+        entity.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(dto.getTime(),1));
+
+        List<LinggangKeyWorkLocation> schedulings = linggangKeyWorkLocationService.list(entity);
+        if(CollectionUtils.isEmpty(schedulings)){
+            return ResponseResult.success();
+        }
+
+        Set<Integer> keyIds = schedulings.stream().map(LinggangKeyWorkLocation::getKeyInfoId).collect(Collectors.toSet());
+
+        List<KeyInfo> tempKeyInfos = null;
+        if(CollectionUtils.isNotEmpty(keyIds)){
+            tempKeyInfos = keyInfoService.listByIds(keyIds);
+        }
+        List<KeyInfo> keyInfos = tempKeyInfos;
+        int keyInfoSize = CollectionUtils.size(keyInfos);
+
+      List<TakeKeyPlanVo>  vos = schedulings.stream().map(s->{
+            TakeKeyPlanVo vo = convert(s);
+            if(keyInfoSize  > 0){
+                Optional<KeyInfo> optional = keyInfos.stream().filter(k->Objects.equals(k.getId(),s.getKeyInfoId())).findFirst();
+                if(optional.isPresent()){
+                    vo.setKeyCode(optional.get().getKeyCode());
+                }
+            }
+
+            return vo;
+        }).collect(Collectors.toList());
+        return ResponseResult.success(vos);
+    }
+
     @PostMapping(value = "/keybox/yarnCabinetState/page")
     @ApiOperation(value = "24.场站钥匙柜实况信息")
     public ResponseResult<YarnCabinetStatePageVO> yarnCabinetStatePage(@Valid @RequestBody YarnCabinetStatePageDTO dto, BindingResult bindingResult) {
@@ -590,7 +668,7 @@ public class KeyBoxController extends BaseController {
         return vo;
     }
-    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto, List<LinggangKeyWorkLocation> schedulings, NewDriver driver) {
+    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto, List<LinggangKeyWorkLocation> schedulings, NewDriver driver,List<KeyInfo> keyInfos) {
         if (CollectionUtils.isEmpty(dto.getKeyItem())) {
             return Collections.emptyList();
         }
@@ -608,6 +686,17 @@ public class KeyBoxController extends BaseController {
                     location.setKeyInfoId(opt.get().getKeyInfoId());
                 }
             }
+            if(Objects.nonNull(keyInfos)){
+               Optional<KeyInfo> optional = keyInfos.stream().filter(k->Objects.equals(k.getKeyCode(),item.getKeyCode())).findFirst();
+                if (optional.isPresent()) {
+                    location.setKeyInfoId(optional.get().getId());
+                }else{
+                    optional = keyInfos.stream().filter(k->Objects.equals(k.getPlateNum(),item.getPlate())).findFirst();
+                    if (optional.isPresent()) {
+                        location.setKeyInfoId(optional.get().getId());
+                    }
+                }
+            }
             if (Objects.nonNull(driver)) {
                 location.setCreateBy(Convert.toLong(driver.getId()));
@@ -615,7 +704,7 @@ public class KeyBoxController extends BaseController {
             location.setCreateTime(new Date());
             return location;
-        }).filter(obj -> Objects.nonNull(obj.getKeyInfoId())).collect(Collectors.toList());
+        }).collect(Collectors.toList());
     }
     private TakeKeyVo convertTakeKeyVo(TakeKeyDTO dto, ResponseResult<Boolean> result, Equipment equipment) {
@@ -623,6 +712,7 @@ public class KeyBoxController extends BaseController {
         vo.setDevice(dto.getDevice());
         vo.setTime(new Date());
         vo.setResult(result.isSuccess() ? 0 : 1);
+        vo.setStaffCode(dto.getStaffCode());
         if (Objects.nonNull(equipment)) {
             vo.setDeviceType(equipment.getPromise());
             vo.setDriverCode(equipment.getDeviceId());
@@ -734,4 +824,12 @@ public class KeyBoxController extends BaseController {
         }
         return vo;
     }
+
+    private TakeKeyPlanVo convert(LinggangKeyWorkLocation source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            TakeKeyPlanVo target = new TakeKeyPlanVo();
+            BeanUtils.copyProperties(source, target);
+            return target;
+        }).orElseGet(null);
+    }
 }
@@ -40,4 +40,7 @@ public class DriverScheduling {
     private String zdzCode;
     /**终点站名字*/
     private String zdzName;
+
+    /***1:实际排班表；100为计划排班表*/
+    private java.lang.Integer type;
 }
@@ -33,10 +33,14 @@ public class TakeKeyDTO implements java.io.Serializable {
     @ApiModelProperty(value = "设备类型", required = true)
     private String deviceType;
-    @NotEmpty(message = "卡号 不能为空")
+//    @NotEmpty(message = "卡号 不能为空")
     @ApiModelProperty(value = "卡号", required = true)
     private String driverCode;
+//    @NotEmpty(message = "工号 不能为空")
+    @ApiModelProperty(value = "工号", required = true)
+    private String  staffCode;
+
     @NotNull(message = "时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "时间 个数：yyyy-MM-dd HH:mm:ss", required = true)
@@ -46,6 +46,10 @@ public class TakeKeyKeyItemDTO implements java.io.Serializable {
     @ApiModelProperty(value = "领取状态;0:取出，16:钥匙未归还，255:异常", required = true)
     private Integer state;
+   // @NotEmpty(message = "钥匙编码 不能为空")
+    @ApiModelProperty(value = "钥匙编码", required = true)
+    private String keyCode;
+
     @Override
     public String toString() {
         return JSON.toJSONString(this);
+package com.ruoyi.domain.dss.key.box.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @author liujun
+ * @date 2024年08月13日 13:15
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "钥匙归还计划 DTO")
+@EqualsAndHashCode(callSuper = false)
+public class TakeKeyPlanDTO implements java.io.Serializable{
+    @NotEmpty(message = "设备上线号 不能为空")
+    @ApiModelProperty(value = "设备上线号", required = true)
+    private String device;
+
+    @NotEmpty(message = "设备类型 不能为空")
+    @ApiModelProperty(value = "设备类型", required = true)
+    private String deviceType;
+
+    @NotNull(message = "时间不能为空")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "时间 个数：yyyy-MM-dd HH:mm:ss", required = true)
+    private Date time;
+}
+package com.ruoyi.domain.dss.key.box.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author liujun
+ * @date 2024年08月13日 13:15
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "钥匙归还计划 Vo")
+@EqualsAndHashCode(callSuper = false)
+public class TakeKeyPlanVo implements java.io.Serializable {
+    /***ID*/
+    @ApiModelProperty(value = "ID", example = "1")
+    private Long id;
+    /***场站ID*/
+    @ApiModelProperty(value = "场站ID", example = "1")
+    private Integer yardId;
+    /***场站名称*/
+    @ApiModelProperty(value = "场站名称")
+    private String yardName;
+    /***设备号*/
+    @ApiModelProperty(value = "设备号")
+    private String device;
+    /***钥匙位编号*/
+    @ApiModelProperty(value = "钥匙位编号")
+    private String cabinetNo;
+    /***是否删除；0为未删除，1已删除*/
+    @ApiModelProperty(value = "是否删除；0为未删除，1已删除")
+    private Boolean delFlag;
+
+    /***钥匙ID*/
+    @ApiModelProperty(value = "钥匙ID", example = "1")
+    private Integer keyInfoId;
+    @ApiModelProperty(value = "钥匙Code")
+    private String keyCode;
+
+    /***排班时间*/
+    @ApiModelProperty(value = "排班时间")
+    private java.util.Date scheduleDate;
+
+
+
+    /***排班ID*/
+    @ApiModelProperty(value = "排班ID")
+    private Long schedulingId;
+}
@@ -33,10 +33,13 @@ public class TakeKeyVo implements java.io.Serializable {
     @ApiModelProperty(value = "卡号")
     private String driverCode;
+    @ApiModelProperty(value = "工号")
+    private String staffCode;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "时间")
     private Date time;
-    
+
     @ApiModelProperty(value = "服务应答 0处理成功，1处理失败")
     private Integer result;
@@ -32,6 +32,8 @@ public class KeyBoxVo implements java.io.Serializable {
     private String parkingNo;
     @ApiModelProperty(value = "车牌号")
     private String plateNum;
+    @ApiModelProperty(value = "钥匙编号")
+    private String keyCode;
     @Override
     public String toString() {
@@ -111,6 +111,8 @@ public class LinggangKeyWorkLocation {
     private Date startScheduleDate;
     @TableField(exist = false)
     private Date endScheduleDate;
+    @TableField(exist = false)
+    private String plate;
     public enum LinggangKeyWorkLocationEventTypeEnum {
@@ -143,6 +143,11 @@ public class LinggangScheduling {
     @Excel(name = "终点站名字")
     private java.lang.String zdzname;
+    /***1:实际排班表；100为计划排班表*/
+    @Excel(name = "1:实际排班表；100为计划排班表")
+    private java.lang.Integer type;
+
+
     @TableField(exist = false)
     private String czCode;
@@ -152,6 +157,8 @@ public class LinggangScheduling {
     private Date  endScheduleDate;
+
+
     @Override
     public String toString() {
         return com.alibaba.fastjson2.JSON.toJSONString(this);
@@ -73,6 +73,11 @@ public class LinggangSchedulingAddDTO implements java.io.Serializable {
     /***钥匙ID*/
     @ApiModelProperty(value = "钥匙ID", example = "1")
     private Integer keyInfoId;
+
+    /***1:实际排班表；100为计划排班表*/
+    @ApiModelProperty(value="1:实际排班表；100为计划排班表",example ="1")
+    private java.lang.Integer type;
+
     /***操作人员*/
     @ApiModelProperty(value = "操作人员")
     private String operator;
@@ -74,6 +74,9 @@ public class LinggangSchedulingQueryDTO implements java.io.Serializable {
     @ApiModelProperty(value = "钥匙ID", example = "1")
     private Integer keyInfoId;
+    /***1:实际排班表；100为计划排班表*/
+    @ApiModelProperty(value="1:实际排班表；100为计划排班表",example ="1")
+    private java.lang.Integer type;
     @Override
     public String toString() {
@@ -73,6 +73,10 @@ public class LinggangSchedulingUpdateDTO implements java.io.Serializable {
     /***钥匙ID*/
     @ApiModelProperty(value = "钥匙ID", example = "1")
     private Integer keyInfoId;
+
+    /***1:实际排班表；100为计划排班表*/
+    @ApiModelProperty(value="1:实际排班表；100为计划排班表",example ="1")
+    private java.lang.Integer type;
     /***操作人员*/
     @ApiModelProperty(value = "操作人员")
     private String operator;
@@ -75,6 +75,11 @@ public class LinggangSchedulingVO implements java.io.Serializable {
     /***原因*/
     @ApiModelProperty(value = "原因")
     private String remark;
+
+    /***1:实际排班表；100为计划排班表*/
+    @ApiModelProperty(value = "1:实际排班表；100为计划排班表", example = "1")
+    private java.lang.Integer type;
+
     /***钥匙ID*/
     @ApiModelProperty(value = "钥匙ID", example = "1")
     private Integer keyInfoId;
@@ -24,8 +24,10 @@ import com.ruoyi.service.RuleAttendanceMainService;
 import com.ruoyi.service.RuleNumSettingService;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.utils.ConstDateUtil;
+import com.ruoyi.utils.DateUtil;
 import com.ruoyi.utils.ListUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -110,6 +112,9 @@ public class DriverJob implements InitializingBean {
     @Value("${api.url.getSchedulingInfoNew}")
     private String getSchedulingInfoUrl;
+    @Value("${api.url.getSchedulingInfoPlan}")
+    private String getSchedulingInfoPlan;
+
     @Value("${api.config.password}")
     private String password;
@@ -228,23 +233,29 @@ public class DriverJob implements InitializingBean {
      * 获取排班任务请求
      * 24小时执行一次
      */
-    public void getSchedulingInfo(String timeOut) {
+    public void getSchedulingInfo(long timeLong) {
         // TODO 获取当天的签到表
         long timestamp = System.currentTimeMillis();
-        String formatDate = ConstDateUtil.formatDate(timestamp);
+        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;
+//        String url = getSchedulingInfoPlan;
         try {
-            getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", formatDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
+            getSchedulingInfoUrl = String.format(url, "77", formatDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
         // 获取排班信息并存入redis
-        saveSchedulingToRedis(getSchedulingInfoUrl, formatDate, timeOut);
+        saveSchedulingToRedis(getSchedulingInfoUrl, formatDate, timeOut,date,type);
         // 删除两天前排班信息
         deleteScheduling();
         log.info("获取{}的排班数据完毕", formatDate);
@@ -339,8 +350,8 @@ public class DriverJob implements InitializingBean {
     }
-    public Map<String, List<ResponseSchedulingDto>> saveSchedulingToRedis(String getSchedulingInfoUrl, String dateKey, String timeOut) {
-        log.info("开始拉取排班:{}", dateKey);
+    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,
@@ -368,7 +379,7 @@ public class DriverJob implements InitializingBean {
             schedulingList.sort(Comparator.comparing(ResponseSchedulingDto::getFcsjT));
         }
         // 存入签到报表
-        THREAD_JOB_SERVICE.asyncComputedScheduling(driverSchedulingMap, timeOut);
+        THREAD_JOB_SERVICE.asyncComputedScheduling(driverSchedulingMap, timeOut,date,type);
         // 实时排班直接存入缓存
         SCHEDULING_CACHE.setCacheScheduling(DRIVER_SCHEDULING_PRE + dateKey, driverSchedulingMap);
         log.info("拉取排班完毕:{}", dateKey);
@@ -5,6 +5,7 @@ import com.ruoyi.domain.key.location.LinggangKeyWorkLocation;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import java.util.Collection;
 import java.util.List;
@@ -17,4 +18,6 @@ public interface LinggangKeyWorkLocationMapper extends BaseMapper&lt;LinggangKeyWor
     int insertSelective(LinggangKeyWorkLocation name);
     List<LinggangKeyWorkLocation> listOfDeviceKeyIdScheduleDate(@Param("localtions") List<LinggangKeyWorkLocation> locations);
+
+    List<LinggangKeyWorkLocation> listRecent(@Param("localtions") Collection<LinggangKeyWorkLocation> locations);
 }
 \ No newline at end of file
@@ -14,6 +14,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 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.sign.in.exception.report.EquipmentExceptionReport;
 import com.ruoyi.driver.domain.Driver;
@@ -28,7 +29,6 @@ import com.ruoyi.errorScheduling.domain.ErrorJobcode;
 import com.ruoyi.errorScheduling.service.IErrorJobcodeService;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.job.DriverJob;
-import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.pojo.GlobalIndex;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
@@ -36,6 +36,7 @@ import com.ruoyi.service.sign.in.exception.report.EquipmentExceptionReportServic
 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.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,9 +52,11 @@ import org.springframework.web.client.RestTemplate;
 import sun.misc.BASE64Decoder;
 import javax.annotation.Resource;
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -406,51 +409,39 @@ public class ThreadJobService {
      */
     @Async
     @Transactional(rollbackFor = {Exception.class})
-    public void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, String timeOut) {
-        if (StringUtils.isNotEmpty(timeOut)) {
-            LocalDate date = LocalDate.now();
-            Date date2 = ConstDateUtil.dateAddition(date.toString(), timeOut);
-            Date date1 = new Date();
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            // 如果当前日期小于设定时间就不获取固定排班
-            log.info("当前时间:{},设定时间:{}", simpleDateFormat.format(date1), simpleDateFormat.format(date2));
-            if (date1.compareTo(date2) < 0) {
-                log.info("当前日期小于设定时间就不获取排班，当前时间:{},设定时间:{}", simpleDateFormat.format(date1), simpleDateFormat.format(date2));
-                return;
-            }
-        }
+    public void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, String timeOut,Date date,int type) {
         //查询当天是否保存过考情表  如果不存在则保存
-        List<DriverScheduling> bcList = schedulingMapper.queryToDay(ConstDateUtil.formatDate("yyyy-MM-dd"), null, null, null);
+        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()));
         // 当天已有记录则不在保存  或者 调度记录为空则不在保存
         if ((CollectionUtil.isNotEmpty(dto) && CollectionUtil.isNotEmpty(bcList)) || originSchedulingMap.size() == 0) {
-            log.info("调度最新数据：{}", originSchedulingMap.size());
-            log.info("当天获取数据：{}", bcList.size());
+            log.info("调度最新数据：{},当天获取数据：{},时间:[{}]", originSchedulingMap.size(),bcList.size(),date);
             return;
         }
         // TODO maybe delete
         TempCache.resetMapStatus();
-        bcList = getBcList(originSchedulingMap);
+        bcList = getBcList(originSchedulingMap,type);
         // 处理非司售人员的排班明细
         bcList.addAll(handleOtherPostsScheduling());
         // 插入排班
         schedulingMapper.insertRoster(bcList);
+        String dateStr1 = DateUtil.YYYY_MM_DD_LINK.format(date);
         // 异常数据过多，不通过自增获取id再次查询获取
-        bcList = schedulingMapper.queryToDay(ConstDateUtil.formatDate("yyyy-MM-dd"), null, null, null);
+        bcList = schedulingMapper.queryToDay(dateStr1, null, null, null);
         // 处理缓存和错误排班
-        String date = ConstDateUtil.formatDate(new Date());
+        String dateStr = DateUtil.YYYY_MM_DD.format(date);
         if (!CollectionUtil.isEmpty(bcList)) {
             Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
             NowSchedulingCache.handlerResultMap(resultMap, bcList);
             // 更新缓存
-            nowSchedulingCache.setCacheScheduling(date, resultMap);
+            nowSchedulingCache.setCacheScheduling(dateStr, resultMap);
             // 获取错误排班
             List<ErrorJobcode> errorScheduling = getErrorScheduling(resultMap);
             // 插入错误排班
             errorJobcodeService.insertBatchErrorJobcode(errorScheduling);
         }
-        keyWorkLocationService.insertJob(ConstDateUtil.formatDate("yyyy-MM-dd"));
+        keyWorkLocationService.insertJob(dateStr1);
         log.info("当天排班数据获取完毕,共：{}条", bcList.size());
     }
@@ -524,7 +515,7 @@ public class ThreadJobService {
         return scheduling;
     }
-    private List<DriverScheduling> getBcList(Map<String, List<ResponseSchedulingDto>> originSchedulingMap) {
+    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()) {
@@ -535,6 +526,7 @@ public class ThreadJobService {
                         DriverScheduling scheduling = new DriverScheduling();
                         BeanUtils.copyProperties(item, scheduling, "id");
                         scheduling.setUpDown(Convert.toInt(item.getUpDown()));
+                        scheduling.setType(type);
                         return scheduling;
                     })
                     .sorted(Comparator.comparing(DriverScheduling::getFcsjT))
@@ -96,6 +96,7 @@ public class KeyBoxVoServiceImpl implements KeyBoxVoService {
 //        keyBoxVo.setYardName(Convert.toStr(keyInfo.getS()));
         keyBoxVo.setPlateNum(lingangScheduling.getNbbm());
         keyBoxVo.setParkingNo(carInfo.getParkingNo());
+        keyBoxVo.setKeyCode(keyInfo.getKeyCode());
         lingangEquipmentLinkeLogService.updateByPrimaryKey(linkeLog, null, HttpStatus.SUCCESS);
         return ResponseResult.success(keyBoxVo);
@@ -159,6 +159,24 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         return list(wrapper);
     }
+    private List<LinggangKeyWorkLocation> listRecent(Collection<LinggangKeyWorkLocation> locations) {
+        if (CollectionUtils.isEmpty(locations)) {
+            return Collections.emptyList();
+        }
+
+        return linggangKeyWorkLocationMapper.listRecent(locations);
+    }
+
+    private List<LinggangKeyWorkLocation> listRecentDates(Collection<Date> dates) {
+        if (CollectionUtils.isEmpty(dates)) {
+            return Collections.emptyList();
+        }
+
+        LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(LinggangKeyWorkLocation::getScheduleDate, dates);
+        return list(wrapper);
+    }
+
     // @Override
     // public List<LinggangKeyWorkLocation> listOfSelect(LinggangKeyWorkLocation entity) {
     //      LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
@@ -278,9 +296,9 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             resultStr.append("；");
         }
-        msg = convertMsg(success, TAKE_KEY_SUCESS);
-        if (StringUtils.isNotEmpty(msg)) {
-            resultStr.append(msg);
+        String successMsg = convertMsg(success, TAKE_KEY_SUCESS);
+        if (StringUtils.isNotEmpty(successMsg)) {
+            resultStr.append(successMsg);
             resultStr.append("；");
             return StringUtils.isEmpty(msg) ? ResponseResult.success(resultStr.toString()) : ResponseResult.error(resultStr.toString());
         }
@@ -374,89 +392,138 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         }
     }
+
     private ResponseResult<List<LinggangKeyWorkLocation>> checkTaskKey(List<LinggangKeyWorkLocation> locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum typeEnum) {
-        Set<Integer> keyCodes = locations.stream().map(LinggangKeyWorkLocation::getKeyInfoId).collect(Collectors.toSet());
-        List<KeyInfo> keyInfos = keyInfoService.listByIds(keyCodes);
-        if (CollectionUtils.isEmpty(keyInfos)) {
-            log.info("无法找到钥匙信息:[{}]", locations);
-            return ResponseResult.error404("无法找到钥匙信息");
+        Set<Integer> keyCodes = locations.stream().filter(l->Objects.nonNull(l.getKeyInfoId())).map(LinggangKeyWorkLocation::getKeyInfoId).collect(Collectors.toSet());
+
+        List<KeyInfo> keyInfos = null;
+        if(CollectionUtils.isNotEmpty(keyCodes)){
+            keyInfos = keyInfoService.listByIds(keyCodes);
         }
-        StringBuilder resultStr = new StringBuilder();
-        List<LinggangKeyWorkLocation> source = locations.stream().filter(l -> Objects.nonNull(l.getKeyInfoId())).collect(Collectors.toList());
-        List<LinggangKeyWorkLocation> target = locations.stream().filter(l -> Objects.isNull(l.getKeyInfoId())).collect(Collectors.toList());
-
-        if (CollectionUtils.isNotEmpty(target)) {
-            String msg = convertMsgOfKeyInfo(target);
-            if (StringUtils.isNotEmpty(msg)) {
-                resultStr.append(msg);
-                resultStr.append("；");
-            }
+        Set<Date> dates = locations.stream().map(LinggangKeyWorkLocation::getScheduleDate).collect(Collectors.toSet());
+
+        List<LinggangKeyWorkLocation> sources = listRecentDates(dates).stream().filter(s -> !Objects.equals(s.getType(), typeEnum.getValue())).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(sources)) {
+            return ResponseResult.error404("无法找到钥匙归还信息");
         }
-        if (CollectionUtils.isEmpty(source)) {
-            return ResponseResult.error404(resultStr.toString());
+        if (CollectionUtils.isEmpty(keyInfos)) {
+            Set<Integer> keyInfoId = sources.stream().map(LinggangKeyWorkLocation::getKeyInfoId).collect(Collectors.toSet());
+            keyInfos = keyInfoService.listByIds(keyInfoId);
         }
-        List<LinggangKeyWorkLocation> querySource = locations.stream().map(l -> {
-            LinggangKeyWorkLocation location = new LinggangKeyWorkLocation();
-            location.setDevice(l.getDevice());
-            location.setKeyInfoId(l.getKeyInfoId());
-            location.setScheduleDate(l.getScheduleDate());
-            location.setType(typeEnum.getValue());
-            return location;
+        List<KeyInfo> keyInfoList = keyInfos;
+        int size = CollectionUtils.size(keyInfoList);
+
+        sources = sources.stream().map(s -> {
+            if (size > 0) {
+                Optional<KeyInfo> optKey = keyInfoList.stream().filter(k -> Objects.equals(k.getId(), s.getKeyInfoId())).findFirst();
+                if (optKey.isPresent()) {
+                    s.setPlate(optKey.get().getPlateNum());
+                }
+            }
+            return s;
         }).collect(Collectors.toList());
-        List<LinggangKeyWorkLocation> dataSource = listOfDeviceKeyIdScheduleDate(querySource);
-        if (CollectionUtils.isEmpty(dataSource)) {
-            log.info("无法找到钥匙存放信息:[{}][{}]", querySource, locations);
-            resultStr.append("无法找到钥匙存放信息");
-            resultStr.append("；");
-            return ResponseResult.error404(resultStr.toString());
-        }
+        List<LinggangKeyWorkLocation> workLocations = sources;
-        List<LinggangKeyWorkLocation> locationList = new ArrayList<>();
-        source = source.stream().map(l -> {
-            Optional<LinggangKeyWorkLocation> optional = dataSource.stream().filter(d -> Objects.equals(d.getKeyInfoId(), l.getKeyInfoId()) &&
-                    Objects.equals(d.getDevice(), l.getDevice()) && DateUtils.isSameDay(d.getScheduleDate(), l.getScheduleDate())).findFirst();
+        locations = locations.stream().map(l -> {
+//            Optional<LinggangKeyWorkLocation> optional = workLocations.stream().filter(s -> DateUtils.isSameDay(s.getScheduleDate(),
+//                    l.getScheduleDate()) && Objects.equals(s.getPlate(), l.getPlate()) && Objects.equals(s.getDevice(), l.getDevice())).findFirst();
+            Optional<LinggangKeyWorkLocation> optional = workLocations.stream().filter(s -> DateUtils.isSameDay(s.getScheduleDate(),
+                    l.getScheduleDate()) && Objects.equals(s.getPlate(), l.getPlate())).findFirst();
             if (optional.isPresent()) {
                 l.setId(optional.get().getId());
-                if (Objects.equals(l.getType(), optional.get().getType())) {
-                    locationList.add(l);
-                    return null;
-                }
             }
             return l;
-        }).filter(l -> Objects.nonNull(l)).collect(Collectors.toList());
-
-        if (CollectionUtils.isNotEmpty(locationList)) {
-            String msg = convertMsgOfKeyInfoLocalEventType(locations);
-            if (StringUtils.isNotEmpty(msg)) {
-                resultStr.append(msg);
-                resultStr.append("；");
-            }
-        }
-
-        if (CollectionUtils.isEmpty(source)) {
-            log.info("无法找到钥匙存放信息:[{}][{}]", locationList, locations);
-            return ResponseResult.error404(resultStr.toString());
-        }
-
-        target = source.stream().filter(l -> Objects.isNull(l.getId())).collect(Collectors.toList());
-        if (CollectionUtils.isNotEmpty(target)) {
-            String msg = convertMsgOfKeyInfoLocal(target);
-            if (StringUtils.isNotEmpty(msg)) {
-                resultStr.append(msg);
-                resultStr.append("；");
-            }
+        }).collect(Collectors.toList());
-        }
-        source = source.stream().filter(l -> Objects.nonNull(l.getId())).collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(source)) {
-            return ResponseResult.error404(resultStr.toString());
-        }
-        return ResponseResult.success(source);
+        return ResponseResult.success(locations);
+
+//        StringBuilder resultStr = new StringBuilder();
+//        if (Objects.equals(typeEnum.getValue(), LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.TAKE_OUT.getValue())) {
+//            List<LinggangKeyWorkLocation> source = locations.stream().filter(l -> Objects.equals(l.getType(), 1)).collect(Collectors.toList());
+//            return ResponseResult.success(source);
+//        }
+//        List<LinggangKeyWorkLocation> source = locations.stream().filter(l ->  Objects.equals(l.getType(), 0)).collect(Collectors.toList());
+//        return ResponseResult.success(source);
+
+//        List<LinggangKeyWorkLocation> source = locations.stream().filter(l -> Objects.nonNull(l.getKeyInfoId())).collect(Collectors.toList());
+//        List<LinggangKeyWorkLocation> target = locations.stream().filter(l -> Objects.isNull(l.getKeyInfoId())).collect(Collectors.toList());
+//
+//        if (CollectionUtils.isNotEmpty(target)) {
+//            String msg = convertMsgOfKeyInfo(target);
+//            if (StringUtils.isNotEmpty(msg)) {
+//                resultStr.append(msg);
+//                resultStr.append("；");
+//            }
+//        }
+//
+//        if (CollectionUtils.isEmpty(source)) {
+//            return ResponseResult.error404(resultStr.toString());
+//        }
+//
+//        List<LinggangKeyWorkLocation> querySource = locations.stream().map(l -> {
+//            LinggangKeyWorkLocation location = new LinggangKeyWorkLocation();
+//            location.setDevice(l.getDevice());
+//            location.setKeyInfoId(l.getKeyInfoId());
+//            location.setScheduleDate(l.getScheduleDate());
+//            location.setType(typeEnum.getValue());
+//            return location;
+//        }).collect(Collectors.toList());
+//
+//        List<LinggangKeyWorkLocation> dataSource = listOfDeviceKeyIdScheduleDate(querySource);
+//        if (CollectionUtils.isEmpty(dataSource)) {
+//            log.info("无法找到钥匙存放信息:[{}][{}]", querySource, locations);
+//            resultStr.append("无法找到钥匙存放信息");
+//            resultStr.append("；");
+//            return ResponseResult.error404(resultStr.toString());
+//        }
+//
+//        List<LinggangKeyWorkLocation> locationList = new ArrayList<>();
+//        source = source.stream().map(l -> {
+//            Optional<LinggangKeyWorkLocation> optional = dataSource.stream().filter(d -> Objects.equals(d.getKeyInfoId(), l.getKeyInfoId()) &&
+//                    Objects.equals(d.getDevice(), l.getDevice()) && DateUtils.isSameDay(d.getScheduleDate(), l.getScheduleDate())).findFirst();
+//            if (optional.isPresent()) {
+//                l.setId(optional.get().getId());
+//                if (Objects.equals(l.getType(), optional.get().getType())) {
+//                    locationList.add(l);
+//                    return null;
+//                }
+//            }
+//            return l;
+//        }).filter(l -> Objects.nonNull(l)).collect(Collectors.toList());
+//
+//        if (CollectionUtils.isNotEmpty(locationList)) {
+//            String msg = convertMsgOfKeyInfoLocalEventType(locations);
+//            if (StringUtils.isNotEmpty(msg)) {
+//                resultStr.append(msg);
+//                resultStr.append("；");
+//            }
+//        }
+//
+//        if (CollectionUtils.isEmpty(source)) {
+//            log.info("无法找到钥匙存放信息:[{}][{}]", locationList, locations);
+//            return ResponseResult.error404(resultStr.toString());
+//        }
+//
+//        target = source.stream().filter(l -> Objects.isNull(l.getId())).collect(Collectors.toList());
+//        if (CollectionUtils.isNotEmpty(target)) {
+//            String msg = convertMsgOfKeyInfoLocal(target);
+//            if (StringUtils.isNotEmpty(msg)) {
+//                resultStr.append(msg);
+//                resultStr.append("；");
+//            }
+//
+//        }
+//        source = source.stream().filter(l -> Objects.nonNull(l.getId())).collect(Collectors.toList());
+//        if (CollectionUtils.isEmpty(source)) {
+//            return ResponseResult.error404(resultStr.toString());
+//        }
+//
+//        return ResponseResult.success(source);
     }
     private String convertMsgOfKeyInfo(List<LinggangKeyWorkLocation> target) {
@@ -593,7 +660,8 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
                     continue;
                 }
                 if (Objects.isNull(equipment.getLatticeNumberSet())) {
-                    equipment.setLatticeNumberSet(combationLattice(equipment));
+//                    equipment.setLatticeNumberSet(combationLattice(equipment));
+                    equipment.setLatticeNumberSet(new HashSet<>());
                 }
                 number = RandomUtils.nextInt(1, equipment.getLatticeNumber());
@@ -627,7 +695,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             location.setYardId(equipment.getYardId());
             location.setYardName(optional.get().getName());
             location.setDevice(equipment.getDeviceId());
-            location.setCabinetNo(number.toString());
+//            location.setCabinetNo(number.toString());
             location.setEventType(0);
             location.setDelFlag(Boolean.FALSE);
             location.setKeyInfoId(carKeyInfo.get(0).getId());
@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 @Service
 /** Service实现类*/
@@ -83,6 +84,7 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
     @Override
     public Integer countId(LinggangScheduling entity) {
         LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
+        switchScheduleDate(wrapper,entity);
         wrapper.select(LinggangScheduling::getId);
         return count(wrapper);
     }
@@ -240,4 +242,14 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
             wrapper.orderByDesc(LinggangScheduling::getId);
         }
     }
+
+    private void switchScheduleDate(LambdaQueryWrapper<LinggangScheduling> wrapper,LinggangScheduling entity){
+        if(Objects.nonNull(entity.getStartScheduleDate()) && Objects.nonNull(entity.getEndScheduleDate())){
+            wrapper.between(LinggangScheduling::getScheduleDate,entity.getStartScheduleDate(),entity.getEndScheduleDate());
+        }else if(Objects.nonNull(entity.getStartScheduleDate())){
+            wrapper.ge(LinggangScheduling::getScheduleDate,entity.getStartScheduleDate());
+        }else if(Objects.nonNull(entity.getEndScheduleDate())){
+            wrapper.le(LinggangScheduling::getScheduleDate,entity.getEndScheduleDate());
+        }
+    }
 }
 \ No newline at end of file
@@ -17,9 +17,12 @@ public class DateUtil {
     public static FastDateFormat YYYY_MM_DD_LINK_HH_MM_SS = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss");
     public static FastDateFormat YYYY_MM_DD_LINK = FastDateFormat.getInstance("yyyy-MM-dd");
+    public static FastDateFormat YYYY_MM_DD = FastDateFormat.getInstance("yyyyMMdd");
+    public static FastDateFormat HH_MM_ss = FastDateFormat.getInstance("HH:mm:ss");
     public static DateTimeFormatter YYYY_MM_DD_LINK_HH_MM_SS_Local_Date = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
     public static DateTimeFormatter YYYY_MM_DD_LINK_Local_Date = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
     public static LocalDateTime parseLocalDateTime(String dateStr) {
         return StringUtils.isEmpty(dateStr) ? null : LocalDateTime.parse(dateStr, YYYY_MM_DD_LINK_HH_MM_SS_Local_Date);
     }
@@ -166,6 +166,7 @@ api:
         # 获取排班信息
         getSchedulingInfo: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
         getSchedulingInfoNew: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoPlan: http://58.34.47.74:9089/webservice/rest/schedule/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
     config:
         password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
         # 随机字符串
@@ -166,6 +166,7 @@ api:
         # 获取排班信息
         getSchedulingInfo: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
         getSchedulingInfoNew: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoPlan: http://58.34.47.74:9089/webservice/rest/schedule/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
     config:
         password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
         # 随机字符串
@@ -82,6 +82,7 @@
             <if test="date != null and date != ''">
                 and schedule_date = #{date}
             </if>
+            and scheduling.type = 1
         </where>
@@ -33,6 +33,14 @@
         )
     </select>
+    <select id="listRecent" resultMap="BaseResultMap">
+        select <include refid="columns"></include> from key_work_location
+        where 1=1 and
+        <foreach collection="localtions" open="(" close=")" separator="or " item="item">
+            <include refid="where"></include>
+        </foreach>
+    </select>
+
     <sql id="columns">
         id
         ,  yard_Id   ,  yard_Name   ,  device   ,  cabinet_No   ,  create_by   ,  create_time   ,  update_by   ,  update_time   ,  del_flag   ,  event_Type   ,  key_info_id   ,  schedule_date   ,  scheduling_id