蓝斯二期

liujun001
1 parent b73e485d
Showing 15 changed files with 191 additions and 80 deletions
Bsth-admin/sql/DDL.sql
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/LinggangKeyWorkLocation.java
Bsth-admin/src/main/java/com/ruoyi/job/KeyWorkLocalJob.java
Bsth-admin/src/main/java/com/ruoyi/job/NewDriverJob.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/domain/SchedulingDateEntity.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/service/SchedulingServiceV1.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/service/impl/SchedulingServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/service/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/location/LinggangKeyWorkLocationServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/scheduling/LinggangSchedulingServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/scheduling/LinggangSchedulingService.java
Bsth-admin/src/main/resources/application-druid-dev.yml
 ALTER TABLE key_work_location ADD type1 INT NULL COMMENT '状态：1 是归还；0是借出;2是初始状态';
-ALTER TABLE scheduling ADD alcohol_count INT DEFAULT 2 NULL COMMENT '酒测次数';
 \ No newline at end of file
+ALTER TABLE scheduling ADD alcohol_count INT DEFAULT 2 NULL COMMENT '酒测次数';
+
+
+ALTER TABLE key_work_location ADD `time` DATETIME NULL;
@@ -26,6 +26,8 @@ import com.ruoyi.domain.venue.info.LinggangVenueInfo;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
 import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
+import com.ruoyi.scheduling.domain.SchedulingDateEntity;
+import com.ruoyi.scheduling.service.SchedulingServiceV1;
 import com.ruoyi.service.carinfo.CarInfoService;
 import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.dss.KeyBoxVoService;
@@ -83,6 +85,8 @@ public class KeyBoxController extends BaseController {
     private NewDriverService newDriverService;
     @Autowired
     private LinggangVenueInfoService venueInfoService;
+    @Autowired
+    private SchedulingServiceV1 schedulingServiceV1;
     @PostMapping(value = "/keybox/findKey")
     @ApiOperation("钥匙信息查询")
@@ -285,7 +289,7 @@ public class KeyBoxController extends BaseController {
 //            return ResponseResult.error404();
 //        }
-        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos,0);
+        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos, 0);
         ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.TAKE_OUT);
         if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
@@ -335,7 +339,7 @@ public class KeyBoxController extends BaseController {
         }
-        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos,1);
+        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos, 1);
 //        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);
