酒测未通过审核

liujun001
1 parent 1854df32
Showing 7 changed files with 61 additions and 22 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/controller/sign/in/exception/report/EquipmentExceptionReportController.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/EquipmentExceptionReport.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/dss/FaceServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
Bsth-admin/src/main/resources/logback.xml
@@ -548,7 +548,7 @@ public class DssDriverController extends BaseController {
                     }
                 }
                 vo.setRouteName(scheduling.getLineName());
-                vo.setFache(new Date(scheduling.getFcsjT()));
+                vo.setFache(new Date(scheduling.getFcsjT()*100));
                 return vo;
             }).collect(Collectors.toList());
@@ -203,7 +203,7 @@ public class KeyBoxController extends BaseController {
                 logger.info("根据DTO的数据无法查询车辆信息(carInfos1):[{}]", dto);
             }
-            BasicSyncVo vo = convertBasicSyncVo(workLocations, schedulings, keyInfos, drivers, carInfos, equipment, venueInfo, equipmentList,schedulings1,carInfos1);
+            BasicSyncVo vo = convertBasicSyncVo(workLocations, schedulings, keyInfos, drivers, carInfos, equipment, venueInfo, equipmentList, schedulings1, carInfos1);
             return ResponseResult.success(vo);
         } catch (ParseException e) {
             logger.error("钥匙柜基础信息同步异常:[{}]", dto, e);
@@ -247,7 +247,7 @@ public class KeyBoxController extends BaseController {
         }
         Equipment equipment = equipmentService.getOneByDeviceId(dto.getDevice());
-        TakeKeyVo vo = convertTakeKeyVo(dto, responseResult,equipment);
+        TakeKeyVo vo = convertTakeKeyVo(dto, responseResult, equipment);
         return new ResponseResult<>(responseResult.getCode(), responseResult.getMsg(), vo);
     }
@@ -266,11 +266,17 @@ public class KeyBoxController extends BaseController {
         List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver);
         ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.REPAY);
-        if (Objects.isNull(responseResult) || !responseResult.isSuccess()) {
+        if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
         }
+
+        if (responseResult.isSuccess()) {
+            return ResponseResult.error(responseResult.getCode(), responseResult.getMsg());
+        }
+
+
         Equipment equipment = equipmentService.getOneByDeviceId(dto.getDevice());
-        TakeKeyVo vo = convertTakeKeyVo(dto, responseResult,equipment);
+        TakeKeyVo vo = convertTakeKeyVo(dto, responseResult, equipment);
         return new ResponseResult<>(responseResult.getCode(), responseResult.getMsg(), vo);
     }
