设备和场地

liujun001
1 parent e0285cdd
Showing 25 changed files with 537 additions and 67 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/TestController.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/key/location/LinggangKeyWorkLocation.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/LinggangScheduling.java
Bsth-admin/src/main/java/com/ruoyi/equipment/domain/Equipment.java
Bsth-admin/src/main/java/com/ruoyi/equipment/service/IEquipmentService.java
Bsth-admin/src/main/java/com/ruoyi/equipment/service/impl/EquipmentServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/job/KeyWorkLocalJob.java
Bsth-admin/src/main/java/com/ruoyi/mapper/scheduling/LinggangSchedulingMapper.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/carinfo/CarInfoService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/carinfo/CarInfoServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/info/KeyInfoServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/scheduling/LinggangSchedulingServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/venue/info/LinggangVenueInfoServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/key/info/KeyInfoService.java
Bsth-admin/src/main/java/com/ruoyi/service/key/location/LinggangKeyWorkLocationService.java
Bsth-admin/src/main/java/com/ruoyi/service/scheduling/LinggangSchedulingService.java
+package com.ruoyi.controller;
+
+import com.ruoyi.common.core.domain.ResponseResult;
+import com.ruoyi.job.DriverJob;
+import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
+import io.swagger.annotations.ApiOperation;
+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.RestController;
+
+/**
+ * @author liujun
+ * @date 2024年07月30日 14:37
+ */
+@RestController
+@RequestMapping("/test")
+public class TestController {
+    @Autowired
+    private DriverJob driverJob;
+    @Autowired
+    private LinggangKeyWorkLocationService keyWorkLocationService;
+
+    @GetMapping(value = "/test")
+    @ApiOperation("test")
+    public ResponseResult<Boolean> test() {
+        driverJob.getSchedulingInfo("02:30:30");
+        return ResponseResult.success();
+    }
+
+    @GetMapping(value = "/key/info/local")
+    @ApiOperation("/key/info/local")
+    public ResponseResult<Boolean> testKeyInfoLocal() {
+        keyWorkLocationService.insertJob("2024-07-30");
+        return ResponseResult.success();
+    }
+}
@@ -25,6 +25,7 @@ import com.ruoyi.domain.key.info.box.dto.KeyBoxQueryDTO;
 import com.ruoyi.domain.key.info.box.vo.KeyBoxVo;
 import com.ruoyi.domain.key.location.LinggangKeyWorkLocation;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
+import com.ruoyi.domain.venue.info.LinggangVenueInfo;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
 import com.ruoyi.service.carinfo.CarInfoService;