@@ -431,22 +435,6 @@ public class KeyBoxController extends BaseController {
         }
         if (StringUtils.isNotEmpty(dto.getPlate())) {
-//            CarInfo carInfo = new CarInfo();
-//            carInfo.setNbbm(dto.getPlate());
-//            List<CarInfo> carInfos = carInfoService.listLikeNbbs(carInfo);
-//            if (CollectionUtils.isEmpty(carInfos)) {
-//                keyInfoIds = new HashSet<>();
-//                keyInfoIds.add(-10000);
-//            } else {
-//                Set<String> plateNums = carInfos.stream().map(CarInfo::getPlateNum).collect(Collectors.toSet());
-//                keyInfos = keyInfoService.listPlateNums(plateNums);
-//                if (CollectionUtils.isNotEmpty(keyInfos)) {
-//                    keyInfoIds = keyInfos.stream().map(KeyInfo::getId).collect(Collectors.toSet());
-//                } else {
-//                    keyInfoIds = new HashSet<>();
-//                    keyInfoIds.add(-10000);
-//                }
-//            }
             KeyInfo keyInfo = new KeyInfo();
             keyInfo.setPlateNum(dto.getPlate());
@@ -492,10 +480,6 @@ public class KeyBoxController extends BaseController {
         locationEq.setKeyInfoIds(keyInfoIds);
         locationEq.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(locationEq.getStartScheduleDate(), 1));
-//        Set<Integer> types = new HashSet<>();
-//        types.add(1);
-//        types.add(0);
-//        locationEq.setTypes(types);
         IPage<LinggangKeyWorkLocation> page = linggangKeyWorkLocationService.pageList(new Page<>(dto.getPageNum(), dto.getPageSize()), locationEq, new OrderEntity());
@@ -505,20 +489,31 @@ public class KeyBoxController extends BaseController {
         List<Equipment> yarnCabinetStateEqus = Collections.emptyList();
         if (Objects.nonNull(page) && CollectionUtils.isNotEmpty(page.getRecords())) {
+            Set<Integer> keyIds = page.getRecords().stream().map(LinggangKeyWorkLocation::getKeyInfoId).collect(Collectors.toSet());
+            Collection<KeyInfo> keyInfos1 = keyInfoService.listByIds(keyIds);
+            if (CollectionUtils.isNotEmpty(keyInfos1)) {
+                Set<String> plateNums = keyInfos1.stream().map(KeyInfo::getPlateNum).collect(Collectors.toSet());
+                carInfos = carInfoService.listPlateNums(plateNums);
+                if (CollectionUtils.isNotEmpty(carInfos)) {
+                    Set<String> nbbms = carInfos.stream().map(CarInfo::getNbbm).collect(Collectors.toSet());
+                    SchedulingDateEntity schedulingDateEntity = schedulingServiceV1.switchSchedulingDate(new Date());
+
+                    LinggangScheduling scheduling = new LinggangScheduling();
+                    scheduling.setStartScheduleDate(schedulingDateEntity.getStartDate());
+                    scheduling.setEndScheduleDate(schedulingDateEntity.getEndDate());
+
+                    schedulings = schedulingService.listNbbm(scheduling, nbbms);
+                }
+            }
-
-            Set<String> deviceCodes = page.getRecords().stream().map(LinggangKeyWorkLocation::getDevice).collect(Collectors.toSet());
-            yarnCabinetStateEqus = equipmentService.listNameAndIDBydeviceIds(deviceCodes);
-
-            Set<Long> schedulingIds = page.getRecords().stream().map(LinggangKeyWorkLocation::getSchedulingId).collect(Collectors.toSet());
-            schedulings = schedulingService.listByIds(schedulingIds);
             if (CollectionUtils.isNotEmpty(schedulings)) {
-                Set<String> nbbm = schedulings.stream().map(LinggangScheduling::getNbbm).collect(Collectors.toSet());
-                carInfos = carInfoService.list(nbbm);
-
                 Set<String> jobCode = schedulings.stream().map(LinggangScheduling::getJobCode).collect(Collectors.toSet());
                 drivers = newDriverService.list(jobCode);
             }
+
+            Set<String> deviceCodes = page.getRecords().stream().map(LinggangKeyWorkLocation::getDevice).collect(Collectors.toSet());
+            yarnCabinetStateEqus = equipmentService.listNameAndIDBydeviceIds(deviceCodes);
+
         }
         YarnCabinetStatePageVO pageVO = conertYarnCabinetStatePageVO(locations, equipment, errorCount, depositCount, equipmentList, locationsOfEq, page, schedulings, dto, carInfos, drivers, yarnCabinetStateEqus);
         return ResponseResult.success(pageVO);
@@ -756,7 +751,7 @@ public class KeyBoxController extends BaseController {
         return vo;
     }
-    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto, List<LinggangKeyWorkLocation> schedulings, NewDriver driver, List<KeyInfo> keyInfos,int ty) {
+    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto, List<LinggangKeyWorkLocation> schedulings, NewDriver driver, List<KeyInfo> keyInfos, int ty) {
         if (CollectionUtils.isEmpty(dto.getKeyItem())) {
             return Collections.emptyList();
         }
@@ -771,6 +766,7 @@ public class KeyBoxController extends BaseController {
             location.setPlate(item.getPlate());
             location.setTime(dto.getTime());
             location.setType1(ty);
+            location.setJobCode(dto.getStaffCode());
             if (CollectionUtils.isNotEmpty(schedulings)) {
                 Optional<LinggangKeyWorkLocation> opt = schedulings.stream().filter(s -> Objects.equals(item.getKey(), s.getCabinetNo())).findFirst();
                 if (opt.isPresent()) {
@@ -116,13 +116,14 @@ public class LinggangKeyWorkLocation {
     @TableField(exist = false)
     private Set<Integer> types;
-    @TableField(exist = false)
     private Date time;
     @TableField(exist = false)
     private Long zdsjT;
     @TableField(exist = false)
     private Collection<Integer> keyInfoIds;
+    @TableField(exist = false)
+    private String jobCode;
     public boolean importEquals(LinggangKeyWorkLocation location) {
         if (Objects.isNull(location)) {
 package com.ruoyi.job;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
+import com.ruoyi.service.driver.NewDriverService;
+import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
+import com.ruoyi.service.scheduling.LinggangSchedulingService;
+import com.ruoyi.utils.DateUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * @author liujun
  * @date 2024年07月30日 15:12
  */
-public class KeyWorkLocalJob {
+@Component("KeyWorkLocalJob")
+@Slf4j
+public class KeyWorkLocalJob implements InitializingBean {
+    @Autowired
+    private NewDriverService newDriverService;
+    @Autowired
+    private LinggangSchedulingService linggangSchedulingService;
+    @Autowired
+    private LinggangKeyWorkLocationService keyWorkLocationService;
+
+    public void insertKeyWorkLocalJob(){
+       String  dateStr = DateUtil.YYYY_MM_DD_LINK.format(new Date());
+        Date date = null;
+        try {
+            date = DateUtil.YYYY_MM_DD_LINK.parse(dateStr);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+
+        LinggangScheduling scheduling = new LinggangScheduling();
+        scheduling.setStartScheduleDate(DateUtil.shortDate(date));
+        scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
+        scheduling.setType(100);
+
+        List<LinggangScheduling> linggangSchedulings = linggangSchedulingService.list(scheduling);
+        Set<Long> idSets = linggangSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
+        keyWorkLocationService.insertJob(dateStr, null, idSets);
+
+        log.info("钥匙存放信息处理完毕");
+    }
+    @Override
+    public void afterPropertiesSet() throws Exception {
+
+    }
 }
@@ -15,15 +15,11 @@ import java.util.Date;
 public class NewDriverJob implements InitializingBean {
     @Autowired
     private NewDriverService newDriverService;
+
     @Transactional(rollbackFor = Exception.class)
     public void syDriver() {
-        Date date = new Date();
-
-        for (int i = 0; i < 2; i++) {
-            JwtAuthenticationTokenFilter.putMDC("job",JwtAuthenticationTokenFilter.getRandomValue());
-            newDriverService.insertJob();
-        }
-
+        newDriverService.insertJob();
+        log.info("人员信息同步完毕");
     }
+package com.ruoyi.scheduling.domain;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SchedulingDateEntity {
+    private Date startDate;
+    private Date endDate;
+}
@@ -2,6 +2,7 @@ package com.ruoyi.scheduling.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.scheduling.domain.DriverSchedulingV1;
+import com.ruoyi.scheduling.domain.SchedulingDateEntity;
 import java.util.Date;
 import java.util.List;
@@ -11,4 +12,6 @@ public interface SchedulingServiceV1 extends IService&lt;DriverSchedulingV1&gt; {
     List<DriverSchedulingV1> queryByJobCodeAndSchedulingDate(String jobCode, Date date);
     List<DriverSchedulingV1>  queryByNbbmAndDate(String nbbm, Date date);
+
+    SchedulingDateEntity switchSchedulingDate(Date date);
 }
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.scheduling.domain.DriverSchedulingV1;
+import com.ruoyi.scheduling.domain.SchedulingDateEntity;
 import com.ruoyi.scheduling.mapper.SchedulingMapperV1;
 import com.ruoyi.scheduling.service.SchedulingServiceV1;
 import org.apache.commons.lang3.StringUtils;
@@ -18,33 +19,47 @@ public class SchedulingServiceV1Impl extends ServiceImpl&lt;SchedulingMapperV1, Dri
     @Override
     public List<DriverSchedulingV1> queryByJobCodeAndSchedulingDate(String jobCode, Date date) {
+
+        LambdaQueryWrapper<DriverSchedulingV1> wrapper = new LambdaQueryWrapper<>();
+        SchedulingDateEntity entity = switchSchedulingDate(date);
+        wrapper.eq(DriverSchedulingV1::getJobCode, jobCode);
+        wrapper.and(wr -> {
+            wr.eq(DriverSchedulingV1::getScheduleDate, date).or().between(DriverSchedulingV1::getFcsjT, entity.getStartDate().getTime(), entity.getEndDate().getTime());
+        });
+        wrapper.orderByAsc(DriverSchedulingV1::getFcsjT);
+
+        return list(wrapper);
+    }
+
+    @Override
+    public List<DriverSchedulingV1> queryByNbbmAndDate(String nbbm, Date date) {
+        LambdaQueryWrapper<DriverSchedulingV1> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(DriverSchedulingV1::getNbbm, nbbm).eq(DriverSchedulingV1::getScheduleDate, date);
+
+        return list(wrapper);
+    }
+
+    @Override
+    public SchedulingDateEntity switchSchedulingDate(Date date) {
         String dateStr = DateUtils.FAST_YYYY_MM_DD.format(org.apache.commons.lang3.time.DateUtils.addDays(date, 1));
         dateStr = StringUtils.join(dateStr, " 06:30:30");
-        LambdaQueryWrapper<DriverSchedulingV1> wrapper = new LambdaQueryWrapper<>();
         try {
             Date date1 = DateUtils.FAST_YYYY_MM_DDHHMMSS.parse(dateStr);
-//            dateStr = DateUtils.FAST_YYYY_MM_DD.format(org.apache.commons.lang3.time.DateUtils.addDays(date, -1));
             dateStr = DateUtils.FAST_YYYY_MM_DD.format(date);
             dateStr = StringUtils.join(dateStr, " 00:00:00");
             Date date2 = DateUtils.FAST_YYYY_MM_DDHHMMSS.parse(dateStr);
-            wrapper.eq(DriverSchedulingV1::getJobCode, jobCode);
-            wrapper.and(wr -> {
-                wr.eq(DriverSchedulingV1::getScheduleDate, date).or().between(DriverSchedulingV1::getFcsjT, date2.getTime(), date1.getTime());
-            });
-            wrapper.orderByAsc(DriverSchedulingV1::getFcsjT);
+            SchedulingDateEntity entity = new SchedulingDateEntity();
+            entity.setStartDate(date2);
+            entity.setEndDate(date1);
+
+            return entity;
         } catch (ParseException e) {
             throw new RuntimeException(e);
         }
-        return list(wrapper);
+
     }
-    @Override
-    public List<DriverSchedulingV1> queryByNbbmAndDate(String nbbm, Date date) {
-        LambdaQueryWrapper<DriverSchedulingV1> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(DriverSchedulingV1::getNbbm, nbbm).eq(DriverSchedulingV1::getScheduleDate, date);
-        return list(wrapper);
-    }
 }
@@ -544,8 +544,8 @@ public class ThreadJobService {
             scheduling.setType(b.getType());
             return scheduling;
-        }).filter(s->!StringUtils.isBlank(s.getJobCode()) && !StringUtils.isBlank(s.getName()) && !StringUtils.equalsAnyIgnoreCase(s.getJobCode(),"null")
-                && !StringUtils.equalsAnyIgnoreCase(s.getName(),"null")).collect(Collectors.toList());
+        }).filter(s -> !StringUtils.isBlank(s.getJobCode()) && !StringUtils.isBlank(s.getName()) && !StringUtils.equalsAnyIgnoreCase(s.getJobCode(), "null")
+                && !StringUtils.equalsAnyIgnoreCase(s.getName(), "null")).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(schedulings)) {
             Map<String, List<LinggangScheduling>> distinctMap = new HashMap<>();
             schedulings.stream().forEach(s -> {
@@ -587,21 +587,21 @@ public class ThreadJobService {
             if (CollectionUtils.isNotEmpty(sourceList)) {
                 List<LinggangScheduling> schedulings1 = schedulings;
-               List<LinggangScheduling> removeSchedulings = sourceList.stream().filter(s->{
-                    Optional<LinggangScheduling> opt = schedulings1.stream().filter(s1 -> s1.importEqus(s)).findFirst();
-                   if (!opt.isPresent()) {
-                       log.debug("需要删除的排班数据:[{}]", s);
-                   }
+                List<LinggangScheduling> removeSchedulings = sourceList.stream().filter(s -> {
+                    Optional<LinggangScheduling> opt = schedulings1.stream().filter(s1 -> s1.importEqus(s) && Objects.nonNull(s1.getSignInId())).findFirst();
+                    if (!opt.isPresent()) {
+                        log.debug("需要删除的排班数据:[{}]", s);
+                    }
                     return !opt.isPresent() && Objects.isNull(s.getSignInId());
                 }).collect(Collectors.toList());
-               if(CollectionUtils.isNotEmpty(removeSchedulings)){
-                   Set<Long> ids = removeSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
-                   schedulingService.removeByIds(ids);
-                   schedulings = schedulings1.stream().filter(s->{
-                       Optional<LinggangScheduling> opt = removeSchedulings.stream().filter(s1 -> s1.importEqus(s)).findFirst();
-                       return !opt.isPresent();
-                   }).collect(Collectors.toList());
-               }
+                if (CollectionUtils.isNotEmpty(removeSchedulings)) {
+                    Set<Long> ids = removeSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
+                    schedulingService.removeByIds(ids);
+                    schedulings = schedulings1.stream().filter(s -> {
+                        Optional<LinggangScheduling> opt = removeSchedulings.stream().filter(s1 -> s1.importEqus(s)).findFirst();
+                        return !opt.isPresent();
+                    }).collect(Collectors.toList());
+                }
                 schedulings = schedulings.stream().filter(s -> {
                     Optional<LinggangScheduling> opt = sourceList.stream().filter(s1 -> s1.importEqus(s)).findFirst();
@@ -613,10 +613,10 @@ public class ThreadJobService {
             }
             if (CollectionUtils.isNotEmpty(schedulings)) {
-              List<LinggangScheduling>  schedulings1 = schedulings.stream().filter(s->StringUtils.isBlank(s.getJobCode()) || StringUtils.isBlank(s.getName())).collect(Collectors.toList());
-              if(CollectionUtils.isNotEmpty(schedulings1)){
-                  System.out.println("bbbbbbbbbbb");
-              }
+                List<LinggangScheduling> schedulings1 = schedulings.stream().filter(s -> StringUtils.isBlank(s.getJobCode()) || StringUtils.isBlank(s.getName())).collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(schedulings1)) {
+                    System.out.println("bbbbbbbbbbb");
+                }
                 for (LinggangScheduling linggangScheduling : schedulings) {
                     schedulingService.save(linggangScheduling);
                 }
@@ -25,6 +25,8 @@ public interface CarInfoService extends IService&lt;CarInfo&gt; {
     List<CarInfo> likePlateNumPlateNumTop30(CarInfo entity);
     /**根据车辆自编号查询车辆信息*/
     List<CarInfo> list(Collection<String> nbbms);
+
+    List<CarInfo> listPlateNums(Collection<String> plateNums);
     List<CarInfo> list(CarInfo carInfo,Collection<String> nbbms);
     /***
@@ -92,6 +92,16 @@ public class CarInfoServiceImpl extends ServiceImpl&lt;CarInfoMapper, CarInfo&gt; impl
     }
     @Override
+    public List<CarInfo> listPlateNums(Collection<String> plateNums) {
+        if (CollectionUtils.isEmpty(plateNums)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<CarInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(CarInfo::getPlateNum, plateNums);
+        return list(wrapper);
+    }
+
+    @Override
     public List<CarInfo> list(CarInfo carInfo, Collection<String> nbbms) {
         LambdaQueryWrapper<CarInfo> wrapper = null;
         if (Objects.isNull(carInfo)) {
@@ -21,6 +21,8 @@ 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.in.domain.CalDriverScheduling;
+import com.ruoyi.in.service.SignInServiceV1;
 import com.ruoyi.mapper.key.location.LinggangKeyWorkLocationMapper;
 import com.ruoyi.service.carinfo.CarInfoService;
 import com.ruoyi.service.equipment.heartbeat.LingangEquipmentHeartbeatService;
@@ -64,6 +66,8 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     private CarInfoService carInfoService;
     @Autowired
     private LingangEquipmentHeartbeatService equipmentHeartbeatService;
+    @Autowired
+    private SignInServiceV1 signInServiceV1;
     private static final String TAKE_KEY_MSG = "设备号:{0},钥匙编号:{1},在{2}的状态已经是:{3},无需在操作";
     private static final String TAKE_KEY_SUCESS = "设备号:{0},钥匙编号:{1},在{2}的状已经更新成功";
@@ -315,8 +319,8 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
                 if (CollectionUtils.isNotEmpty(source)) {
                     locations = locations.stream().filter(l -> {
                         Optional<LinggangKeyWorkLocation> opt = source.stream().filter(s -> s.importEquals(l)).findFirst();
-                        if(opt.isPresent()){
-                            log.debug("钥匙存放数据已经存在:[{}]",l);
+                        if (opt.isPresent()) {
+                            log.debug("钥匙存放数据已经存在:[{}]", l);
                         }
                         return !opt.isPresent();
                     }).collect(Collectors.toList());
@@ -356,6 +360,14 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         List<LinggangKeyWorkLocation> success = new ArrayList<>();
         List<LinggangKeyWorkLocation> error = new ArrayList<>();
         source.forEach(s -> {
+            if (StringUtils.isNotEmpty(s.getJobCode()) && Objects.isNull(s.getSchedulingId())) {
+                Integer type = Objects.equals(typeEnum.getValue(), 0) ? 1 : 2;
+                CalDriverScheduling calDriverScheduling = signInServiceV1.findSchedulingByDateTime(s.getJobCode(), s.getTime(), type);
+                if (Objects.nonNull(calDriverScheduling) && Objects.nonNull(calDriverScheduling.getDriverScheduling())) {
+                    s.setSchedulingId(calDriverScheduling.getDriverScheduling().getId());
+                }
+            }
+
             boolean flag = false;
             if (Objects.isNull(s.getId())) {
                 flag = save(s);
@@ -824,7 +836,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             location.setScheduleDate(sc.getScheduleDate());
             location.setSchedulingId(sc.getId());
             location.setType(2);
-            if(Objects.equals(sc.getBcType(),BC_TYPE_OUT)){
+            if (Objects.equals(sc.getBcType(), BC_TYPE_OUT)) {
                 location.setType(3);
             }
             return location;
@@ -90,6 +90,15 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
     public List<LinggangScheduling> listByCZ(LinggangScheduling entity) {
         return linggangSchedulingMapper.listByCZ(entity);
     }
+
+    @Override
+    public List<LinggangScheduling> listNbbm(LinggangScheduling entity, Collection<String> nbbm) {
+        LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
+        switchScheduleDate(wrapper, entity);
+        wrapper.in(LinggangScheduling::getNbbm, nbbm);
+
+        return list(wrapper);
+    }
     // @Override
     // public List<LinggangScheduling> listOfSelect(LinggangScheduling entity) {
     //      LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
@@ -29,6 +29,8 @@ public interface LinggangSchedulingService extends IService&lt;LinggangScheduling&gt; 
     List<LinggangScheduling> listByCZ(LinggangScheduling entity);
+    List<LinggangScheduling>  listNbbm(LinggangScheduling entity,Collection<String> nbbm);
+
     // List<LinggangScheduling> listOfIds(java.util.Collection<java.lang.Integer> ids);
     // /***
     // *用于页面选择
@@ -101,8 +101,8 @@ spring:
     redis:
         # 地址
 #            host: 121.41.83.61
-        host: localhost
-        database: 2
+        host: 192.168.168.124
+        database: 10
 #            password: "guzijian"
         port: 6379
         # 连接超时时间