@@ -370,7 +376,18 @@ public class KeyBoxController extends BaseController {
         String bcType = ConstDriverProperties.BC_TYPE_IN;
         scheduling.setBcType(bcType);
-        return schedulingService.getOne(scheduling);
+        List<LinggangScheduling> linggangSchedulings = schedulingService.list(scheduling);
+        if (CollectionUtils.isEmpty(linggangSchedulings)) {
+            return null;
+        }
+
+
+        Optional<LinggangScheduling> optional = linggangSchedulings.stream().filter(lin -> lin.getZdsjT() >= dto.getTime().getTime()).findFirst();
+        if (optional.isPresent()) {
+            return optional.get();
+        }
+        int size = linggangSchedulings.size();
+        return linggangSchedulings.get(size - 1);
     }
     private List<LinggangScheduling> queryScheduling(Collection<Long> ids) {
@@ -483,7 +500,7 @@ public class KeyBoxController extends BaseController {
     private BasicSyncVo convertBasicSyncVo(List<LinggangKeyWorkLocation> workLocations, List<LinggangScheduling> schedulings,
                                            List<KeyInfo> keyInfos, List<NewDriver> drivers, List<CarInfo> carInfos, Equipment equipment,
-                                           LinggangVenueInfo venueInfo, List<Equipment> equipmentList, List<LinggangScheduling> schedulings1,List<CarInfo> carInfos1) {
+                                           LinggangVenueInfo venueInfo, List<Equipment> equipmentList, List<LinggangScheduling> schedulings1, List<CarInfo> carInfos1) {
         BasicSyncVo vo = new BasicSyncVo();
         vo.setDevice(equipment.getDeviceId());
@@ -538,7 +555,7 @@ public class KeyBoxController extends BaseController {
                         planVo.setStaffCode(sc.getJobCode());
                         BasicSyncDriverWorkDriverPlanTimePlateVo planTimePlateVo = new BasicSyncDriverWorkDriverPlanTimePlateVo();
-                        planTimePlateVo.setKey(sc.getScheduleDate());
+                        planTimePlateVo.setKey(new Date(sc.getFcsjT()));
                         planTimePlateVo.setValue(carInfoOptional.get().getPlateNum());
                         planVo.setTimePlate(planTimePlateVo);
@@ -555,8 +572,8 @@ public class KeyBoxController extends BaseController {
         if (CollectionUtils.isNotEmpty(schedulings1) && CollectionUtils.isNotEmpty(carInfos1)) {
             Set<String> nbbms = schedulings1.stream().filter(s -> Objects.equals(s.getQdzcode(), venueInfo.getParkCode()) ||
                     Objects.equals(s.getZdzcode(), venueInfo.getParkCode())).map(LinggangScheduling::getNbbm).collect(Collectors.toSet());
-           List<String> plateNums = carInfos1.stream().filter(c->nbbms.contains(c.getNbbm())).map(CarInfo::getPlateNum).collect(Collectors.toList());
-           vo.setYardVehicles(plateNums);
+            List<String> plateNums = carInfos1.stream().filter(c -> nbbms.contains(c.getNbbm())).map(CarInfo::getPlateNum).collect(Collectors.toList());
+            vo.setYardVehicles(plateNums);
         }
@@ -592,7 +609,7 @@ public class KeyBoxController extends BaseController {
                 }
             }
-            if(Objects.nonNull(driver)) {
+            if (Objects.nonNull(driver)) {
                 location.setCreateBy(Convert.toLong(driver.getId()));
             }
             location.setCreateTime(new Date());
@@ -601,12 +618,12 @@ public class KeyBoxController extends BaseController {
         }).filter(obj -> Objects.nonNull(obj.getKeyInfoId())).collect(Collectors.toList());
     }
-    private TakeKeyVo convertTakeKeyVo(TakeKeyDTO dto, ResponseResult<Boolean> result,Equipment equipment) {
+    private TakeKeyVo convertTakeKeyVo(TakeKeyDTO dto, ResponseResult<Boolean> result, Equipment equipment) {
         TakeKeyVo vo = new TakeKeyVo();
         vo.setDevice(dto.getDevice());
         vo.setTime(new Date());
         vo.setResult(result.isSuccess() ? 0 : 1);
-        if(Objects.nonNull(equipment)){
+        if (Objects.nonNull(equipment)) {
             vo.setDeviceType(equipment.getPromise());
             vo.setDriverCode(equipment.getDeviceId());
         }
@@ -109,8 +109,20 @@ public class EquipmentExceptionReportController extends BaseController {
     @GetMapping(value = "/view/{id}")
     public com.ruoyi.common.core.domain.ResponseResult<EquipmentExceptionReportVO> view(@PathVariable("id") Long id, org.springframework.ui.Model model) {
         EquipmentExceptionReport source = equipmentExceptionReportService.getById(id);
+        NewDriver driver = driverService.getOne(source.getJobCode());
+        SignIn signIn = signInService.getById(source.getSignId());
+        EquipmentExceptionReportVO vo =  convert(source);
-        return com.ruoyi.common.core.domain.ResponseResult.success(convert(source));
+        if(Objects.nonNull(driver)){
+            vo.setJobCodeName(driver.getPersonnelName());
+        }
+
+        if(Objects.nonNull(signIn)){
+            vo.setAlcoholIntake(signIn.getAlcoholIntake());
+            vo.setCreateTime(signIn.getCreateTime());
+        }
+
+        return com.ruoyi.common.core.domain.ResponseResult.success(vo);
     }
@@ -117,6 +117,7 @@ public class EquipmentExceptionReport {
     private java.lang.Long createBy;
+
     /***修改人员*/
     @Excel(name = "修改人员")
     private java.lang.Long updateBy;
@@ -79,12 +79,21 @@ public class FaceServiceImpl implements FaceService {
                 return dr;
             }).max(Comparator.comparing(NewDriver::getImageScore));
-            bufferedImage.flush();
-            return optional.isPresent() ? optional.get() : null;
+            if (Objects.nonNull(bufferedImage)) {
+                bufferedImage.flush();
+            }
+
+            if (optional.isPresent() && Objects.nonNull(optional.get().getImageScore()) && optional.get().getImageScore() > 0.95) {
+                return optional.get();
+            }
+
+
+            return null;
         } catch (IOException e) {
             sourceDriver.setImage(null);
             log.error("图片校验异常:[{}]", sourceDriver, e);
         } finally {
+
             IOUtils.closeQuietly(byteArrayInputStream);
         }
         return null;
@@ -127,14 +136,14 @@ public class FaceServiceImpl implements FaceService {
         List<FaceInfo> faceInfoList = new ArrayList<>();
         int errorCode = faceEngine.detectFaces(image.getImageData(), image.getWidth(), image.getHeight(), image.getImageFormat(), faceInfoList);
         if (errorCode != ErrorInfo.MOK.getValue()) {
-            log.error("人脸对比失败，请检查数据:[{}];错误代码：[{}]", driver,errorCode);
+            log.error("人脸对比失败，请检查数据:[{}];错误代码：[{}]", driver, errorCode);
             return null;
         }
         FaceFeature faceFeature = new FaceFeature();
         errorCode = faceEngine.extractFaceFeature(image.getImageData(), image.getWidth(), image.getHeight(), image.getImageFormat(), faceInfoList.get(0), faceFeature);
         if (errorCode != ErrorInfo.MOK.getValue()) {
-            log.error("提取对比特征失败，请检查数据:[{}];错误代码：[{}]", driver,errorCode);
+            log.error("提取对比特征失败，请检查数据:[{}];错误代码：[{}]", driver, errorCode);
             return null;
         }
         return faceFeature;
@@ -602,7 +602,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
                     continue;
                 }
                 break;
-            } while (i < 10000);
+            } while (i < 100);
             if (Objects.isNull(equipment) || Objects.isNull(number)) {
                 log.info("没有找到存放的格子：[{}]", equipment);
@@ -16,7 +16,7 @@
 	<!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/sys-info.log</file>
+	    <file>${log.path}/lingang-bsth.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
@@ -38,7 +38,7 @@
 	</appender>
 	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/sys-error.log</file>
+	    <file>${log.path}/lingang-bsth-error.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
@@ -61,7 +61,7 @@
 	<!-- 用户访问日志输出  -->
     <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/sys-user.log</file>
+		<file>${log.path}/lingang-bsth-user.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 按天回滚 daily -->
             <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>