@@ -35,6 +36,7 @@ import com.ruoyi.service.key.info.KeyInfoService;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import com.ruoyi.service.venue.info.LinggangVenueInfoService;
+import com.ruoyi.utils.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
@@ -104,12 +106,12 @@ public class KeyBoxController extends BaseController {
             if (Objects.isNull(scheduling)) {
                 return ResponseResult.error(TipEnum.TIP_3.getCode(), TipEnum.TIP_3.getMsg());
             }
-            LinggangKeyWorkLocation workLocation = queryKeyWorkLocation(scheduling.getKeyInfoId(), scheduling.getScheduleDate(), dto);
+            LinggangKeyWorkLocation workLocation = queryKeyWorkLocation(scheduling, dto);
             if (Objects.isNull(workLocation)) {
                 return ResponseResult.error(TipEnum.TIP_4.getCode(), TipEnum.TIP_4.getMsg());
             }
-            KeyInfo keyInfo = queryKeyInfo(scheduling.getKeyInfoId());
+            KeyInfo keyInfo = queryKeyInfo(workLocation.getKeyInfoId());
             if (Objects.isNull(keyInfo)) {
                 return ResponseResult.error404();
             }
@@ -119,7 +121,12 @@ public class KeyBoxController extends BaseController {
                 return ResponseResult.error404();
             }
-            WorkPlateV2Vo vo = convertWorkPlateV2Vo(scheduling, workLocation, keyInfo, carInfo);
+            Equipment equipment = queryEquipment(dto.getDevice());
+            LinggangVenueInfo venueInfo = null;
+            if (Objects.nonNull(equipment)) {
+                venueInfo = venueInfoService.getById(equipment.getYardId());
+            }
+            WorkPlateV2Vo vo = convertWorkPlateV2Vo(scheduling, workLocation, keyInfo, carInfo, equipment, venueInfo);
             return ResponseResult.success(vo);
         } catch (ParseException e) {
             logger.error("司机获取当前工作的车辆钥匙信息异常:[{}]", dto, e);
@@ -143,12 +150,6 @@ public class KeyBoxController extends BaseController {
                 return ResponseResult.error404();
             }
-            Set<Long> schedulingIds = workLocations.stream().map(LinggangKeyWorkLocation::getSchedulingId).collect(Collectors.toSet());
-            List<LinggangScheduling> schedulings = queryScheduling(schedulingIds);
-            if (CollectionUtils.isEmpty(schedulings)) {
-                logger.info("根据DTO的数据无法查询排班信息:[{}]", dto);
-                return ResponseResult.error404();
-            }
             Equipment equipment = queryEquipment(dto.getDevice());
             if (Objects.isNull(equipment)) {
@@ -156,6 +157,17 @@ public class KeyBoxController extends BaseController {
                 return ResponseResult.error404();
             }
+            Equipment eq = new Equipment();
+            eq.setYardId(equipment.getYardId());
+            eq.setStatus(1);
+
+            List<Equipment> equipmentList = equipmentService.list(eq);
+            LinggangVenueInfo venueInfo = venueInfoService.getById(equipment.getYardId());
+            if(Objects.isNull(venueInfo)){
+                logger.info("根据DTO的数据无法查询场站信息:[{}]", dto);
+                return ResponseResult.error404();
+            }
+
             Set<Integer> keyInfoIds = workLocations.stream().map(LinggangKeyWorkLocation::getKeyInfoId).collect(Collectors.toSet());
             List<KeyInfo> keyInfos = queryKeyInfos(keyInfoIds);
             if (CollectionUtils.isEmpty(keyInfos)) {
@@ -163,6 +175,16 @@ public class KeyBoxController extends BaseController {
                 return ResponseResult.error404();
             }
+            LinggangScheduling scheduling = new LinggangScheduling();
+            scheduling.setCzCode(venueInfo.getParkCode());
+            scheduling.setStartScheduleDate(DateUtil.shortDate(dto.getTime()));
+
+            List<LinggangScheduling> schedulings = schedulingService.listByCZ(scheduling);
+            if (CollectionUtils.isEmpty(schedulings)) {
+                logger.info("根据DTO的数据无法查询排班信息:[{}]", dto);
+                return ResponseResult.error404();
+            }
+
             Set<String> jobCodes = schedulings.stream().map(LinggangScheduling::getJobCode).collect(Collectors.toSet());
             List<NewDriver> drivers = queryDrive(jobCodes);
             if (CollectionUtils.isEmpty(drivers)) {
@@ -177,7 +199,7 @@ public class KeyBoxController extends BaseController {
                 return ResponseResult.error404();
             }
-            BasicSyncVo vo = convertBasicSyncVo(workLocations, schedulings, keyInfos, drivers, carInfos, equipment);
+            BasicSyncVo vo = convertBasicSyncVo(workLocations, schedulings, keyInfos, drivers, carInfos, equipment, venueInfo,equipmentList);
             return ResponseResult.success(vo);
         } catch (ParseException e) {
             logger.error("钥匙柜基础信息同步异常:[{}]", dto, e);
@@ -324,7 +346,8 @@ public class KeyBoxController extends BaseController {
         String dateStr = DateUtils.YYYY_MM_DD.format(dto.getTime());
         scheduling.setScheduleDate(DateUtils.YYYY_MM_DD.parse(dateStr));
-        String bcType = Objects.equals(0, dto.getEventType()) ? ConstDriverProperties.BC_TYPE_OUT : Objects.equals(1, dto.getEventType()) ? ConstDriverProperties.BC_TYPE_IN : "other";
+//        String bcType = Objects.equals(0, dto.getEventType()) ? ConstDriverProperties.BC_TYPE_OUT : Objects.equals(1, dto.getEventType()) ? ConstDriverProperties.BC_TYPE_IN : "other";
+        String bcType = ConstDriverProperties.BC_TYPE_IN;
         scheduling.setBcType(bcType);
         return schedulingService.getOne(scheduling);
@@ -347,10 +370,10 @@ public class KeyBoxController extends BaseController {
      * @param dto
      * @return com.ruoyi.domain.key.location.LinggangKeyWorkLocation
      */
-    private LinggangKeyWorkLocation queryKeyWorkLocation(Integer keyId, Date scheduleDate, WorkPlateV2DTO dto) {
+    private LinggangKeyWorkLocation queryKeyWorkLocation(LinggangScheduling scheduling, WorkPlateV2DTO dto) {
         LinggangKeyWorkLocation workLocation = new LinggangKeyWorkLocation();
-        workLocation.setKeyInfoId(keyId);
-        workLocation.setScheduleDate(scheduleDate);
+        workLocation.setKeyInfoId(scheduling.getKeyInfoId());
+        workLocation.setSchedulingId(scheduling.getId());
         return linggangKeyWorkLocationService.getOne(workLocation);
     }
@@ -421,8 +444,17 @@ public class KeyBoxController extends BaseController {
         return linkeLog;
     }
-    private WorkPlateV2Vo convertWorkPlateV2Vo(LinggangScheduling scheduling, LinggangKeyWorkLocation workLocation, KeyInfo keyInfo, CarInfo carInfo) {
+    private WorkPlateV2Vo convertWorkPlateV2Vo(LinggangScheduling scheduling, LinggangKeyWorkLocation workLocation, KeyInfo keyInfo, CarInfo carInfo,
+                                               Equipment equipment, LinggangVenueInfo venueInfo) {
         WorkPlateV2Vo vo = new WorkPlateV2Vo();
+        if (Objects.nonNull(venueInfo)) {
+            vo.setYardId(Convert.toStr(venueInfo.getId()));
+            vo.setYardName(venueInfo.getName());
+        }
+
+        if (Objects.nonNull(equipment)) {
+            vo.setDeviceName(equipment.getName());
+        }
 //        vo.setYardName(keyInfo.getY)
         vo.setDevice(workLocation.getDevice());
         vo.setCabinetNo(workLocation.getCabinetNo());
@@ -432,55 +464,72 @@ public class KeyBoxController extends BaseController {
     }
     private BasicSyncVo convertBasicSyncVo(List<LinggangKeyWorkLocation> workLocations, List<LinggangScheduling> schedulings,
-                                           List<KeyInfo> keyInfos, List<NewDriver> drivers, List<CarInfo> carInfos, Equipment equipment) {
+                                           List<KeyInfo> keyInfos, List<NewDriver> drivers, List<CarInfo> carInfos, Equipment equipment,
+                                           LinggangVenueInfo venueInfo, List<Equipment> equipmentList) {
         BasicSyncVo vo = new BasicSyncVo();
         vo.setDevice(equipment.getDeviceId());
         vo.setDeviceType(equipment.getPromise());
         vo.setTime(workLocations.get(0).getScheduleDate());
-        vo.setYardName(equipment.getName());
-//        vo.setKeyboxName()
-
-        List<BasicSyncKeyboxVo> keybox = new ArrayList<>();
-        BasicSyncKeyboxVo boxvo = new BasicSyncKeyboxVo();
-        List<BasicSyncKeyboxKeyItemVo> keyItemVos = workLocations.stream().map(local -> {
-            Optional<KeyInfo> optional = keyInfos.stream().filter(k -> Objects.equals(k.getId(), local.getKeyInfoId())).findFirst();
-            String keyCode = optional.isPresent() ? optional.get().getName() : null;
-            return new BasicSyncKeyboxKeyItemVo(local.getCabinetNo(), keyCode);
+        if(Objects.nonNull(venueInfo)) {
+            vo.setYardName(venueInfo.getName());
+        }
+        vo.setKeyboxName(equipment.getName());
-        }).collect(Collectors.toList());
-        keybox.add(boxvo);
-        boxvo.setKeyItem(keyItemVos);
+        if (CollectionUtils.isNotEmpty(equipmentList)) {
+            List<BasicSyncKeyboxVo> keyboxVos = equipmentList.stream().map(eq -> {
+                BasicSyncKeyboxVo keyboxVo = new BasicSyncKeyboxVo();
+                keyboxVo.setName(eq.getName());
+                keyboxVo.setDevice(eq.getDeviceId());
+                if (Objects.nonNull(eq.getLatticeNumber()) && eq.getLatticeNumber() > 0) {
+                    List<BasicSyncKeyboxKeyItemVo> itemVos = new ArrayList<>(eq.getLatticeNumber());
+                    for (int i = 0; i < eq.getLatticeNumber(); i++) {
+                        itemVos.add(new BasicSyncKeyboxKeyItemVo(Convert.toStr(i + 1), null));
+                    }
+                    keyboxVo.setKeyItem(itemVos);
+                }
+                return keyboxVo;
+            }).collect(Collectors.toList());
+            vo.setKeybox(keyboxVos);
+        }
         List<BasicSyncDriverWorkVo> driverWork = new ArrayList<>();
-        BasicSyncDriverWorkVo basicSyncDriverWorkVo = new BasicSyncDriverWorkVo();
-
-        List<BasicSyncDriverWorkDriverPlanVo> driverPlanVos = schedulings.stream().map(sc -> {
-            BasicSyncDriverWorkDriverPlanVo driverPlanVo = new BasicSyncDriverWorkDriverPlanVo();
-            Optional<NewDriver> optional = drivers.stream().filter(d -> Objects.equals(d.getJobCode(), sc.getJobCode())).findFirst();
-            if (optional.isPresent()) {
-                driverPlanVo.setDriverCode(optional.get().getIcCardCode());
-            }
+        if (CollectionUtils.isNotEmpty(schedulings)) {
+            Map<Date, List<LinggangScheduling>> schedulingMap = schedulings.stream().collect(Collectors.groupingBy(LinggangScheduling::getScheduleDate));
+            schedulingMap.forEach((key, schedulingList) -> {
+                BasicSyncDriverWorkVo driverPlanVo = new BasicSyncDriverWorkVo();
+                driverPlanVo.setPlanDate(key);
+                if (CollectionUtils.isNotEmpty(schedulingList)) {
+                    List<BasicSyncDriverWorkDriverPlanVo> planVos = schedulingList.stream().map(sc -> {
+                        BasicSyncDriverWorkDriverPlanVo planVo = new BasicSyncDriverWorkDriverPlanVo();
+                        Optional<NewDriver> optional = drivers.stream().filter(d -> Objects.equals(d.getJobCode(), sc.getJobCode())).findFirst();
+                        if (!optional.isPresent()) {
+                            return null;
+                        }
-            driverPlanVo.setStaffCode(sc.getJobCode());
+                        Optional<CarInfo> carInfoOptional = carInfos.stream().filter(c -> Objects.equals(c.getNbbm(), sc.getNbbm())).findFirst();
+                        if (!optional.isPresent()) {
+                            return null;
-            BasicSyncDriverWorkDriverPlanTimePlateVo planTimePlateVo = new BasicSyncDriverWorkDriverPlanTimePlateVo();
-            planTimePlateVo.setKey(sc.getScheduleDate());
-            Optional<CarInfo> carInfoOptional = carInfos.stream().filter(c -> Objects.equals(c.getNbbm(), sc.getNbbm())).findFirst();
-            if (optional.isPresent()) {
-                planTimePlateVo.setValue(carInfoOptional.get().getPlateNum());
-            }
+                        }
+                        planVo.setDriverCode(optional.get().getIcCardCode());
+                        planVo.setStaffCode(sc.getJobCode());
+                        BasicSyncDriverWorkDriverPlanTimePlateVo planTimePlateVo = new BasicSyncDriverWorkDriverPlanTimePlateVo();
+                        planTimePlateVo.setKey(sc.getScheduleDate());
-            driverPlanVo.setTimePlate(planTimePlateVo);
-            return driverPlanVo;
-        }).collect(Collectors.toList());
+                        planTimePlateVo.setValue(carInfoOptional.get().getPlateNum());
+                        planVo.setTimePlate(planTimePlateVo);
-        basicSyncDriverWorkVo.setDriverPlan(driverPlanVos);
-        driverWork.add(basicSyncDriverWorkVo);
+                        return planVo;
+                    }).filter(obj->Objects.nonNull(obj)).collect(Collectors.toList());
-        vo.setKeybox(keybox);
+                    driverPlanVo.setDriverPlan(planVos);
+                }
+                driverWork.add(driverPlanVo);
+            });
+        }
         vo.setDriverWork(driverWork);
         return vo;
 package com.ruoyi.domain;
 import lombok.Data;
-import org.apache.poi.hpsf.Decimal;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -31,4 +30,14 @@ public class DriverScheduling {
      * 不是当前表的属性
      */
     private String fleetName;
+    /**上下行*/
+    private Integer upDown;
+    /**起点站code*/
+    private String qdzCode;
+    /**起点站名字*/
+    private String qdzName;
+    /**终点站code*/
+    private String zdzCode;
+    /**终点站名字*/
+    private String zdzName;
 }
@@ -101,7 +101,7 @@ public class LinggangKeyWorkLocation {
     @TableField(exist = false)
     private String key;
     /***状态：1 是归还；0是借出*/
-    @Excel(name = "状态：1 是归还；0是借出")
+    @Excel(name = "状态：1 是归还；0是借出;2是初始状态")
     private java.lang.Integer type;
     @TableField(exist = false)
 package com.ruoyi.domain.scheduling;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.Excel;
@@ -118,6 +119,38 @@ public class LinggangScheduling {
     @Excel(name = "钥匙ID")
     private Integer keyInfoId;
+    /***上下行*/
+    @Excel(name = "上下行")
+    private java.lang.Integer updown;
+
+
+    /***起点站code*/
+    @Excel(name = "起点站code")
+    private java.lang.String qdzcode;
+
+
+    /***起点站名字*/
+    @Excel(name = "起点站名字")
+    private java.lang.String qdzname;
+
+
+    /***终点站code*/
+    @Excel(name = "终点站code")
+    private java.lang.String zdzcode;
+
+
+    /***终点站名字*/
+    @Excel(name = "终点站名字")
+    private java.lang.String zdzname;
+
+    @TableField(exist = false)
+    private String czCode;
+
+    @TableField(exist = false)
+    private Date  startScheduleDate;
+    @TableField(exist = false)
+    private Date  endScheduleDate;
+
     @Override
     public String toString() {
@@ -8,6 +8,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
+import java.util.Set;
+
 /**
  * 设备信息对象 equipment
  *
@@ -107,6 +109,9 @@ public class Equipment extends BaseEntity {
     @TableField(exist = false)
     private String yardName;
+    @TableField(exist = false)
+    private Set<Integer> latticeNumberSet;
+
     @Override
@@ -63,6 +63,8 @@ public interface IEquipmentService extends IService&lt;Equipment&gt; {
     List<Equipment> listNameAndIDBydeviceIds(Collection<String> deviceIds);
+    List<Equipment> listByEntityAndYardIds(Equipment entity,Collection<Integer> yardIds);
+
     /**
      * 查询设备信息列表
      *
@@ -98,6 +98,22 @@ public class EquipmentServiceImpl extends ServiceImpl&lt;EquipmentMapper, Equipment
         return list(wrapper);
     }
+    @Override
+    public List<Equipment> listByEntityAndYardIds(Equipment entity, Collection<Integer> yardIds) {
+        LambdaQueryWrapper<Equipment> wrapper = null;
+        if (Objects.isNull(entity)) {
+            wrapper = new LambdaQueryWrapper<>();
+        } else {
+            wrapper = new LambdaQueryWrapper<>(entity);
+        }
+
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(yardIds)) {
+            wrapper.in(Equipment::getYardId, yardIds);
+        }
+
+        return list(wrapper);
+    }
+
     /**
      * 查询设备信息列表
      *
+package com.ruoyi.job;
+
+/**
+ * @author liujun
+ * @date 2024年07月30日 15:12
+ */
+public class KeyWorkLocalJob {
+}
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
 import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
 @Mapper
 /** Mapper接口*/
@@ -12,4 +14,6 @@ public interface LinggangSchedulingMapper extends BaseMapper&lt;LinggangScheduling&gt;
      * 插入有值的列
      */
     int insertSelective(LinggangScheduling name);
+
+    List<LinggangScheduling>  listByCZ(LinggangScheduling entity);
 }
 \ No newline at end of file
@@ -29,6 +29,7 @@ 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;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
 import com.ruoyi.utils.ConstDateUtil;
@@ -111,6 +112,8 @@ public class ThreadJobService {
     @Autowired
     private RestTemplate restTemplate;
+    @Autowired
+    private LinggangKeyWorkLocationService keyWorkLocationService;
     /**
@@ -436,6 +439,7 @@ public class ThreadJobService {
             // 插入错误排班
             errorJobcodeService.insertBatchErrorJobcode(errorScheduling);
         }
+        keyWorkLocationService.insertJob(ConstDateUtil.formatDate("yyyy-MM-dd"));
         log.info("当天排班数据获取完毕,共：{}条", bcList.size());
     }
@@ -23,6 +23,7 @@ public interface CarInfoService extends IService&lt;CarInfo&gt; {
     List<CarInfo> likePlateNumPlateNumTop30(CarInfo entity);
     /**根据车辆自编号查询车辆信息*/
     List<CarInfo> list(Collection<String> nbbms);
+    List<CarInfo> list(CarInfo carInfo,Collection<String> nbbms);
     /***
      *用于页面选择
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 @Service
 public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> implements CarInfoService {
@@ -79,6 +80,21 @@ public class CarInfoServiceImpl extends ServiceImpl&lt;CarInfoMapper, CarInfo&gt; impl
     }
     @Override
+    public List<CarInfo> list(CarInfo carInfo, Collection<String> nbbms) {
+        LambdaQueryWrapper<CarInfo> wrapper = null;
+        if(Objects.isNull(carInfo)) {
+            wrapper = new LambdaQueryWrapper<>();
+        }else{
+            wrapper = new LambdaQueryWrapper<>(carInfo);
+        }
+
+        if (CollectionUtils.isNotEmpty(nbbms)) {
+            wrapper.in(CarInfo::getNbbm, nbbms);
+        }
+        return list(wrapper);
+    }
+
+    @Override
     public List<CarInfo> listOfSelect(CarInfo entity) {
         LambdaQueryWrapper<CarInfo> wrapper = new LambdaQueryWrapper<>(entity);
         wrapper.select(CarInfo::getId, CarInfo::getPlateNum);
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 @Service
@@ -68,6 +69,21 @@ public class KeyInfoServiceImpl extends ServiceImpl&lt;com.ruoyi.mapper.key.info.Ke
     }
     @Override
+    public List<KeyInfo> list(KeyInfo entity, Collection<String> plateNums) {
+        LambdaQueryWrapper<KeyInfo> wrapper = null;
+        if(Objects.isNull(entity)){
+            wrapper = new LambdaQueryWrapper<>();
+        }else{
+            wrapper = new LambdaQueryWrapper<>(entity);
+        }
+
+        if(CollectionUtils.isNotEmpty(plateNums)){
+            wrapper.in(KeyInfo::getPlateNum,plateNums);
+        }
+        return list(wrapper);
+    }
+
+    @Override
     public List<KeyInfo> listOfSelect(KeyInfo entity) {
         LambdaQueryWrapper<KeyInfo> wrapper = new LambdaQueryWrapper<>(entity);
         wrapper.select(KeyInfo::getId, KeyInfo::getName);
@@ -10,23 +10,37 @@ import com.github.pagehelper.PageHelper;
 import com.ruoyi.common.TipEnum;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.caiinfo.CarInfo;
 import com.ruoyi.domain.key.info.KeyInfo;
 import com.ruoyi.domain.key.location.LinggangKeyWorkLocation;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
+import com.ruoyi.domain.venue.info.LinggangVenueInfo;
+import com.ruoyi.equipment.domain.Equipment;
+import com.ruoyi.equipment.service.IEquipmentService;
 import com.ruoyi.mapper.key.location.LinggangKeyWorkLocationMapper;
+import com.ruoyi.service.carinfo.CarInfoService;
 import com.ruoyi.service.key.info.KeyInfoService;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
+import com.ruoyi.service.scheduling.LinggangSchedulingService;
+import com.ruoyi.service.venue.info.LinggangVenueInfoService;
+import com.ruoyi.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import java.text.MessageFormat;
+import java.text.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
+import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_IN;
+
 @Slf4j
 @Service
 /**钥匙存放地址 Service实现类*/
@@ -35,6 +49,14 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     private LinggangKeyWorkLocationMapper linggangKeyWorkLocationMapper;
     @Autowired
     private KeyInfoService keyInfoService;
+    @Autowired
+    private LinggangSchedulingService schedulingService;
+    @Autowired
+    private LinggangVenueInfoService venueInfoService;
+    @Autowired
+    private IEquipmentService equipmentService;
+    @Autowired
+    private CarInfoService carInfoService;
     private static final String TAKE_KEY_MSG = "设备号:{0},钥匙编号:{1},在{2}的状态已经是:{3},无需在操作";
     private static final String TAKE_KEY_SUCESS = "设备号:{0},钥匙编号:{1},在{2}的状已经更新成功";
@@ -69,12 +91,12 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         return returnPage;
     }
-    private static  void switchTime( LinggangKeyWorkLocation entity, LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper) {
-        if(Objects.nonNull(entity.getStartScheduleDate()) && Objects.nonNull(entity.getEndScheduleDate())){
+    private static void switchTime(LinggangKeyWorkLocation entity, LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper) {
+        if (Objects.nonNull(entity.getStartScheduleDate()) && Objects.nonNull(entity.getEndScheduleDate())) {
             wrapper.between(LinggangKeyWorkLocation::getScheduleDate, entity.getStartScheduleDate(), entity.getEndScheduleDate());
-        }else if(Objects.nonNull(entity.getStartScheduleDate())){
+        } else if (Objects.nonNull(entity.getStartScheduleDate())) {
             wrapper.ge(LinggangKeyWorkLocation::getScheduleDate, entity.getStartScheduleDate());
-        }else if(Objects.nonNull(entity.getEndScheduleDate())){
+        } else if (Objects.nonNull(entity.getEndScheduleDate())) {
             wrapper.le(LinggangKeyWorkLocation::getScheduleDate, entity.getEndScheduleDate());
         }
     }
@@ -183,6 +205,31 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         return save(entity);
     }
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean insertJob(String timeStr) {
+        try {
+            Date date = DateUtil.YYYY_MM_DD_LINK.parse(timeStr);
+            LinggangKeyWorkLocation workLocation = new LinggangKeyWorkLocation();
+            workLocation.setScheduleDate(date);
+            Integer count = countId(workLocation);
+            if (Objects.nonNull(count) && count > 0) {
+                log.error("当天的数据已经存在:[{}]；[{}]", timeStr, count);
+                return false;
+            }
+
+            List<LinggangKeyWorkLocation> locations = computeKeyLocal(date);
+            if (CollectionUtils.isNotEmpty(locations)) {
+                return saveBatch(locations);
+            }
+            return true;
+        } catch (ParseException e) {
+            log.error("转换日期异常:[{}]", timeStr, e);
+        }
+
+        return false;
+    }
+
     /**
      * 根据主键修改数据
      */
@@ -496,4 +543,169 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         return source;
     }
+
+    private List<LinggangKeyWorkLocation> computeKeyLocal(Date date) {
+
+
+        List<LinggangScheduling> schedulings = querySchedulingByTiime(date);
+        if (schedulings == null) return null;
+
+        List<LinggangVenueInfo> venueInfos = queryVenueInfo(schedulings);
+        if (venueInfos == null) return null;
+
+        List<CarInfo> carInfos = queryCarInfo(schedulings);
+        if (carInfos == null) return null;
+
+        List<KeyInfo> keyInfos = queryKeyInfo(carInfos);
+        if (keyInfos == null) return null;
+
+        List<Equipment> equipmentList = queryEquipment(venueInfos);
+        if (equipmentList == null) return null;
+
+
+        return schedulings.stream().map(sc -> {
+            Optional<LinggangVenueInfo> optional = venueInfos.stream().filter(v -> Objects.equals(v.getParkCode(), sc.getZdzcode())).findFirst();
+            if (!optional.isPresent()) {
+                log.info("[{}]没有找到对应的场站", sc);
+                return null;
+            }
+
+            List<Equipment> equipmentList1 = equipmentList.stream().filter(eq -> Objects.equals(eq.getYardId(), optional.get().getId())).collect(Collectors.toList());
+            int size = CollectionUtils.size(equipmentList1);
+            if (0 == size) {
+                log.info("场站[{}]没有找到对应钥匙柜,排班数据为:[{}]", optional.get(), sc);
+                return null;
+            }
+
+            Equipment equipment = null;
+            Integer number = null;
+            int i = 0;
+            do {
+                i++;
+                int index = RandomUtils.nextInt(0, size);
+                if (index == size) {
+                    index = size - 1;
+                }
+                equipment = equipmentList1.get(index);
+                if (Objects.isNull(equipment) || Objects.isNull(equipment.getLatticeNumber())) {
+                    log.info("没有存放钥匙的格子：[{}]", equipment);
+                    continue;
+                }
+                if (Objects.isNull(equipment.getLatticeNumberSet())) {
+                    equipment.setLatticeNumberSet(new HashSet<>(equipment.getLatticeNumber()));
+                }
+
+                number = RandomUtils.nextInt(1, equipment.getLatticeNumber());
+                if (equipment.getLatticeNumberSet().contains(number)) {
+                    log.info("此格子已经被占用;[{}][{}]", equipment, number);
+                    continue;
+                }
+                break;
+            } while (i < 10000);
+
+            if (Objects.isNull(equipment) || Objects.isNull(number)) {
+                log.info("没有找到存放的格子：[{}]", equipment);
+                return null;
+            }
+
+            Optional<CarInfo> optOfCar = carInfos.stream().filter(c -> Objects.equals(c.getNbbm(), sc.getNbbm())).findFirst();
+            if (!optOfCar.isPresent()) {
+                log.info("没有找到对应的车辆信息:[{}]", sc);
+                return null;
+            }
+            List<KeyInfo> carKeyInfo = keyInfos.stream().filter(k -> Objects.equals(k.getPlateNum(), optOfCar.get().getPlateNum())).collect(Collectors.toList());
+            int keySize = CollectionUtils.size(carKeyInfo);
+            if (keySize == 0) {
+                log.info("根据车辆信息[{}]没有找到对应的钥匙", optOfCar.get());
+                return null;
+            } else if (keySize > 1) {
+                carKeyInfo = carKeyInfo.stream().sorted(Comparator.comparing(KeyInfo::getId)).collect(Collectors.toList());
+            }
+
+            LinggangKeyWorkLocation location = new LinggangKeyWorkLocation();
+            location.setYardId(equipment.getYardId());
+            location.setYardName(optional.get().getName());
+            location.setDevice(equipment.getDeviceId());
+            location.setCabinetNo(number.toString());
+            location.setEventType(0);
+            location.setDelFlag(Boolean.FALSE);
+            location.setKeyInfoId(carKeyInfo.get(0).getId());
+            location.setScheduleDate(sc.getScheduleDate());
+            location.setSchedulingId(sc.getId());
+            location.setType(2);
+            return location;
+
+        }).filter(obj -> Objects.nonNull(obj)).collect(Collectors.toList());
+    }
+
+    private List<LinggangScheduling> querySchedulingByTiime(Date date) {
+        LinggangScheduling scheduling = new LinggangScheduling();
+        scheduling.setScheduleDate(date);
+        scheduling.setBcType(BC_TYPE_IN);
+        List<LinggangScheduling> schedulings = schedulingService.list(scheduling);
+        if (CollectionUtils.isEmpty(schedulings)) {
+            log.info("没有查到排班信息:[{}]", date);
+            return null;
+        }
+        return schedulings;
+    }
+
+    private List<LinggangVenueInfo> queryVenueInfo(List<LinggangScheduling> schedulings) {
+        Set<String> zdzCode = schedulings.stream().map(LinggangScheduling::getZdzcode).collect(Collectors.toSet());
+        List<LinggangVenueInfo> venueInfos = venueInfoService.listOfCodes(zdzCode);
+        if (CollectionUtils.isEmpty(venueInfos)) {
+            log.info("查询场站数据为空:[{}]", zdzCode);
+            return null;
+        }
+        return venueInfos;
+    }
+
+    private List<CarInfo> queryCarInfo(List<LinggangScheduling> schedulings) {
+        Set<String> nbbms = schedulings.stream().map(LinggangScheduling::getNbbm).collect(Collectors.toSet());
+        if (CollectionUtils.isEmpty(nbbms)) {
+            log.info("车辆自编号为空:[{}]", schedulings);
+            return null;
+        }
+        List<CarInfo> carInfos = carInfoService.list(nbbms);
+        if (CollectionUtils.isEmpty(carInfos)) {
+            log.info("查询车辆数据为空:[{}]", carInfos);
+            return null;
+        }
+        return carInfos;
+    }
+
+    private List<KeyInfo> queryKeyInfo(List<CarInfo> carInfos) {
+        Set<String> plateNums = carInfos.stream().map(CarInfo::getPlateNum).collect(Collectors.toSet());
+        if (CollectionUtils.isEmpty(plateNums)) {
+            log.info("车牌数据为空:[{}]", carInfos);
+            return null;
+        }
+        KeyInfo keyInfo = new KeyInfo();
+        keyInfo.setDelFlag(Boolean.FALSE);
+        List<KeyInfo> keyInfos = keyInfoService.list(keyInfo, plateNums);
+        if (CollectionUtils.isEmpty(keyInfos)) {
+            log.info("查询钥匙数据为空:[{}]", plateNums);
+            return null;
+        }
+        return keyInfos;
+    }
+
+    private List<Equipment> queryEquipment(List<LinggangVenueInfo> venueInfos) {
+        Set<Integer> venuInfoIds = venueInfos.stream().map(LinggangVenueInfo::getId).collect(Collectors.toSet());
+        Equipment equipment = new Equipment();
+        equipment.setStatus(1);
+        List<Equipment> equipmentList = equipmentService.listByEntityAndYardIds(equipment, venuInfoIds);
+        if (CollectionUtils.isEmpty(equipmentList)) {
+            log.info("查询设备数据为空:[{}]", venuInfoIds);
+            return null;
+        }
+
+        List<Equipment> equipmentList2 = equipmentList.stream().filter(eq -> StringUtils.startsWith(eq.getPromise(), "4,") || StringUtils.endsWith(eq.getPromise(), ",4") ||
+                StringUtils.indexOf(eq.getPromise(), ",4,") > -1).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(equipmentList)) {
+            log.info("查询钥匙柜数据为空:[{}]", equipmentList);
+            return null;
+        }
+        return equipmentList2;
+    }
 }
 \ No newline at end of file
@@ -52,6 +52,11 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
     public List<LinggangScheduling> list(LinggangScheduling entity) {
         return list(new LambdaQueryWrapper<>(entity));
     }
+
+    @Override
+    public List<LinggangScheduling> listByCZ(LinggangScheduling entity) {
+      return linggangSchedulingMapper.listByCZ(entity);
+    }
     // @Override
     // public List<LinggangScheduling> listOfSelect(LinggangScheduling entity) {
     //      LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -74,11 +75,28 @@ public class LinggangVenueInfoServiceImpl extends ServiceImpl&lt;LinggangVenueInfoM
     }
     @Override
+    public List<LinggangVenueInfo> listOfCodes(Collection<String> codes) {
+        if (org.springframework.util.CollectionUtils.isEmpty(codes)) {
+            return java.util.Collections.emptyList();
+        }
+        LambdaQueryWrapper<LinggangVenueInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(LinggangVenueInfo::getParkCode, codes);
+        return list(wrapper);
+    }
+
+    @Override
     public LinggangVenueInfo getOne(LinggangVenueInfo entity) {
         return getOne(new LambdaQueryWrapper<>(entity));
     }
     @Override
+    public LinggangVenueInfo getOne(String parkCode) {
+        LambdaQueryWrapper<LinggangVenueInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(LinggangVenueInfo::getParkCode, parkCode);
+        return getOne(wrapper);
+    }
+
+    @Override
     public Integer countId(LinggangVenueInfo entity) {
         LambdaQueryWrapper<LinggangVenueInfo> wrapper = new LambdaQueryWrapper<>(entity);
         wrapper.select(LinggangVenueInfo::getId);
@@ -22,6 +22,8 @@ public interface KeyInfoService extends IService&lt;KeyInfo&gt; {
     List<KeyInfo> list(Collection<String> codes);
+    List<KeyInfo> list(KeyInfo entity,Collection<String> plateNums);
+
     /***
      *用于页面选择
      */
@@ -57,6 +57,8 @@ public interface LinggangKeyWorkLocationService extends IService&lt;LinggangKeyWork
     /***插入数据*/
     boolean insert(LinggangKeyWorkLocation entity);
+    boolean insertJob(String timeStr);
+
     /**
      * 根据主键修改数据
      */
@@ -22,6 +22,8 @@ public interface LinggangSchedulingService extends IService&lt;LinggangScheduling&gt; 
      */
     List<LinggangScheduling> list(LinggangScheduling entity);
+    List<LinggangScheduling> listByCZ(LinggangScheduling entity);
+
     // List<LinggangScheduling> listOfIds(java.util.Collection<java.lang.Integer> ids);
     // /***
     // *用于页面选择
@@ -22,6 +22,7 @@ public interface LinggangVenueInfoService extends IService&lt;LinggangVenueInfo&gt; {
     List<LinggangVenueInfo> list(LinggangVenueInfo entity);
     List<LinggangVenueInfo> listOfIds(java.util.Collection<java.lang.Integer> ids);
+    List<LinggangVenueInfo> listOfCodes(java.util.Collection<java.lang.String> codes);
     /***
      *用于页面选择
@@ -33,6 +34,8 @@ public interface LinggangVenueInfoService extends IService&lt;LinggangVenueInfo&gt; {
      */
     LinggangVenueInfo getOne(LinggangVenueInfo entity);
+    LinggangVenueInfo getOne(String parkCode);
+
     Integer countId(LinggangVenueInfo entity);
     /**
@@ -3,9 +3,11 @@ package com.ruoyi.utils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.FastDateFormat;
+import java.text.ParseException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 /**
  * @author liujun
@@ -14,6 +16,7 @@ import java.time.format.DateTimeFormatter;
 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 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");
@@ -24,4 +27,17 @@ public class DateUtil {
     public static LocalDate parseLocalDate(String dateStr) {
         return StringUtils.isEmpty(dateStr) ? null : LocalDate.parse(dateStr, YYYY_MM_DD_LINK_Local_Date);
     }
+
+    public static Date today() {
+        return shortDate(new Date());
+    }
+
+    public static Date shortDate(Date date) {
+        try {
+            return YYYY_MM_DD_LINK.parse(YYYY_MM_DD_LINK.format(date));
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
 }
@@ -24,6 +24,11 @@
         <result column="alcohol_intake" property="alcoholIntake"/>
         <result column="sign_type" property="signType"></result>
         <result column="remark" property="remark"></result>
+        <result column="upDown" property="upDown"></result>
+        <result column="qdzCode" property="qdzCode"></result>
+        <result column="qdzName" property="qdzName"></result>
+        <result column="zdzCode" property="zdzCode"></result>
+
     </resultMap>
     <sql id="selectColumn">
@@ -32,20 +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)
+        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)
         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.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}
             )
         </foreach>
         on duplicate key update
@@ -29,6 +29,19 @@
         <include refid="insertSelectiveColumn"></include>
         <include refid="insertSelectiveValue"></include>
     </insert>
+    <select id="listByCZ"  resultMap="BaseResultMap">
+        select <include refid="columns"></include>   from scheduling
+        <where >
+            <include refid="where"></include>
+            <if test="null != czCode"> and (qdzcode = #{czCode} OR zdzcode = #{czCode}) </if>
+            <choose>
+                <when test="null !=startScheduleDate and null !=endScheduleDate"> and schedule_date BETWEEN #{startScheduleDate} and #{endScheduleDate} </when>
+                <when test="null !=startScheduleDate">and schedule_date &gt;= #{startScheduleDate}</when>
+                <when test="null !=endScheduleDate">and schedule_date &lt;= #{endScheduleDate}</when>
+            </choose>
+           
+        </where>
+    </select>
     <sql id="columns">
         id
@@ -117,7 +117,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/big/view/queryNumberByType","/big/view/queryLineInfo/*","/big/view/querySignDetails","/report/list/**","/system/dict/data/**",
                         "/app/version/check/**","/app/checkDeviceHeart","/app/download","/driver/**","/in/**","/eexception/**","/equipment/**",
-                        "/report/**","/login", "/register", "/captchaImage","/dss/Driver/Auth").permitAll()
+                        "/report/**","/login", "/register", "/captchaImage","/dss/Driver/Auth","/test/**").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()