蓝斯二期

liujun001
1 parent c18b21e5
Showing 31 changed files with 682 additions and 192 deletions
Bsth-admin/sql/DDL.sql
Bsth-admin/src/main/java/com/ruoyi/controller/app/AppSignExceptionController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/RemindDriverKeyLocalController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss2/DssDriverV2Controller.java
Bsth-admin/src/main/java/com/ruoyi/controller/sign/in/exception/report/EquipmentExceptionReportController.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/NewDriver.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss2/driver/dto/DssSignV2DTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/LinggangKeyWorkLocation.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/LinggangScheduling.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/EquipmentExceptionReport.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/dto/EquipmentExceptionReportQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/vo/EquipmentExceptionReportVO.java
Bsth-admin/src/main/java/com/ruoyi/driver/domain/Driver.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/eexception/domain/EquipmentException.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/pojo/response/EquipmentExceptionResponseVo.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/service/SchedulingServiceV1.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
-ALTER TABLE key_work_location ADD type1 INT NULL COMMENT '状态：1 是归还；0是借出;2是初始状态';
+ALTER TABLE equipment_exception ADD sign_id INT NULL COMMENT '打卡表ID';
-ALTER TABLE scheduling ADD alcohol_count INT DEFAULT 2 NULL COMMENT '酒测次数';
+ALTER TABLE equipment_exception_report ADD sign_in varchar(100) NULL COMMENT '签到类型 1 人脸 2 刷卡  3 其他 4 酒精;104 线下酒测';
-ALTER TABLE key_work_location ADD `time` DATETIME NULL;
@@ -68,6 +68,7 @@ public class AppSignExceptionController extends BaseController {
             signIn.setStartCreateTime(DateUtils.addMonths(signIn.getEndCreateTime(), -2));
         }
+        signIn.setSingnIn("104");
         List<SignIn> signIns = signInService.list(signIn);
@@ -90,6 +91,9 @@ public class AppSignExceptionController extends BaseController {
         }
         Set<Long> schedulingIds = signIns.stream().map(SignIn::getSchedulingId).collect(Collectors.toSet());
+
+        LinggangScheduling linggangScheduling = new LinggangScheduling();
+
         List<LinggangScheduling> schedulings = schedulingService.list(null, schedulingIds);
         EquipmentExceptionReport report = new EquipmentExceptionReport();
