归还钥匙、领取钥匙使用车辆自编号

liujun001
1 parent 82b2daaf
Showing 8 changed files with 111 additions and 65 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssFaceController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/in/service/ISignInService.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.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/dss/FaceServiceImpl.java
@@ -8,6 +8,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.file.FileUploadException;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.caiinfo.CarInfo;
@@ -44,6 +45,7 @@ import com.ruoyi.service.dss.FaceService;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import com.ruoyi.service.sign.in.resource.LinggangSignInResourceService;
 import com.ruoyi.system.service.ISysDictDataService;
+import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -64,6 +66,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.SIGN_IN_ERROR_COUNT;
+import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW;
 /**
  * @author liujun
@@ -90,6 +94,8 @@ public class DssDriverController extends BaseController {
     private IEquipmentService equipmentService;
     @Autowired
     private LinggangSignInResourceService signInResourceService;
+    @Autowired
+    private RedisCache redisCache;
     @PostMapping(value = "/Driver/Login")
     @ApiOperation("人员登录设备")
@@ -201,6 +207,7 @@ public class DssDriverController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
+
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
         if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
@@ -582,13 +589,16 @@ public class DssDriverController extends BaseController {
     private GetWineRecordVo convertGetWineRecordVo(SignIn signIn) {
         GetWineRecordVo vo = new GetWineRecordVo();
         vo.setCheckTime(signIn.getCreateTime());
-        if (DateUtils.isSameDay(signIn.getCreateTime(), new Date())) {
+
+        String key = REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW + ConstDateUtil.formatDate("yyyyMMdd") + ":" + signIn.getJobCode();
+
+        Integer count = redisCache.getCacheObject(key);
+        if (Objects.nonNull(count) && SIGN_IN_ERROR_COUNT.compareTo(count) <= 0) {
             vo.setCheck(Objects.equals(signIn.getType(), 0));
-        } else {
-            vo.setCheck(Boolean.TRUE);
+            return vo;
         }
-
+        vo.setCheck(Boolean.TRUE);
         return vo;
     }
@@ -631,7 +641,7 @@ public class DssDriverController extends BaseController {
                 if (CollectionUtils.isNotEmpty(carInfos)) {
                     Optional<CarInfo> optional = carInfos.stream().filter(c -> Objects.equals(c.getNbbm(), scheduling.getNbbm())).findFirst();
                     if (optional.isPresent()) {
-                        vo.setCarNo(optional.get().getPlateNum());
+                        vo.setCarNo(optional.get().getNbbm());
                     }
                 }
                 vo.setRouteName(scheduling.getLineName());
@@ -77,6 +77,8 @@ public class DssFaceController extends BaseController {
         NewDriver driver = new NewDriver();
         driver.setPosts("驾驶员");
+        driver.setFaceSignIn(1);
+
         List<NewDriver> drivers = newDriverService.list(driver);
         List<ReqDataVo> vos = convertReqDataVo(drivers);
         return ResponseResult.success(vos);
@@ -92,9 +92,9 @@ public class KeyBoxController extends BaseController {
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(request.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
         LingangEquipmentLinkeLog linkeLog = saveLog(request);
@@ -110,9 +110,9 @@ public class KeyBoxController extends BaseController {
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
@@ -159,9 +159,9 @@ public class KeyBoxController extends BaseController {
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
         try {
@@ -195,7 +195,7 @@ public class KeyBoxController extends BaseController {
             scheduling.setCzCode(venueInfo.getParkCode());
             scheduling.setStartScheduleDate(DateUtil.shortDate(dto.getTime()));
             scheduling.setType(1);
-            scheduling.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(scheduling.getStartScheduleDate(),1));
+            scheduling.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
             List<LinggangScheduling> schedulings = schedulingService.listByCZ(scheduling);
             Set<String> jobCodes = null;
@@ -216,7 +216,6 @@ public class KeyBoxController extends BaseController {
             }
-
             BasicSyncVo vo = convertBasicSyncVo(workLocations, schedulings, keyInfos, drivers, carInfos, equipment, venueInfo, equipmentList);
             return ResponseResult.success(vo);
         } catch (ParseException e) {
@@ -233,9 +232,9 @@ public class KeyBoxController extends BaseController {
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
         Equipment equipment = queryEquipment(dto.getDevice());
@@ -256,20 +255,19 @@ public class KeyBoxController extends BaseController {
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
-
         LinggangKeyWorkLocation entity = new LinggangKeyWorkLocation();
         entity.setDevice(dto.getDevice());
         List<LinggangKeyWorkLocation> schedulings = linggangKeyWorkLocationService.list(entity);
         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());
+        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);
         }
@@ -279,7 +277,7 @@ public class KeyBoxController extends BaseController {
 //            return ResponseResult.error404();
 //        }
-        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver,keyInfos);
+        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();
@@ -299,9 +297,9 @@ public class KeyBoxController extends BaseController {
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
@@ -318,19 +316,18 @@ public class KeyBoxController extends BaseController {
         }
         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());
+        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);
+            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,keyInfos);
+        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);
@@ -357,45 +354,44 @@ public class KeyBoxController extends BaseController {
     @PostMapping(value = "Driver/TurnKey/plan")
     @ApiOperation(value = "钥匙归还计划")
-    public ResponseResult<List<TakeKeyPlanVo>> getKeyWorkLocaltionPlan(@Valid @RequestBody TakeKeyPlanDTO dto,BindingResult bindingResult){
+    public ResponseResult<List<TakeKeyPlanVo>> getKeyWorkLocaltionPlan(@Valid @RequestBody TakeKeyPlanDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
-
         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));
+        entity.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(dto.getTime(), 1));
         List<LinggangKeyWorkLocation> schedulings = linggangKeyWorkLocationService.list(entity);
-        if(CollectionUtils.isEmpty(schedulings)){
+        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)){
+        if (CollectionUtils.isNotEmpty(keyIds)) {
             tempKeyInfos = keyInfoService.listByIds(keyIds);
         }
         List<KeyInfo> keyInfos = tempKeyInfos;
         int keyInfoSize = CollectionUtils.size(keyInfos);
-        List<TakeKeyPlanVo>  vos = schedulings.stream().map(s->{
+        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()){
+            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());
                 }
             }
@@ -413,9 +409,9 @@ public class KeyBoxController extends BaseController {
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
@@ -427,15 +423,33 @@ 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());
             keyInfos = keyInfoService.listLikePlate(keyInfo);
             if (CollectionUtils.isNotEmpty(keyInfos)) {
-                keyInfoIds = keyInfos.stream().map(KeyInfo::getId).collect(Collectors.toSet());
-            }else{
-                keyInfoIds = new HashSet<>();
-                keyInfoIds.add(-10000);
-            }
+                    keyInfoIds = keyInfos.stream().map(KeyInfo::getId).collect(Collectors.toSet());
+                } else {
+                    keyInfoIds = new HashSet<>();
+                    keyInfoIds.add(-10000);
+                }
+
         }
         LinggangKeyWorkLocation location = new LinggangKeyWorkLocation();
@@ -468,7 +482,7 @@ public class KeyBoxController extends BaseController {
         locationEq.setYardId(sourceEq.getYardId());
         locationEq.setStartScheduleDate(date);
         locationEq.setKeyInfoIds(keyInfoIds);
-        locationEq.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(locationEq.getStartScheduleDate(),1));
+        locationEq.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(locationEq.getStartScheduleDate(), 1));
 //        Set<Integer> types = new HashSet<>();
 //        types.add(1);
@@ -514,7 +528,7 @@ public class KeyBoxController extends BaseController {
         scheduling.setJobCode(dto.getStaffCode());
         scheduling.setStartScheduleDate(DateUtil.shortDate(dto.getTime()));
-        scheduling.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(scheduling.getStartScheduleDate(),1));
+        scheduling.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
 //        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_OUT;
         scheduling.setBcType(bcType);
@@ -637,7 +651,7 @@ public class KeyBoxController extends BaseController {
 //        vo.setYardName(keyInfo.getY)
         vo.setDevice(workLocation.getDevice());
         vo.setCabinetNo(workLocation.getCabinetNo());
-        vo.setPlateNum(carInfo.getPlateNum());
+        vo.setPlateNum(carInfo.getNbbm());
         return vo;
     }
@@ -701,7 +715,7 @@ public class KeyBoxController extends BaseController {
                         BasicSyncDriverWorkDriverPlanTimePlateVo planTimePlateVo = new BasicSyncDriverWorkDriverPlanTimePlateVo();
                         planTimePlateVo.setKey(new Date(sc.getFcsjT()));
-                        planTimePlateVo.setValue(carInfoOptional.get().getPlateNum());
+                        planTimePlateVo.setValue(carInfoOptional.get().getNbbm());
                         planVo.setTimePlate(planTimePlateVo);
                         return planVo;
@@ -716,7 +730,7 @@ public class KeyBoxController extends BaseController {
         if (CollectionUtils.isNotEmpty(schedulings) && CollectionUtils.isNotEmpty(carInfos)) {
             Set<String> nbbms = schedulings.stream().filter(s -> Objects.equals(s.getQdzcode(), venueInfo.getParkCode()) ||
                     Objects.equals(s.getZdzcode(), venueInfo.getParkCode())).map(LinggangScheduling::getNbbm).collect(Collectors.toSet());
-            List<String> plateNums = carInfos.stream().filter(c -> nbbms.contains(c.getNbbm())).map(CarInfo::getPlateNum).collect(Collectors.toList());
+            List<String> plateNums = carInfos.stream().filter(c -> nbbms.contains(c.getNbbm())).map(CarInfo::getNbbm).collect(Collectors.toList());
             vo.setYardVehicles(plateNums);
         }
@@ -734,7 +748,7 @@ public class KeyBoxController extends BaseController {
         return vo;
     }
-    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto, List<LinggangKeyWorkLocation> schedulings, NewDriver driver,List<KeyInfo> keyInfos) {
+    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto, List<LinggangKeyWorkLocation> schedulings, NewDriver driver, List<KeyInfo> keyInfos) {
         if (CollectionUtils.isEmpty(dto.getKeyItem())) {
             return Collections.emptyList();
         }
@@ -754,12 +768,12 @@ 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 (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();
+                } else {
+                    optional = keyInfos.stream().filter(k -> Objects.equals(k.getPlateNum(), item.getPlate())).findFirst();
                     if (optional.isPresent()) {
                         location.setKeyInfoId(optional.get().getId());
                     }
@@ -869,7 +883,7 @@ public class KeyBoxController extends BaseController {
                             }
                             if (CollectionUtils.isNotEmpty(drivers)) {
-                                Optional<NewDriver> opt = drivers.stream().filter(d -> Objects.equals(d.getJobCode(),optional.get().getJobCode())).findFirst();
+                                Optional<NewDriver> opt = drivers.stream().filter(d -> Objects.equals(d.getJobCode(), optional.get().getJobCode())).findFirst();
                                 if (opt.isPresent()) {
                                     recordsVo.setStaffName(opt.get().getPersonnelName());
                                 }
@@ -877,9 +891,9 @@ public class KeyBoxController extends BaseController {
                         }
                     }
-                    if(Objects.nonNull(l.getUpdateTime())){
+                    if (Objects.nonNull(l.getUpdateTime())) {
                         recordsVo.setTime(l.getUpdateTime());
-                    }else if(Objects.nonNull(l.getCreateTime())){
+                    } else if (Objects.nonNull(l.getCreateTime())) {
                         recordsVo.setTime(l.getCreateTime());
                     }
@@ -75,6 +75,8 @@ public interface ISignInService extends IService&lt;SignIn&gt; {
      */
     AjaxResult addSignIn(SignIn signIn) throws FileUploadException, IOException;