@@ -290,10 +290,10 @@ public class KeyBoxController extends BaseController {
                 Set<String> plateNums = carInfos.stream().map(CarInfo::getPlateNum).filter(obj -> StringUtils.isNotEmpty(obj)).collect(Collectors.toSet());
                 if (CollectionUtils.isNotEmpty(plateNums)) {
                     keyInfos = keyInfoService.listPlateNums(plateNums);
-                    if(CollectionUtils.isNotEmpty(keyInfos)){
-                        keyInfos = keyInfos.stream().map(k->{
-                            Optional<CarInfo> optCar = carInfos.stream().filter(c->Objects.equals(k.getPlateNum(),c.getPlateNum())).findFirst();
-                            optCar.ifPresent(c->k.setNmmb(c.getNbbm()));
+                    if (CollectionUtils.isNotEmpty(keyInfos)) {
+                        keyInfos = keyInfos.stream().map(k -> {
+                            Optional<CarInfo> optCar = carInfos.stream().filter(c -> Objects.equals(k.getPlateNum(), c.getPlateNum())).findFirst();
+                            optCar.ifPresent(c -> k.setNmmb(c.getNbbm()));
                             return k;
                         }).collect(Collectors.toList());
@@ -304,7 +304,7 @@ public class KeyBoxController extends BaseController {
         Equipment equipment = equipmentService.getOneByDeviceId(dto.getDevice());
         LinggangVenueInfo venueInfo = null;
-        if(Objects.nonNull(equipment)){
+        if (Objects.nonNull(equipment)) {
             venueInfo = venueInfoService.getById(equipment.getYardId());
         }
@@ -314,7 +314,7 @@ public class KeyBoxController extends BaseController {
 //            return ResponseResult.error404();
 //        }
-        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos, 1,venueInfo);
+        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos, 1, venueInfo);
         ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.saveAndDel(locations);
         if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
@@ -361,10 +361,10 @@ public class KeyBoxController extends BaseController {
                 Set<String> plateNums = carInfos.stream().map(CarInfo::getPlateNum).filter(obj -> StringUtils.isNotEmpty(obj)).collect(Collectors.toSet());
                 if (CollectionUtils.isNotEmpty(plateNums)) {
                     keyInfos = keyInfoService.listPlateNums(plateNums);
-                    if(CollectionUtils.isNotEmpty(keyInfos)){
-                        keyInfos = keyInfos.stream().map(k->{
-                            Optional<CarInfo> optCar = carInfos.stream().filter(c->Objects.equals(k.getPlateNum(),c.getPlateNum())).findFirst();
-                            optCar.ifPresent(c->k.setNmmb(c.getNbbm()));
+                    if (CollectionUtils.isNotEmpty(keyInfos)) {
+                        keyInfos = keyInfos.stream().map(k -> {
+                            Optional<CarInfo> optCar = carInfos.stream().filter(c -> Objects.equals(k.getPlateNum(), c.getPlateNum())).findFirst();
+                            optCar.ifPresent(c -> k.setNmmb(c.getNbbm()));
                             return k;
                         }).collect(Collectors.toList());
@@ -375,10 +375,10 @@ public class KeyBoxController extends BaseController {
         Equipment equipment = equipmentService.getOneByDeviceId(dto.getDevice());
         LinggangVenueInfo venueInfo = null;
-        if(Objects.nonNull(equipment)){
+        if (Objects.nonNull(equipment)) {
             venueInfo = venueInfoService.getById(equipment.getYardId());
         }
-        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos, 0,venueInfo);
+        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos, 0, venueInfo);
 //        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.saveAndDel(locations);
@@ -567,14 +567,14 @@ public class KeyBoxController extends BaseController {
         LinggangScheduling scheduling = new LinggangScheduling();
         scheduling.setJobCode(dto.getStaffCode());
-        scheduling.setStartScheduleDate(DateUtil.shortDate(dto.getTime()));
-        scheduling.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
+        scheduling.setScheduleDate(DateUtil.shortDate(dto.getTime()));
+
 //        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);
         scheduling.setType(1);
-        List<LinggangScheduling> linggangSchedulings = schedulingService.list(scheduling);
+        List<LinggangScheduling> linggangSchedulings = schedulingService.listByTime(scheduling);
         if (CollectionUtils.isEmpty(linggangSchedulings)) {
             return null;
         }
@@ -604,10 +604,44 @@ public class KeyBoxController extends BaseController {
      * @return com.ruoyi.domain.key.location.LinggangKeyWorkLocation
      */
     private LinggangKeyWorkLocation queryKeyWorkLocation(LinggangScheduling scheduling, WorkPlateV2DTO dto) {
+        CarInfo carInfo = carInfoService.getOneByNbbm(scheduling.getNbbm());
+        if (Objects.isNull(carInfo)) {
+            return null;
+        }
+
+        List<KeyInfo> keyInfos = keyInfoService.listPlateNum(carInfo.getPlateNum());
+        if (CollectionUtils.isEmpty(keyInfos)) {
+            return null;
+        }
+
         LinggangKeyWorkLocation workLocation = new LinggangKeyWorkLocation();
-        workLocation.setKeyInfoId(scheduling.getKeyInfoId());
-        workLocation.setSchedulingId(scheduling.getId());
-        return linggangKeyWorkLocationService.getOne(workLocation);
+        workLocation.setKeyInfoId(keyInfos.get(0).getId());
+        workLocation.setMaxCreateDate(dto.getTime());
+
+        List<LinggangKeyWorkLocation> lists = linggangKeyWorkLocationService.getTenByKeyIdAndTime(workLocation);
+        int size = CollectionUtils.size(lists);
+        if (0 == size) {
+            return null;
+        } else if (1 == size) {
+            LinggangKeyWorkLocation keyWorkLocation = lists.get(0);
+            return Objects.equals(keyWorkLocation.getType1(), 2) || Objects.equals(keyWorkLocation.getType1(), 1) ? keyWorkLocation : null;
+        }
+        LinggangKeyWorkLocation keyWorkLocation = lists.get(0);
+        if (Objects.equals(keyWorkLocation.getType1(), 2)) {
+            //初始化的数据
+            keyWorkLocation = lists.get(1);
+        }
+        if (Objects.equals(keyWorkLocation.getType1(), 1)) {
+            //已归还的钥匙
+            return keyWorkLocation;
+        } else if (Objects.equals(keyWorkLocation.getType1(), 2)) {
+            //连续两条都是初始化数据，则取初始化数据
+            return lists.get(0);
+        }
+        //钥匙没有归还，返回空
+        return null;
+//        workLocation.setSchedulingId(scheduling.getId());
+//        return linggangKeyWorkLocationService.getOne(workLocation);
     }
@@ -788,7 +822,7 @@ public class KeyBoxController extends BaseController {
         return vo;
     }
-    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto, List<LinggangKeyWorkLocation> schedulings, NewDriver driver, List<KeyInfo> keyInfos, int ty,LinggangVenueInfo venueInfo) {
+    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto, List<LinggangKeyWorkLocation> schedulings, NewDriver driver, List<KeyInfo> keyInfos, int ty, LinggangVenueInfo venueInfo) {
         if (CollectionUtils.isEmpty(dto.getKeyItem())) {
             return Collections.emptyList();
         }
@@ -827,7 +861,7 @@ public class KeyBoxController extends BaseController {
                 location.setCreateBy(Convert.toLong(driver.getId()));
             }
-            if(Objects.nonNull(venueInfo)){
+            if (Objects.nonNull(venueInfo)) {
                 location.setYardId(venueInfo.getId());
                 location.setYardName(venueInfo.getName());
             }
 package com.ruoyi.controller.dss;
+import cn.hutool.core.convert.Convert;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.caiinfo.CarInfo;
 import com.ruoyi.domain.dss.key.location.vo.RemindKeyInfoLocalVo;
 import com.ruoyi.domain.dss.scheling.dto.RemindDriverReportDTO;
 import com.ruoyi.domain.dss.scheling.vo.RemindDriverReportVo;
+import com.ruoyi.domain.key.info.KeyInfo;
 import com.ruoyi.domain.key.location.LinggangKeyWorkLocation;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
+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.utils.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -45,6 +51,10 @@ public class RemindDriverKeyLocalController extends BaseController {
     private LinggangKeyWorkLocationService linggangKeyWorkLocationService;
     @Autowired
     private IEquipmentService equipmentService;
+    @Autowired
+    private CarInfoService carInfoService;
+    @Autowired
+    private KeyInfoService keyInfoService;
     @ApiOperation("司机提醒信息")
     @PostMapping(value = "/remind/driver/key/local/report")
@@ -55,7 +65,7 @@ public class RemindDriverKeyLocalController extends BaseController {
         LinggangScheduling scheduling = new LinggangScheduling();
         scheduling.setJobCode(request.getJobCode());
-
+        scheduling.setScheduleDate(request.getDate());
         scheduling.setStartScheduleDate(request.getDate());
         scheduling.setEndScheduleDate(DateUtils.addDays(request.getDate(), 1));
@@ -67,73 +77,115 @@ public class RemindDriverKeyLocalController extends BaseController {
         List<LinggangScheduling> linggangSchedulings = linggangSchedulingService.list(scheduling, orderEntity);
         int size = CollectionUtils.size(linggangSchedulings);
-        List<LinggangKeyWorkLocation> linggangKeyWorkLocations = null;
-        List<Equipment> equipments = null;
-
+        List<KeyInfo> keyInfos = null;
+        List<CarInfo> carInfos = null;
         if (0 < size) {
-            Set<Long> schedulingIds = linggangSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
-            linggangKeyWorkLocations = linggangKeyWorkLocationService.listRecent(null, schedulingIds);
-            if (CollectionUtils.isNotEmpty(linggangKeyWorkLocations)) {
-                Set<String> deviceIds = linggangKeyWorkLocations.stream().map(LinggangKeyWorkLocation::getDevice).collect(Collectors.toSet());
-                equipments = equipmentService.listNameAndIDBydeviceIds(deviceIds);
-            }
+            Set<String> nbbms = linggangSchedulings.stream().map(LinggangScheduling::getNbbm).collect(Collectors.toSet());
+            carInfos = carInfoService.list(nbbms);
         }
-        RemindDriverReportVo reportVo = new RemindDriverReportVo();
-        reportVo.setCount(linggangSchedulings.stream().filter(ls -> StringUtils.equalsAnyIgnoreCase(ls.getBcType(), "out")).count());
-        if (CollectionUtils.isNotEmpty(linggangKeyWorkLocations)) {
-            List<RemindKeyInfoLocalVo> remindKeyInfoLocalVoList = new ArrayList<>();
-            for (int i = 0; i < size; i = i + 2) {
-                RemindKeyInfoLocalVo localVo = new RemindKeyInfoLocalVo();
-                localVo.setNbbm(linggangSchedulings.get(i).getNbbm());
-                int index = i;
+        if (CollectionUtils.isNotEmpty(carInfos)) {
+            Set<String> plateNums = carInfos.stream().map(CarInfo::getPlateNum).collect(Collectors.toSet());
+            keyInfos = keyInfoService.listPlateNums(plateNums);
+        }
-                Optional<LinggangKeyWorkLocation> optional = linggangKeyWorkLocations.stream().filter(kl -> Objects.equals(kl.getSchedulingId(), linggangSchedulings.get(index).getId())).findFirst();
-                if (optional.isPresent()) {
-                    localVo.setKeyInfoStatus(optional.get().getType());
-                    localVo.setYardName(optional.get().getYardName());
+        int carSize = CollectionUtils.size(carInfos);
+        int keyInfoSize = CollectionUtils.size(keyInfos);
-                    if (CollectionUtils.isNotEmpty(equipments)) {
-                        Optional<LinggangKeyWorkLocation> finalOptional = optional;
-                        Optional<Equipment> equipmentOptional = equipments.stream().filter(e -> Objects.equals(e.getDeviceId(), finalOptional.get().getDevice())).findFirst();
-                        equipmentOptional.ifPresent(equipment -> localVo.setEquipmentName(equipment.getName()));
-                        if (i == 0) {
+        RemindDriverReportVo reportVo = new RemindDriverReportVo();
+        List<LinggangScheduling> values = linggangSchedulings.stream().filter(ls -> StringUtils.equalsAnyIgnoreCase(ls.getBcType(), "out")).collect(Collectors.toList());
+        size = CollectionUtils.size(values);
+        reportVo.setCount(Convert.toLong(size));
+        if (size > 0) {
+            List<RemindKeyInfoLocalVo> remindKeyInfoLocalVoList = new ArrayList<>();
+            for (int i = 0; i < size; i++) {
+                RemindKeyInfoLocalVo localVo = new RemindKeyInfoLocalVo();
+                localVo.setNbbm(values.get(i).getNbbm());
+
+                LinggangKeyWorkLocation workLocation = new LinggangKeyWorkLocation();
+                if (carSize > 0 && keyInfoSize > 0) {
+                    int index = i;
+                    Optional<CarInfo> optionalCarInfo = carInfos.stream().filter(c -> Objects.equals(c.getNbbm(), values.get(index).getNbbm())).findFirst();
+                    if (optionalCarInfo.isPresent()) {
+                        Optional<KeyInfo> optional = keyInfos.stream().filter(k -> Objects.equals(k.getPlateNum(), optionalCarInfo.get().getPlateNum())).findFirst();
+                        optional.ifPresent(k -> workLocation.setKeyInfoId(k.getId()));
+                    }
+                }
+                List<LinggangKeyWorkLocation> keyWorkLocations = null;
+                if (Objects.nonNull(workLocation.getKeyInfoId())) {
+                    workLocation.setMaxCreateDate(new Date());
+                    keyWorkLocations = linggangKeyWorkLocationService.getTenByKeyIdAndTime(workLocation);
+                }
+                if (CollectionUtils.isNotEmpty(keyWorkLocations)) {
+                    int klSize = CollectionUtils.size(keyWorkLocations);
+                    LinggangKeyWorkLocation sourceKL200 = null;
+                    LinggangKeyWorkLocation sourceKL1 = null;
+                    LinggangKeyWorkLocation sourceKL0 = null;
+                    for (int j = 0; j < klSize; j++) {
+                        if (Objects.equals(keyWorkLocations.get(j).getType1(), 2) && Objects.isNull(sourceKL200)) {
+                            sourceKL200 = keyWorkLocations.get(j);
+                            sourceKL200.setIndex(j);
+                        } else if (Objects.equals(keyWorkLocations.get(j).getType1(), 1) && Objects.isNull(sourceKL1)) {
+                            sourceKL1 = keyWorkLocations.get(j);
+                            sourceKL1.setIndex(j);
+                        } else if (Objects.equals(keyWorkLocations.get(j).getType1(), 0) && Objects.isNull(sourceKL0)) {
+                            sourceKL0 = keyWorkLocations.get(j);
+                            sourceKL0.setIndex(j);
+                        } else if (Objects.nonNull(sourceKL200) && Objects.nonNull(sourceKL0) && Objects.nonNull(sourceKL1)) {
+                            break;
                         }
                     }
-                    if (i + 1 < size) {
-                        optional = linggangKeyWorkLocations.stream().filter(kl -> Objects.equals(kl.getSchedulingId(), linggangSchedulings.get(index).getId())).findFirst();
-                        if (optional.isPresent()) {
-                            localVo.setReturnYardName(optional.get().getYardName());
-                            if (CollectionUtils.isNotEmpty(equipments)) {
-                                Optional<LinggangKeyWorkLocation> finalOptional = optional;
-                                Optional<Equipment> equipmentOptional = equipments.stream().filter(e -> Objects.equals(e.getDeviceId(), finalOptional.get().getDevice())).findFirst();
-                                equipmentOptional.ifPresent(equipment -> localVo.setReturnEquipmentName(equipment.getName()));
+                    if (Objects.nonNull(sourceKL0) && Objects.nonNull(sourceKL1) && Objects.nonNull(sourceKL0.getIndex()) && Objects.nonNull(sourceKL1.getIndex())) {
+                        if (sourceKL0.getIndex() > sourceKL1.getIndex()) {
+                            localVo.setKeyInfoStatus(0);
+                            Equipment equipment = equipmentService.getOneByDeviceId(sourceKL1.getDevice());
+                            if (Objects.nonNull(equipment)) {
+                                localVo.setEquipmentName(equipment.getName());
+                                localVo.setYardName(sourceKL0.getYardName());
                             }
+
+                        } else {
+                            localVo.setKeyInfoStatus(1);
                         }
+                    } else if (Objects.nonNull(sourceKL1) && Objects.nonNull(sourceKL1.getIndex())) {
+                        localVo.setKeyInfoStatus(0);
+                        Equipment equipment = equipmentService.getOneByDeviceId(sourceKL1.getDevice());
+                        if (Objects.nonNull(equipment)) {
+                            localVo.setEquipmentName(equipment.getName());
+                            localVo.setYardName(equipment.getYardName());
+                        }
+
+                    } else if (Objects.nonNull(sourceKL0) && Objects.nonNull(sourceKL0.getIndex())) {
+                        localVo.setKeyInfoStatus(1);
+                    } else if (Objects.nonNull(sourceKL200) && Objects.nonNull(sourceKL200.getIndex())) {
+                        localVo.setKeyInfoStatus(16);
+                    } else {
+                        localVo.setKeyInfoStatus(255);
                     }
+                    setReturnInfo(sourceKL200, localVo);
+                    remindKeyInfoLocalVoList.add(localVo);
                 }
-                remindKeyInfoLocalVoList.add(localVo);
             }
-            Optional<LinggangScheduling> opt = linggangSchedulings.stream().filter(f -> Objects.nonNull(f.getSignInId())).max(Comparator.comparing(LinggangScheduling::getFcsjT));
-            if (opt.isPresent()) {
-                Optional<LinggangKeyWorkLocation> optional = linggangKeyWorkLocations.stream().filter(kl -> Objects.equals(kl.getSchedulingId(), opt.get().getId())).findFirst();
-                if (optional.isPresent()) {
-                    Optional<Equipment> equipmentOptional = equipments.stream().filter(e -> Objects.equals(e.getDeviceId(), optional.get().getDevice())).findFirst();
-                    equipmentOptional.ifPresent(equipment -> reportVo.setCurrentKeyLocaltion(equipment.getName()));
-                }
-            } else {
-                Optional<LinggangKeyWorkLocation> optional = linggangKeyWorkLocations.stream().filter(kl -> Objects.equals(kl.getSchedulingId(), linggangSchedulings.get(0).getId())).findFirst();
-                if (optional.isPresent()) {
-                    Optional<Equipment> equipmentOptional = equipments.stream().filter(e -> Objects.equals(e.getDeviceId(), optional.get().getDevice())).findFirst();
-                    equipmentOptional.ifPresent(equipment -> reportVo.setCurrentKeyLocaltion(equipment.getName()));
-                }
+            if(CollectionUtils.isNotEmpty(remindKeyInfoLocalVoList)) {
+                reportVo.setRemindKeyInfoLocalVoList(remindKeyInfoLocalVoList);
+                reportVo.setCurrentKeyLocaltion(remindKeyInfoLocalVoList.get(0).getEquipmentName());
             }
-
-            reportVo.setRemindKeyInfoLocalVoList(remindKeyInfoLocalVoList);
         }
         return ResponseResult.success(reportVo);
     }
+
+    private void setReturnInfo(LinggangKeyWorkLocation sourceKL200, RemindKeyInfoLocalVo localVo) {
+        if (Objects.isNull(sourceKL200) || Objects.isNull(localVo)) {
+            return;
+        }
+        Equipment equipment = equipmentService.getOneByDeviceId(sourceKL200.getDevice());
+        if (Objects.isNull(equipment)) {
+            return;
+        }
+        localVo.setReturnEquipmentName(equipment.getName());
+        localVo.setReturnYardName(sourceKL200.getYardName());
+    }
 }
@@ -24,6 +24,7 @@ import com.ruoyi.system.service.ISysDictDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
@@ -133,7 +134,13 @@ public class DssDriverV2Controller {
             signIn.setAlcoholIntake(Convert.toBigDecimal(dto.getTestValue()));
         }
         signIn.setSingnIn("104");
-        signIn.setImage(dto.getImageContent());
+        if (StringUtils.isNotEmpty(dto.getImageContent())) {
+            signIn.setImage(dto.getImageContent());
+            signIn.setResourceType(1);
+        } else if (StringUtils.isNotEmpty(dto.getVideoContent())) {
+            signIn.setImage(dto.getImageContent());
+            signIn.setResourceType(2);
+        }
 //        SysDictData sysDictData = querySystData(null,"drunkenness");
 //        if(Objects.nonNull(sysDictData)){
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.ResponseResult;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.driver.NewDriver;
@@ -21,6 +22,7 @@ import com.ruoyi.service.sign.in.exception.report.EquipmentExceptionReportServic
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -29,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.text.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -63,16 +66,19 @@ public class EquipmentExceptionReportController extends BaseController {
                 logger.error("没有查到用户信息:[{}]", request);
                 return null;
             }
-            NewDriver d1 = new NewDriver();
-            d1.setFleetName(driver.getFleetName());
-            List<NewDriver> drivers1 = driverService.list(d1);
-            if (CollectionUtils.isEmpty(drivers1)) {
-                logger.error("该车队没有人员:[{}],[{}]", request, d1);
-            }
-
-            driverJobs = drivers1.stream().map(NewDriver::getJobCode).collect(Collectors.toSet());
-            request.setDriverJobs(driverJobs);
+//            NewDriver d1 = new NewDriver();
+//            d1.setFleetName(driver.getFleetName());
+//            List<NewDriver> drivers1 = driverService.list(d1);
+//            if (CollectionUtils.isEmpty(drivers1)) {
+//                logger.error("该车队没有人员:[{}],[{}]", request, d1);
+//            }
+//
+//            driverJobs = drivers1.stream().map(NewDriver::getJobCode).collect(Collectors.toSet());
+//            request.setDriverJobs(driverJobs);
         }
+        Set<String> notSignIn = new HashSet<>();
+        notSignIn.add("104");
+        request.setNotSignIn(notSignIn);
         IPage<EquipmentExceptionReportVO> voiPage = listLimit(request, orderEntity, page, pageLimit, model);
@@ -111,13 +117,13 @@ public class EquipmentExceptionReportController extends BaseController {
         EquipmentExceptionReport source = equipmentExceptionReportService.getById(id);
         NewDriver driver = driverService.getOne(source.getJobCode());
         SignIn signIn = signInService.getById(source.getSignId());
-        EquipmentExceptionReportVO vo =  convert(source);
+        EquipmentExceptionReportVO vo = convert(source);
-        if(Objects.nonNull(driver)){
+        if (Objects.nonNull(driver)) {
             vo.setJobCodeName(driver.getPersonnelName());
         }
-        if(Objects.nonNull(signIn)){
+        if (Objects.nonNull(signIn)) {
             vo.setAlcoholIntake(signIn.getAlcoholIntake());
             vo.setCreateTime(signIn.getCreateTime());
         }
@@ -168,8 +174,8 @@ public class EquipmentExceptionReportController extends BaseController {
     @PostMapping(value = "/update/status")
     public ResponseResult<Boolean> updateStatus(@RequestBody EquipmentExceptionReportUpdateStatusDTO dto) {
         NewDriver driver = driverService.getOneByPhone(dto.getTelPhone());
-        if(Objects.isNull(driver)){
-            return ResponseResult.error("根据手机号没有找到相关的用户:[{}]",dto);
+        if (Objects.isNull(driver)) {
+            return ResponseResult.error("根据手机号没有找到相关的用户:[{}]", dto);
         }
         EquipmentExceptionReport entity = new EquipmentExceptionReport();
         entity.setId(dto.getId());
@@ -195,6 +201,13 @@ public class EquipmentExceptionReportController extends BaseController {
         return java.util.Optional.ofNullable(source).map(sc -> {
             EquipmentExceptionReport target = new EquipmentExceptionReport();
             BeanUtils.copyProperties(sc, target);
+            if (StringUtils.isNotEmpty(source.getTimeStr())) {
+                try {
+                    target.setCreateTime(DateUtils.YYYY_MM_DD_HH_MM_SS.parse(source.getTimeStr()));
+                } catch (ParseException e) {
+                    throw new RuntimeException(e);
+                }
+            }
             return target;
         }).orElse(null);
     }
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -164,8 +165,13 @@ public class NewDriver {
     @Excel(name = "图片版本号")
     private java.lang.String imageVersion;
+    @ApiModelProperty("审计岗，0不是审计岗，1是酒驾审计岗")
+    private Integer audit;
+
     @TableField(exist = false)
     private float imageScore;
+    @TableField(exist = false)
+    private Collection<String> lineNames;
     public Integer getInteger() {
         return integer1;
@@ -175,22 +181,22 @@ public class NewDriver {
         this.integer1 = integer1;
     }
-    public Collection<Integer> getPostValue(){
+    public Collection<Integer> getPostValue() {
-        Set<Integer>  postValue = new HashSet<>();
-        if(StringUtils.indexOf(this.posts,"管理员") > -1){
+        Set<Integer> postValue = new HashSet<>();
+        if (StringUtils.indexOf(this.posts, "管理员") > -1) {
             postValue.add(3);
         }
-        if(StringUtils.indexOf(this.posts,"司机") > -1){
+        if (StringUtils.indexOf(this.posts, "司机") > -1) {
             postValue.add(2);
         }
-        if(StringUtils.indexOf(this.posts,"移车员") > -1){
+        if (StringUtils.indexOf(this.posts, "移车员") > -1) {
             postValue.add(4);
         }
-        if(CollectionUtils.isEmpty(postValue)){
+        if (CollectionUtils.isEmpty(postValue)) {
             postValue.add(1);
         }
@@ -58,6 +58,9 @@ public class DssSignV2DTO {
     @ApiModelProperty(value = "图片内容Base64")
     private String imageContent;
+    @ApiModelProperty(value = "视频内容Base64")
+    private String videoContent;
+
     @Override
     public String toString() {
@@ -127,6 +127,10 @@ public class LinggangKeyWorkLocation {
     private Collection<Integer> keyInfoIds;
     @TableField(exist = false)
     private String jobCode;
+    @TableField(exist = false)
+    private Date maxCreateDate;
+    @TableField(exist = false)
+    private Integer index;
     public boolean importEquals(LinggangKeyWorkLocation location) {
         if (Objects.isNull(location)) {
@@ -148,6 +148,8 @@ public class LinggangScheduling {
     @TableField(value = "alcohol_count")
     private Integer alcoholCount;
+    @TableField(value = "scheduling_type")
+    private Integer schedulingType;
     @TableField(exist = false)
@@ -162,6 +164,7 @@ public class LinggangScheduling {
     @TableField(exist = false)
     private long zdsjTVal;
+
     public String getCheZhanCode(){
         return StringUtils.join(qdzcode,"@",zdzcode,"@",jobCode,"@");
     }
@@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.Date;
+import java.util.Set;
 @Data
@@ -132,10 +133,14 @@ public class EquipmentExceptionReport {
     @Excel(name = "是否删除，0 未删除；1是删除")
     private java.lang.Boolean delFlag;
-    /***签到ID*/
-    @Excel(name = "签到ID")
+
     private java.lang.Long signId;
+    private String signIn;
+
+    @TableField(exist = false)
+    private Collection<String> notSignIn;
+
     @TableField(exist = false)
     private Collection<String> driverJobs;
@@ -91,6 +91,9 @@ public class EquipmentExceptionReportQueryDTO implements java.io.Serializable {
     @ApiModelProperty(value = "需要查询的工号集合")
     private Collection<String> driverJobs;
+    private String timeStr;
+    private Collection<String> notSignIn;
+
     public void clearStrEmpty() {
         if (org.apache.commons.lang3.StringUtils.isEmpty(this.title)) {
 package com.ruoyi.domain.sign.in.exception.report.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -41,6 +42,7 @@ public class EquipmentExceptionReportVO implements java.io.Serializable {
     private Integer status;
     /***上报时间*/
     @ApiModelProperty(value = "上报时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date createTime;
     /***备注*/
     @ApiModelProperty(value = "备注")
@@ -140,6 +140,14 @@ public class Driver extends BaseEntity implements Serializable {
     @ApiModelProperty("车队名称")
     @Excel( name ="车队名称")
     private String fleetName;
+    @ApiModelProperty("审计岗，0不是审计岗，1是酒驾审计岗")
+    private Integer audit;
+
+    private String faceFeature;
+
+    private String imageVersion;
+
+
     @Override
@@ -2,6 +2,7 @@ package com.ruoyi.driver.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.util.StringUtil;
@@ -10,8 +11,10 @@ import com.ruoyi.common.cache.SchedulingCache;
 import com.ruoyi.common.cache.TempCache;
 import com.ruoyi.common.config.RuoYiConfig;
 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.core.text.Convert;
 import com.ruoyi.common.exception.file.InvalidExtensionException;
 import com.ruoyi.common.global.Result;
 import com.ruoyi.common.global.ResultCode;
@@ -38,13 +41,16 @@ import com.ruoyi.pojo.response.personnel.TokenResponseVo;
 import com.ruoyi.service.RuleAttendanceMainService;
 import com.ruoyi.service.SchedulingService;
 import com.ruoyi.service.ThreadJobService;
+import com.ruoyi.service.dss.FaceService;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysNoticeService;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.ListUtils;
+import com.ruoyi.utils.SpringApplicationUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -53,12 +59,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Encoder;
 import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Paths;
@@ -181,7 +189,7 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
         if (source.isCombationVal()) {
             drivers = drivers.stream().map(d -> {
-                d.setImage(sysDictDataService.combationValue(d.getImage(),source));
+                d.setImage(sysDictDataService.combationValue(d.getImage(), source));
                 return d;
             }).collect(Collectors.toList());
@@ -255,6 +263,20 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
     @Override
     public int insertDriver(Driver driver) {
         driver.setUpdateTime(new Date());
+        if (StringUtils.isNotEmpty(driver.getImage())) {
+            String faceFeature = calimageContentFaceFeature(driver.getImage());
+            if (StringUtils.isNotEmpty(faceFeature)) {
+                driver.setFaceFeature(faceFeature);
+                if (StringUtils.isNotEmpty(driver.getImageVersion())) {
+                    driver.setImageVersion("0.01");
+                } else {
+                    Float imageVersion = Convert.toFloat(driver.getImageVersion()) + 0.01F;
+                    driver.setImageVersion(imageVersion.toString());
+                }
+            }
+
+        }
+
         return driverMapper.insertDriver(driver);
     }
@@ -270,13 +292,27 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
         // 修改排班表scheduling  以及缓存信息
         List<DriverScheduling> driverSchedulings = cache.getCacheScheduling(ConstDateUtil.getStringNowLocalDate("-")).get(driver.getJobCode());
         // 只改变车队信息 其他信息由调度接口 和 人事系统决定  本来是不修改的但是人事数据有问题
-        if(CollectionUtils.isNotEmpty(driverSchedulings)) {
+        if (CollectionUtils.isNotEmpty(driverSchedulings)) {
             for (DriverScheduling scheduling : driverSchedulings) {
                 if (StringUtil.isNotEmpty(driver.getFleetName())) {
                     scheduling.setFleetName(driver.getFleetName());
                 }
             }
         }
+        if (StringUtils.isNotEmpty(driver.getImage())) {
+            String faceFeature = calimageContentFaceFeature(driver.getImage());
+            if (StringUtils.isNotEmpty(faceFeature)) {
+                Driver sourceDriver = selectDriverById(driver.getId());
+
+
+                driver.setFaceFeature(faceFeature);
+                Float imageVersion = Convert.toFloat(sourceDriver.getImageVersion()) + 0.01F;
+                driver.setImageVersion(imageVersion.toString());
+                log.info("[{}]", JSON.toJSONString(driver));
+            }
+
+        }
+
         return driverMapper.updateDriver(driver);
     }
@@ -359,7 +395,7 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
     }
     @Override
-    public AjaxResult uploadImage(MultipartFile file,Integer id) throws InvalidExtensionException, IOException {
+    public AjaxResult uploadImage(MultipartFile file, Integer id) throws InvalidExtensionException, IOException {
         // 上传并返回新文件名称
         // 上传文件路径
         String baseUrl = RuoYiConfig.getUploadPath() + headImagePre;
@@ -367,10 +403,10 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
         FileUploadUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
         // 后期可以通过请求头拿到对应的工号
         String fileName = FilenameUtils.getBaseName(file.getOriginalFilename()) + "." + FileUploadUtils.getExtension(file);
-        if(Objects.nonNull(id)){
-            fileName = StringUtils.join(id,"/",fileName);
-        }else{
-            fileName = StringUtils.join("head/", RandomUtils.nextInt(1,90000),"/",fileName);
+        if (Objects.nonNull(id)) {
+            fileName = StringUtils.join(id, "/", fileName);
+        } else {
+            fileName = StringUtils.join("head/", RandomUtils.nextInt(1, 90000), "/", fileName);
         }
         String urlFileName = fileName;
         String absPath = FileUploadUtils.getAbsoluteFile(baseUrl, fileName).getAbsolutePath();
@@ -378,8 +414,7 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
         file.transferTo(Paths.get(absPath));
         SysDictData source = sysDictDataService.getResourceBaseUrl();
-        String  url = sysDictDataService.combationValue(urlFileName,source);
-
+        String url = sysDictDataService.combationValue(urlFileName, source);
         AjaxResult ajax = AjaxResult.success();
         ajax.put("url", url);
@@ -784,4 +819,17 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
         return new File(RuoYiConfig.getProfile() + File.separator + image.replace("/profile", ""));
     }
+
+    private String calimageContentFaceFeature(String imagePath) {
+        String baseUrl = RuoYiConfig.getUploadPath() + headImagePre;
+        try {
+            String path = FileUploadUtils.getAbsoluteFile(baseUrl, imagePath).getAbsolutePath();
+            ResponseResult<String> responseResult = SpringApplicationUtil.getBean(FaceService.class).getFaceFeatureImagePath(path);
+            return Objects.nonNull(responseResult) && responseResult.isSuccess() ? responseResult.getData() : null;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
 }
@@ -61,4 +61,6 @@ public class EquipmentException extends BaseEntity
     private Date planTime;
     private Integer signType;
+
+    private Long signId;
 }
@@ -262,7 +262,7 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
         signIn.setImage(null);
         signIn.setExType1(signIn.getExType());
-        Integer type = Objects.isNull(signIn.getExType()) ? 0 : signIn.getExType() > 0 ? 1 : 0;
+        Integer type = Objects.isNull(signIn.getExType()) ? 0 : bigViewServiceV1.isSignStatusWineEnum(signIn) ? 3 : signIn.getExType() > 0 ? 1 : 0;
         signIn.setExType(type);
         signInMapper.insertSignIn(signIn);
@@ -271,7 +271,7 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
             signIn.setImage(null);
         }
-        if (org.apache.commons.lang3.StringUtils.isNotEmpty(videoContent)) {
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(videoContent) && Objects.equals(signIn.getResourceType(), 2)) {
             StringBuilder builder = new StringBuilder();
             builder.append("sign");
             builder.append(File.separator);
@@ -292,7 +292,31 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
             signInResource.setTime(new Date(scheduling.getFcsjT()));
             signInResource.setCreateTime(new Date());
             signInResource.setPath(builder.toString());
-            signInResource.setIndex1(4);
+            signInResource.setIndex1(20);
+            signInResource.setCreateBy(Convert.toLong(signIn.getCreateBy()));
+            signInResourceService.save(signInResource);
+        } else if (org.apache.commons.lang3.StringUtils.isNotEmpty(videoContent)) {
+            StringBuilder builder = new StringBuilder();
+            builder.append("sign");
+            builder.append(File.separator);
+            builder.append("images");
+            builder.append(File.separator);
+            builder.append("offline");
+            builder.append(File.separator);
+            builder.append(signIn.getId());
+            builder.append(File.separator);
+            builder.append(java.util.UUID.randomUUID().toString().replace("-", ""));
+            builder.append(".jpg");
+
+            uploadUtil.uploadVideoOfBase64(videoContent, builder.toString());
+
+            LinggangSignInResource signInResource = new LinggangSignInResource();
+            signInResource.setSignId(signIn.getId());
+            signInResource.setResourceType(1);
+            signInResource.setTime(new Date(scheduling.getFcsjT()));
+            signInResource.setCreateTime(new Date());
+            signInResource.setPath(builder.toString());
+            signInResource.setIndex1(10);
             signInResource.setCreateBy(Convert.toLong(signIn.getCreateBy()));
             signInResourceService.save(signInResource);
         }
@@ -306,10 +330,13 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
             TempCache.updateSignStatus(signIn.getJobCode());
         }
-        LambdaUpdateWrapper<SignInV1> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.set(SignInV1::getSchedulingId, scheduling.getId());
-        updateWrapper.eq(SignInV1::getId, signIn.getId());
-        update(updateWrapper);
+        if (Objects.nonNull(scheduling)) {
+            LambdaUpdateWrapper<SignInV1> updateWrapper = new LambdaUpdateWrapper<>();
+
+            updateWrapper.set(SignInV1::getSchedulingId, scheduling.getId());
+            updateWrapper.eq(SignInV1::getId, signIn.getId());
+            update(updateWrapper);
+        }
         // 异常保存到异常异常中
         threadJobService.asyncInsertExceptionRecord(signIn, driver, scheduling);
@@ -18,4 +18,6 @@ public class EquipmentExceptionResponseVo extends EquipmentException {
      */
     private String siteName;
+    private String name;
+
 }
@@ -14,4 +14,6 @@ public interface SchedulingServiceV1 extends IService&lt;DriverSchedulingV1&gt; {
     List<DriverSchedulingV1>  queryByNbbmAndDate(String nbbm, Date date);
     SchedulingDateEntity switchSchedulingDate(Date date);
+
+
 }
@@ -4,6 +4,7 @@ package com.ruoyi.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.cache.TempCache;
@@ -16,6 +17,7 @@ import com.ruoyi.config.domain.LineConfig;
 import com.ruoyi.config.service.ILineConfigService;
 import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.domain.RuleAttendanceMain;
+import com.ruoyi.domain.driver.NewDriver;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.domain.sign.in.exception.report.EquipmentExceptionReport;
 import com.ruoyi.driver.domain.Driver;
@@ -33,6 +35,7 @@ import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.job.DriverJob;
 import com.ruoyi.pojo.GlobalIndex;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
+import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import com.ruoyi.service.sign.in.exception.report.EquipmentExceptionReportService;
@@ -40,6 +43,7 @@ import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.DateUtil;
+import com.ruoyi.utils.HttpClientUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
@@ -128,6 +132,13 @@ public class ThreadJobService {
     private RestTemplate restTemplate;
     @Autowired
     private LinggangKeyWorkLocationService keyWorkLocationService;
+    @Autowired
+    private LinggangSchedulingService linggangSchedulingService;
+    @Autowired
+    private NewDriverService newDriverService;
+
+    @Value("${bsth.process.sign.url}")
+    private String processSignExceptionURL;
     /**
@@ -193,6 +204,7 @@ public class ThreadJobService {
             exception.setRemark(signIn.getRemark());
             exception.setCreateTime(signIn.getCreateTime());
             exception.setFleetName(driver.getFleetName());
+            exception.setSignId(signIn.getId());
             if (Objects.nonNull(scheduling)) {
                 exception.setNbbm(scheduling.getNbbm());
                 exception.setLineName(scheduling.getLineName());
@@ -200,6 +212,13 @@ public class ThreadJobService {
             }
             exception.setSignType(signIn.getType());
             exceptionMapper.insertEquipmentException(exception);
+
+            EquipmentExceptionReport exceptionReport = new EquipmentExceptionReport();
+            BeanUtils.copyProperties(exception, exceptionReport);
+            exceptionReport.setSignId(signIn.getId());
+            exceptionReport.setSignIn(signIn.getSingnIn());
+            equipmentExceptionReportService.save(exceptionReport);
+
             // 发送通知
             sendNotice(signIn, driver, scheduling);
         }
@@ -218,6 +237,7 @@ public class ThreadJobService {
             exception.setRemark(signIn.getRemark());
             exception.setCreateTime(signIn.getCreateTime());
             exception.setFleetName(driver.getFleetName());
+            exception.setSignId(signIn.getId());
             if (CollectionUtil.isNotEmpty(dto) && dto.size() > 0) {
                 DriverScheduling scheduling = dto.get(globalIndex.getIndex());
                 exception.setNbbm(scheduling.getNbbm());
@@ -293,6 +313,69 @@ public class ThreadJobService {
             notice.setUpdateTime(DateUtils.getNowDate());
             noticeService.insertNotice(notice);
         }
+
+        sendNoice(signIn, driver, item);
+    }
+
+    private void sendNoice(SignIn signIn, Driver driver, DriverScheduling item) {
+        if (SIGN_ALCOHOL_EX_NUM.equals(signIn.getExType())) {
+            LinggangScheduling linggangScheduling = new LinggangScheduling();
+            linggangScheduling.setQdzcode(item.getQdzCode());
+            linggangScheduling.setBcType("out");
+            linggangScheduling.setStartScheduleDate(DateUtils.addDays(signIn.getCreateTime(), -1));
+            linggangScheduling.setEndScheduleDate(DateUtils.addDays(signIn.getCreateTime(), 1));
+            linggangScheduling.setSchedulingType(1);
+            List<LinggangScheduling> linggangSchedulings = linggangSchedulingService.list(linggangScheduling);
+
+            Set<String> lineNames = null;
+            List<NewDriver> newDrivers = null;
+            if (CollectionUtils.isNotEmpty(linggangSchedulings)) {
+                lineNames = linggangSchedulings.stream().map(LinggangScheduling::getLineName).filter(org.apache.commons.lang3.StringUtils::isNotEmpty).collect(Collectors.toSet());
+            }
+            if (CollectionUtils.isNotEmpty(lineNames)) {
+                NewDriver newDriver = new NewDriver();
+                newDriver.setAudit(1);
+                newDriver.setLineNames(lineNames);
+                newDrivers = newDriverService.list(newDriver);
+            }
+
+            if (CollectionUtils.isNotEmpty(newDrivers)) {
+                for (NewDriver newDriver : newDrivers) {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("noticeIssuer", "运控中心");
+                    map.put("noticeRecipient", "05-" + newDriver.getJobCode());
+                    map.put("noticeTitle", "异常通知");
+                    map.put("noticeSubtitle", "");
+
+                    StringBuilder builder = new StringBuilder();
+                    builder
+                            .append("工号：").append(item.getJobCode()).append(",姓名：").append(item.getName()).append(",工种：")
+                            .append(item.getPosts()).append(",排班：")
+                            .append((Objects.isNull(item.getScheduleDate()) ? "无排班" : "有排班")).append(",打卡时间：")
+                            .append(ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", signIn.getCreateTime()))
+                            .append(",酒精测试超标，当前测试值达到").append(signIn.getAlcoholIntake()).append("mg/100ml。属于").append(getResultString(signIn.getAlcoholIntake()));
+
+                    map.put("noticeContent", builder.toString());
+                    map.put("phone", newDriver.getTelphone());
+                    map.put("smscontent", builder.toString());
+                    map.put("noticeType", "岗前检查");
+                    map.put("remark", "schedulingId=" + item.getId() + "&signId=" + signIn.getId());
+                    map.put("signId", signIn.getId());
+                    map.put("associatedId", item.getId());
+
+                    Map<String, Object> paramMap = new HashMap<>();
+                    paramMap.put("schedulingId", item.getId());
+                    map.put("params", paramMap);
+
+                    String key = SignatureUtils.generateSignature(map, "your_secret_key_here");
+                    map.put("signature", key);
+
+                    String result = HttpUtil.get(processSignExceptionURL, map, 10000);
+                    log.info("processSignExceptionURL:[{}],paramMap:[{}],result:[{}]", processSignExceptionURL, JSONUtil.toJsonStr(map), result);
+                }
+
+            }
+        }
     }
     private String getResultString(BigDecimal alcoholIntake) {
 package com.ruoyi.service.dss;
+import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.domain.driver.NewDriver;
 /**
@@ -16,4 +17,11 @@ public interface FaceService {
      */
     NewDriver checkFace(NewDriver driver);
+    String getBase64ImagePath(String path);
+
+    String getBase64ImageContent(String content);
+
+    ResponseResult<String> getFaceFeatureImageContent(String content);
+    ResponseResult<String> getFaceFeatureImagePath(String path);
+
 }
@@ -73,7 +73,9 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
     @Override
     public List<NewDriver> list(NewDriver entity) {
-        return list(new LambdaQueryWrapper<>(entity));
+        LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>(entity);
+        chooseLineNames(entity, wrapper);
+        return list(wrapper);
     }
     @Override
@@ -570,5 +572,11 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
         }
     }
+    private void chooseLineNames(NewDriver driver, LambdaQueryWrapper<NewDriver> wrapper) {
+        if (Objects.nonNull(driver) && CollectionUtils.isNotEmpty(driver.getLineNames())) {
+            wrapper.in(NewDriver::getLineName, driver.getLineNames());
+        }
+    }
+
 }
 \ No newline at end of file
 package com.ruoyi.service.impl.dss;
+import cn.hutool.core.convert.Convert;
+import com.alibaba.fastjson2.JSON;
 import com.arcsoft.face.FaceEngine;
 import com.arcsoft.face.FaceFeature;
 import com.arcsoft.face.FaceInfo;
@@ -7,11 +9,14 @@ import com.arcsoft.face.FaceSimilar;
 import com.arcsoft.face.enums.ErrorInfo;
 import com.arcsoft.face.toolkit.ImageFactory;
 import com.arcsoft.face.toolkit.ImageInfo;
+import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.sign.Base64;
 import com.ruoyi.config.BsthSystemConfig;
 import com.ruoyi.domain.driver.NewDriver;
 import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.dss.FaceService;
+import com.ruoyi.utils.HttpClientUtil;
 import com.ruoyi.utils.SpringApplicationUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -19,12 +24,12 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import sun.misc.BASE64Encoder;
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import static com.arcsoft.face.toolkit.ImageFactory.getRGBData;
@@ -40,6 +45,8 @@ public class FaceServiceImpl implements FaceService {
     private NewDriverService newDriverService;
     @Autowired
     private BsthSystemConfig bsthSystemConfig;
+    @Autowired
+    private HttpClientUtil httpClientUtil;
     @Override
@@ -51,6 +58,65 @@ public class FaceServiceImpl implements FaceService {
         return checkFace(drivers, driver);
     }
+    @Override
+    public String getBase64ImagePath(String path) {
+        String imageContent = convertFileToBase64(path);
+        return StringUtils.isEmpty(imageContent) ? null : imageContent;
+    }
+
+    @Override
+    public String getBase64ImageContent(String content) {
+        return convertBase64(content.getBytes(StandardCharsets.UTF_8));
+    }
+
+    @Override
+    public ResponseResult<String> getFaceFeatureImageContent(String content) {
+        String json = null;
+        Map<String, Object> parentMap = new HashMap<>();
+        try {
+
+            parentMap.put("method", "getfacelitefeature");
+            parentMap.put("faceid", "1");
+            String faceValue = FileUploadUtils.choosePrictureContent(content);
+            parentMap.put("data", faceValue);
+
+            json = httpClientUtil.doPost(bsthSystemConfig.getFaceFeatureURL(), parentMap, null);
+            if (StringUtils.isEmpty(json)) {
+                log.warn("获取面部特征失败，请检查数据:[{}],[{}],[{}]", json,bsthSystemConfig.getFaceFeatureURL(), JSON.toJSONString(parentMap));
+                return ResponseResult.error("获取面部特征失败，请稍后再试");
+            }
+            json = StringUtils.substringAfter(json, "{");
+            json = StringUtils.substringBeforeLast(json, "}");
+            String[] results = StringUtils.split(json, ",");
+            Map<String, String> resultMap = new HashMap<>();
+            for (String result : results) {
+                result = StringUtils.replace(result, "\\\"", "");
+                String key = StringUtils.trim(StringUtils.substringBefore(result, ":"));
+                String value = StringUtils.trim(StringUtils.substringAfter(result, ":"));
+                resultMap.put(key, value);
+            }
+
+
+            if (!StringUtils.equalsIgnoreCase(resultMap.get("result"), "ok")) {
+                log.warn("获取面部特征不成功,，请检查数据:[{}],[{}],[{}]", json,bsthSystemConfig.getFaceFeatureURL(), JSON.toJSONString(parentMap));
+                return ResponseResult.error("获取面部特征失败，请稍后再试");
+            }
+            String faceFeature = Convert.toStr(resultMap.get("strlitefeature"));
+           ResponseResult<String> responseResult =ResponseResult.success();
+            responseResult.setData(faceFeature);
+            return responseResult;
+        } catch (Exception e) {
+            log.error("获取面部特征异常,返回的结果是：[{}],[{}],[{}]", json,bsthSystemConfig.getFaceFeatureURL(), JSON.toJSONString(parentMap), e);
+            return ResponseResult.error("获取面部特征异常，请稍后再试");
+        }
+    }
+
+    @Override
+    public ResponseResult<String> getFaceFeatureImagePath(String path) {
+        String content = getBase64ImagePath(path);
+        return getFaceFeatureImageContent(content);
+    }
+
     private NewDriver checkFace(List<NewDriver> drivers, NewDriver sourceDriver) {
         if (CollectionUtils.isEmpty(drivers)) {
             return null;
@@ -143,7 +209,7 @@ public class FaceServiceImpl implements FaceService {
         }
         int size = CollectionUtils.size(faceInfoList);
-        if(size == 0){
+        if (size == 0) {
             log.error("人脸对比失败，没有人脸特征数据:[{}];错误代码：[{}]", driver, errorCode);
             return null;
         }
@@ -157,4 +223,27 @@ public class FaceServiceImpl implements FaceService {
         return faceFeature;
     }
+    public String convertFileToBase64(String imgPath) {
+        byte[] data = null;
+        InputStream in = null;
+        // 读取图片字节数组
+        try {
+            in = new FileInputStream(imgPath);
+            System.out.println("文件大小（字节）=" + in.available());
+            data = new byte[in.available()];
+            in.read(data);
+        } catch (IOException e) {
+            log.error("转换图片异常:[{}]", imgPath, e);
+            return null;
+        } finally {
+            IOUtils.closeQuietly(in);
+        }
+        return convertBase64(data);
+    }
+
+    private String convertBase64(byte[] data) {
+        // 对字节数组进行Base64编码，得到Base64编码的字符串
+       return Base64.encode(data);
+    }
+
 }
@@ -298,6 +298,24 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     }
     @Override
+    public LinggangKeyWorkLocation getOneByKeyIdAndTime(LinggangKeyWorkLocation entity) {
+        LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
+        wrapper.le(LinggangKeyWorkLocation::getCreateTime,entity.getMaxCreateDate());
+        wrapper.orderByDesc(LinggangKeyWorkLocation::getCreateTime);
+        wrapper.last("limit 1");
+        return getOne(wrapper);
+    }
+
+    @Override
+    public List<LinggangKeyWorkLocation> getTenByKeyIdAndTime(LinggangKeyWorkLocation entity) {
+        LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
+        wrapper.le(LinggangKeyWorkLocation::getCreateTime,entity.getMaxCreateDate());
+        wrapper.orderByDesc(LinggangKeyWorkLocation::getCreateTime);
+        wrapper.last("limit 10");
+        return list(wrapper);
+    }
+
+    @Override
     public Integer countId(LinggangKeyWorkLocation entity) {
         LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
         wrapper.select(LinggangKeyWorkLocation::getId);
@@ -886,6 +904,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             if (Objects.equals(sc.getBcType(), BC_TYPE_OUT)) {
                 location.setType(3);
             }
+            location.setCreateTime(new Date());
             location.setType1(2);
             return location;
@@ -10,22 +10,24 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.mapper.scheduling.LinggangSchedulingMapper;
+import com.ruoyi.scheduling.domain.DriverSchedulingV1;
+import com.ruoyi.scheduling.domain.SchedulingDateEntity;
+import com.ruoyi.scheduling.service.SchedulingServiceV1;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 @Service
 /** Service实现类*/
 public class LinggangSchedulingServiceImpl extends ServiceImpl<LinggangSchedulingMapper, LinggangScheduling> implements LinggangSchedulingService {
     @Autowired
     private LinggangSchedulingMapper linggangSchedulingMapper;
+    @Autowired
+    private SchedulingServiceV1 schedulingServiceV1;
     /**
      * 分页查询
@@ -72,7 +74,13 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
     @Override
     public List<LinggangScheduling> list(LinggangScheduling entity, OrderEntity orderEntity) {
+        String scheDateStr = null;
+        if(Objects.nonNull(entity.getScheduleDate())){
+            scheDateStr= DateUtils.YYYY_MM_DD.format(entity.getScheduleDate());
+        }
+        entity.setScheduleDate(null);
         LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
+        switchScheduleDateLike(wrapper,scheDateStr);
         switchScheduleDate(wrapper, entity);
         if (Objects.nonNull(orderEntity)) {
             orderColumn(wrapper, orderEntity);
@@ -109,6 +117,25 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
         return list(wrapper);
     }
+
+    @Override
+    public List<LinggangScheduling> listByTime(LinggangScheduling entity) {
+        SchedulingDateEntity en = schedulingServiceV1.switchSchedulingDate(entity.getScheduleDate());
+        entity.setStartScheduleDate(en.getStartDate());
+        entity.setEndScheduleDate(en.getEndDate());
+
+        Date date = entity.getScheduleDate();
+        entity.setScheduleDate(null);
+        LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
+
+        wrapper.and(wr -> {
+            String dateStr = DateUtils.YYYY_MM_DD.format(date);
+            wr.likeRight(LinggangScheduling::getScheduleDate, dateStr).or().between(LinggangScheduling::getFcsjT, entity.getStartScheduleDate().getTime(), entity.getEndScheduleDate().getTime());
+        });
+        wrapper.orderByAsc(LinggangScheduling::getFcsjT);
+
+        return list(wrapper);
+    }
     // @Override
     // public List<LinggangScheduling> listOfSelect(LinggangScheduling entity) {
     //      LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
@@ -343,4 +370,5 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
             wrapper.likeRight(LinggangScheduling::getScheduleDate,scheduleDateStr);
         }
     }
+
 }
 \ No newline at end of file
@@ -52,6 +52,7 @@ public class EquipmentExceptionReportServiceImpl extends ServiceImpl&lt;EquipmentEx
     public IPage<EquipmentExceptionReport> pageList(Page<EquipmentExceptionReport> page, EquipmentExceptionReport entity, OrderEntity orderEntity) {
         LambdaQueryWrapper<EquipmentExceptionReport> countWrapper = new LambdaQueryWrapper<>(entity);
         countWrapper.select(EquipmentExceptionReport::getId);
+        combationNotINSignIds(countWrapper,entity);
         if (CollectionUtils.isNotEmpty(entity.getDriverJobs())) {
             countWrapper.in(EquipmentExceptionReport::getJobCode, entity.getDriverJobs());
         }
@@ -64,6 +65,7 @@ public class EquipmentExceptionReportServiceImpl extends ServiceImpl&lt;EquipmentEx
             if (CollectionUtils.isNotEmpty(entity.getDriverJobs())) {
                 selectWrapper.in(EquipmentExceptionReport::getJobCode, entity.getDriverJobs());
             }
+            combationNotINSignIds(selectWrapper,entity);
             orderColumn(selectWrapper, orderEntity);
             lists = list(selectWrapper);
@@ -86,21 +88,20 @@ public class EquipmentExceptionReportServiceImpl extends ServiceImpl&lt;EquipmentEx
         entity.setFleetName(null);
         entity.setLineName(null);
-        LambdaQueryWrapper<EquipmentExceptionReport> wrapper =  new LambdaQueryWrapper<>(entity);
-        if(CollectionUtils.isNotEmpty(entity.getSignIds())){
-            wrapper.in(EquipmentExceptionReport::getSignId,entity.getSignIds());
+        LambdaQueryWrapper<EquipmentExceptionReport> wrapper = new LambdaQueryWrapper<>(entity);
+        if (CollectionUtils.isNotEmpty(entity.getSignIds())) {
+            wrapper.in(EquipmentExceptionReport::getSignId, entity.getSignIds());
         }
-        if(StringUtils.isNotEmpty(lineName)){
-            wrapper.like(EquipmentExceptionReport::getLineName,lineName);
+        if (StringUtils.isNotEmpty(lineName)) {
+            wrapper.like(EquipmentExceptionReport::getLineName, lineName);
         }
-        if(StringUtils.isNotEmpty(fleetName)){
-            wrapper.like(EquipmentExceptionReport::getFleetName,fleetName);
+        if (StringUtils.isNotEmpty(fleetName)) {
+            wrapper.like(EquipmentExceptionReport::getFleetName, fleetName);
         }
-
         return list(wrapper);
     }
     // @Override
@@ -175,14 +176,14 @@ public class EquipmentExceptionReportServiceImpl extends ServiceImpl&lt;EquipmentEx
         }
         LinggangScheduling scheduling = schedulingService.getById(signIn.getSchedulingId());
-        if(Objects.isNull(scheduling)){
-            log.error("没有找到打卡信息[{}]",signIn);
+        if (Objects.isNull(scheduling)) {
+            log.error("没有找到打卡信息[{}]", signIn);
             return false;
         }
         NewDriver driver = driverService.getOne(signIn.getJobCode());
-        if(Objects.isNull(driver)){
-            log.error("没有找到用户信息[{}]",signIn);
+        if (Objects.isNull(driver)) {
+            log.error("没有找到用户信息[{}]", signIn);
             return false;
         }
@@ -328,4 +329,10 @@ public class EquipmentExceptionReportServiceImpl extends ServiceImpl&lt;EquipmentEx
             wrapper.orderByDesc(EquipmentExceptionReport::getId);
         }
     }
+
+    private static void combationNotINSignIds(LambdaQueryWrapper<EquipmentExceptionReport> wrapper, EquipmentExceptionReport entity) {
+        if (CollectionUtils.isNotEmpty(entity.getNotSignIn())) {
+            wrapper.notIn(EquipmentExceptionReport::getSignIn, entity.getNotSignIn()).or().isNull(EquipmentExceptionReport::getSignIn);
+        }
+    }
 }
 \ No newline at end of file
@@ -33,12 +33,12 @@ public interface LinggangKeyWorkLocationService extends IService&lt;LinggangKeyWork
     List<LinggangKeyWorkLocation> listRecent(Collection<Integer> keyIds, Date date);
-    List<LinggangKeyWorkLocation> listRecent(LinggangKeyWorkLocation entity,Collection<Integer> keyIds, Date date);
+    List<LinggangKeyWorkLocation> listRecent(LinggangKeyWorkLocation entity, Collection<Integer> keyIds, Date date);
     /**
      * 带条件查询
      */
-    List<LinggangKeyWorkLocation> listOfLtEqScheduleDate(LinggangKeyWorkLocation entity,Date scheduleDate);
+    List<LinggangKeyWorkLocation> listOfLtEqScheduleDate(LinggangKeyWorkLocation entity, Date scheduleDate);
     // List<LinggangKeyWorkLocation> listOfIds(java.util.Collection<java.lang.Long> ids);
     // /***
@@ -51,6 +51,13 @@ public interface LinggangKeyWorkLocationService extends IService&lt;LinggangKeyWork
      */
     LinggangKeyWorkLocation getOne(LinggangKeyWorkLocation entity);
+    /**
+     * 条件查询只返回一条数据的方法
+     */
+    LinggangKeyWorkLocation getOneByKeyIdAndTime(LinggangKeyWorkLocation entity);
+
+    List<LinggangKeyWorkLocation> getTenByKeyIdAndTime(LinggangKeyWorkLocation entity);
+
     Integer countId(LinggangKeyWorkLocation entity);
     /**
@@ -75,12 +82,12 @@ public interface LinggangKeyWorkLocationService extends IService&lt;LinggangKeyWork
      * @param locations
      * @return com.ruoyi.common.core.domain.ResponseResult<T>
      */
-     ResponseResult<Boolean> updateTakeKey(List<LinggangKeyWorkLocation> locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum typeEnum);
+    ResponseResult<Boolean> updateTakeKey(List<LinggangKeyWorkLocation> locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum typeEnum);
-     ResponseResult<Boolean> saveAndDel(List<LinggangKeyWorkLocation> locations);
+    ResponseResult<Boolean> saveAndDel(List<LinggangKeyWorkLocation> locations);
     boolean deleteById(Long id);
-    boolean removeBySchedulingId(Set<Long> schedulingId );
+    boolean removeBySchedulingId(Set<Long> schedulingId);
 }
 \ No newline at end of file
@@ -31,6 +31,8 @@ public interface LinggangSchedulingService extends IService&lt;LinggangScheduling&gt; 
     List<LinggangScheduling>  listNbbm(LinggangScheduling entity,Collection<String> nbbm);
+    List<LinggangScheduling> listByTime(LinggangScheduling entity);
+
     // List<LinggangScheduling> listOfIds(java.util.Collection<java.lang.Integer> ids);
     // /***
     // *用于页面选择
@@ -221,6 +221,9 @@ bsth:
             path: D:/work/code/jienengjiancha/bsth-alcohol-sign/Bsth-admin/src/main/resources/libs/WIN64
         faceFeature:
             url: http://222.76.217.238:8880/fcgi-bin/entry.fcgi/system
+    process:
+        sign:
+            url: http://127.0.0.1:9103/commonOpenDataApi/sendAppAndSmsNotice
     skip:
         url: /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;/test/**;/login/no/code;/actuator/health;/upload/image/**;
@@ -24,6 +24,7 @@
         <result property="lineCode" column="line_code"/>
         <result property="updateTime" column="update_time"/>
         <result property="fleetName" column="fleet_name"/>
+        <result property="imageVersion" column="image_version"/>
     </resultMap>
     <resultMap id="PeopleResult" type="com.ruoyi.pojo.vo.PeopleResponseVo">
@@ -35,32 +36,35 @@
     </resultMap>
     <sql id="selectDriverVo">
         select id,
-               job_code,
-               company_code,
-               branche_company_code,
-               personnel_name,
-               papers_code,
-               ic_card_code,
-               personnel_type,
-               posts,
-               card,
-               telphone,
-               ic_rfid,
-               id_rfid,
-               tag_rfid,
-               remark,
-               line_name,
-               line_code,
-               face_sign_in,
-               image,
-               update_time,
-               sign_in_equipment,
-               fleet_name
+        job_code,
+        company_code,
+        branche_company_code,
+        personnel_name,
+        papers_code,
+        ic_card_code,
+        personnel_type,
+        posts,
+        card,
+        telphone,
+        ic_rfid,
+        id_rfid,
+        tag_rfid,
+        remark,
+        line_name,
+        line_code,
+        face_sign_in,
+        image,
+        update_time,
+        sign_in_equipment,
+        fleet_name,
+        image_version
         from driver
     </sql>
     <sql id="insertDriverVo">
         job_code
-        , company_code, branche_company_code, personnel_name, papers_code, ic_card_code, personnel_type, posts, card, telphone, ic_rfid, id_rfid, tag_rfid, remark, line_name, line_code,face_sign_in,image,update_time,sign_in_equipment,fleet_name
+        , company_code, branche_company_code, personnel_name, papers_code, ic_card_code, personnel_type, posts, card,
+        telphone, ic_rfid, id_rfid, tag_rfid, remark, line_name,
+        line_code,face_sign_in,image,update_time,sign_in_equipment,fleet_name
     </sql>
     <select id="selectDriverList" parameterType="Driver" resultMap="DriverResult">
@@ -182,22 +186,22 @@
     </select>
     <select id="queryAttendanceInfoById" resultType="com.ruoyi.pojo.vo.PeopleResponseVo" resultMap="PeopleResult">
         SELECT driver.job_code,
-               driver.personnel_name,
-               driver.posts,
-               driver.fleet_name,
-               rule_setting_driver.start_date
+        driver.personnel_name,
+        driver.posts,
+        driver.fleet_name,
+        rule_setting_driver.start_date
         FROM driver,
-             rule_setting_driver
+        rule_setting_driver
         WHERE driver.job_code = rule_setting_driver.job_code
-          and rule_setting_driver.setting_id = #{id}
+        and rule_setting_driver.setting_id = #{id}
     </select>
     <select id="queryAttendanceInfoAll" resultType="com.ruoyi.pojo.vo.PeopleResponseVo" resultMap="PeopleResult">
         SELECT job_code,
-               personnel_name,
-               posts,
-               fleet_name
+        personnel_name,
+        posts,
+        fleet_name
         FROM driver
---         WHERE driver.posts != "驾驶员" and driver.posts != "售票员"
+        -- WHERE driver.posts != "驾驶员" and driver.posts != "售票员"
     </select>
     <select id="queryEmptyJob" resultType="java.lang.String">
         SELECT
@@ -238,6 +242,8 @@
             <if test="image != null">image,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="fleetName != null">fleet_name</if>
+            <if test="faceFeature != null">face_Feature</if>
+            <if test="imageVersion != null">image_version</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jobCode != null and jobCode != ''">#{jobCode},</if>
@@ -260,6 +266,8 @@
             <if test="image != null">#{image},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="fleetName != null">#{fleetName}</if>
+            <if test="faceFeature != null">#{faceFeature}</if>
+            <if test="imageVersion != null">#{imageVersion}</if>
         </trim>
         on duplicate key update
         job_code = values(job_code)
@@ -287,7 +295,9 @@
             <if test="faceSignIn != null">face_sign_in = #{faceSignIn},</if>
             <if test="image != null">image = #{image},</if>
             <if test="signInEquipment != null">sign_in_equipment = #{signInEquipment},</if>
-            <if test="fleetName != null">fleet_name = #{fleetName}</if>
+            <if test="fleetName != null">fleet_name = #{fleetName},</if>
+            <if test="faceFeature != null">face_Feature = #{faceFeature},</if>
+            <if test="imageVersion != null">image_version = #{imageVersion}</if>
         </trim>
         where id = #{id}
     </update>
@@ -295,31 +305,31 @@
         update driver
         set face_sign_in = 0
         WHERE face_sign_in != 1 and job_code in (
-            SELECT job_code
-            FROM driver_face_device_id,equipment
-            WHERE equipment.`status` = 1 and driver_face_device_id.device_id = equipment.device_id
-            GROUP BY job_code
-            HAVING COUNT(*) = #{count}
-            );
+        SELECT job_code
+        FROM driver_face_device_id,equipment
+        WHERE equipment.`status` = 1 and driver_face_device_id.device_id = equipment.device_id
+        GROUP BY job_code
+        HAVING COUNT(*) = #{count}
+        );
         update driver
         set face_sign_in = 0
         WHERE face_sign_in = 1
-          and job_code in (SELECT job_code
-                           FROM driver_face_device_id,
-                                equipment
-                           WHERE equipment.`status` = 1
-                             and driver_face_device_id.device_id = equipment.device_id
-                           GROUP BY job_code
-                           HAVING COUNT(*) = #{count});
+        and job_code in (SELECT job_code
+        FROM driver_face_device_id,
+        equipment
+        WHERE equipment.`status` = 1
+        and driver_face_device_id.device_id = equipment.device_id
+        GROUP BY job_code
+        HAVING COUNT(*) = #{count});
         update driver
         set face_sign_in = 2
         WHERE face_sign_in != 1 and job_code not in (
-            SELECT job_code
-            FROM driver_face_device_id,equipment
-            WHERE equipment.`status` = 1 and driver_face_device_id.device_id = equipment.device_id
-            GROUP BY job_code
-            HAVING COUNT(*) = #{count}
-            );
+        SELECT job_code
+        FROM driver_face_device_id,equipment
+        WHERE equipment.`status` = 1 and driver_face_device_id.device_id = equipment.device_id
+        GROUP BY job_code
+        HAVING COUNT(*) = #{count}
+        );
     </update>
     <update id="updateSignStatusDriversByJobCodes">
         <foreach collection="list" item="item" separator=";">
@@ -120,7 +120,7 @@
             </if>
             <if test="jobCode != null  and jobCode != ''">and driver.job_code = #{jobCode}</if>
             <if test="exType != null ">and ex_type = #{exType}</if>
-            <if test="id != null ">and equipment_exception.id #{id}</if>
+            <if test="id != null ">and equipment_exception.id = #{id}</if>
             <if test="date != null ">
                 and
                 equipment_exception.create_time &gt;= CONCAT(#{date}, ' 02:30:00')
@@ -155,6 +155,7 @@
             <if test="lineName != null and lineName != ''">line_name,</if>
             <if test="planTime != null">plan_time,</if>
             <if test="signType != null">sign_type,</if>
+            <if test="signId != null">sign_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="title != null">#{title},</if>
@@ -170,6 +171,7 @@
             <if test="lineName != null and lineName != ''">#{lineName},</if>
             <if test="planTime != null ">#{planTime},</if>
             <if test="signType != null ">#{signType},</if>
+            <if test="signId != null ">#{signId},</if>
         </trim>
     </insert>