+    AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn, SignInResponseVo vo);
+
     AjaxResult addSign(SignIn signIn, Driver driver, LinggangScheduling scheduling) throws IOException;
     String repairSignRecord(HttpServletRequest request);
@@ -530,7 +530,8 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
         return vo;
     }
-    private AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn, SignInResponseVo vo) {
+    @Override
+    public AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn, SignInResponseVo vo) {
         String key = REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW + ConstDateUtil.formatDate("yyyyMMdd") + ":" + signIn.getJobCode();
         // 驾驶员酒精测试连续超标两次则提示换人
         Integer count = redisCache.getCacheObject(key);
@@ -20,6 +20,8 @@ public interface CarInfoService extends IService&lt;CarInfo&gt; {
      */
     List<CarInfo> list(CarInfo entity);
+    List<CarInfo> listLikeNbbs(CarInfo carInfo);
+
     List<CarInfo> likePlateNumPlateNumTop30(CarInfo entity);
     /**根据车辆自编号查询车辆信息*/
     List<CarInfo> list(Collection<String> nbbms);
@@ -10,6 +10,7 @@ import com.ruoyi.domain.caiinfo.CarInfo;
 import com.ruoyi.mapper.carinfo.CarInfoMapper;
 import com.ruoyi.service.carinfo.CarInfoService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -56,6 +57,17 @@ public class CarInfoServiceImpl extends ServiceImpl&lt;CarInfoMapper, CarInfo&gt; impl
     }
     @Override
+    public List<CarInfo> listLikeNbbs(CarInfo carInfo) {
+        String nbbs = carInfo.getNbbm();
+        carInfo.setNbbm(null);
+        LambdaQueryWrapper<CarInfo> wrapper = new LambdaQueryWrapper<>(carInfo);
+        if (StringUtils.isNotEmpty(nbbs)) {
+            wrapper.like(CarInfo::getNbbm, nbbs);
+        }
+        return list(wrapper);
+    }
+
+    @Override
     public List<CarInfo> likePlateNumPlateNumTop30(CarInfo entity) {
         String plateNum = entity.getPlateNum();
         entity.setPlateNum(null);
@@ -82,9 +94,9 @@ 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)) {
+        if (Objects.isNull(carInfo)) {
             wrapper = new LambdaQueryWrapper<>();
-        }else{
+        } else {
             wrapper = new LambdaQueryWrapper<>(carInfo);
         }
@@ -45,7 +45,10 @@ public class FaceServiceImpl implements FaceService {
     @Override
     public NewDriver checkFace(NewDriver driver) {
-        List<NewDriver> drivers = newDriverService.list(new NewDriver());
+        NewDriver driver1 = new NewDriver();
+        driver1.setFaceSignIn(1);
+
+        List<NewDriver> drivers = newDriverService.list(driver1);
         return checkFace(drivers, driver);
     }