蓝斯二期

liujun001
1 parent df625c0c
Showing 21 changed files with 586 additions and 71 deletions
Bsth-admin/src/main/java/com/ruoyi/BsthApplication.java
Bsth-admin/src/main/java/com/ruoyi/common/cache/SchedulingCache.java
Bsth-admin/src/main/java/com/ruoyi/config/FaceEngineConfig.java
Bsth-admin/src/main/java/com/ruoyi/controller/RefreshController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss2/DssDriverV2Controller.java
Bsth-admin/src/main/java/com/ruoyi/domain/DriverScheduling.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss2/driver/dto/DssDetailSignV2DTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss2/driver/dto/DssSignV2DTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss2/driver/vo/DssSignInV2Vo.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/LinggangScheduling.java
Bsth-admin/src/main/java/com/ruoyi/in/service/SignInServiceV1.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/service/BigViewServiceV1.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/dss/FaceServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/utils/SpringApplicationUtil.java
Bsth-admin/src/main/resources/application-druid-devTest.yml
 package com.ruoyi;
+import com.ruoyi.utils.SpringApplicationUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
@@ -27,9 +28,11 @@ public class BsthApplication {
     private final static Logger log = LoggerFactory.getLogger(BsthApplication.class);
+
     public static void main(String[] args) throws UnknownHostException {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         ConfigurableApplicationContext app = SpringApplication.run(BsthApplication.class, args);
+        SpringApplicationUtil.setApplicationContext(app);
         Environment env = app.getEnvironment();
         log.info("(♥◠‿◠)ﾉﾞ  岗前检测后台启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
                 " .-------.       ____     __        \n" +
@@ -5,6 +5,7 @@ import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
 import com.ruoyi.utils.ConstDateUtil;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +44,7 @@ public class SchedulingCache {
     private static final ConcurrentHashMap<String, Map<String, List<ResponseSchedulingDto>>> CONCURRENT_HASH_MAP = new ConcurrentHashMap<>();
-    public SchedulingCache(SchedulerProperty property,RedisCache redisCache) {
+    public SchedulingCache(SchedulerProperty property, RedisCache redisCache) {
         log.info("项目启动加载中获取实时班次并存入缓存-----");
         this.redisCache = redisCache;
         schedulingInit(property);
@@ -57,21 +58,23 @@ public class SchedulingCache {
         String formatNowDate = ConstDateUtil.formatDate(new Date());
         String url = getUrl(formatNowDate, property);
         log.info("初始化排班数据:{}", formatNowDate);
-        saveSchedulingToCache(url, formatNowDate);
+        saveSchedulingToCache(url, formatNowDate, null, null);
         String formatYesterdayDate = ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1));
         log.info("初始化排班数据:{}", formatYesterdayDate);
         url = getUrlOld(formatYesterdayDate, property);
-        saveSchedulingToCache(url, formatYesterdayDate);
+        saveSchedulingToCache(url, formatYesterdayDate, null, null);
     }
     public String getUrl(String formatNowDate, SchedulerProperty property) {
         String url = null;
+        Date date = new Date();
+        long timestamp1 = DateUtils.addHours(date, -1).getTime();
         long timestamp = System.currentTimeMillis();
 //        String formatDate = ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1));
         // 获取排班请求
         String key = "Scheduling:timeStr:" + formatNowDate;
         try {
-            long timestampValue = timestamp;
+            long timestampValue = timestamp1;
             if (!redisCache.hasKey(key)) {
                 redisCache.setCacheObject(key, "1", 30, TimeUnit.HOURS);
                 timestampValue = 0;
@@ -136,14 +139,9 @@ public class SchedulingCache {
     }
-    private Map<String, List<ResponseSchedulingDto>> saveSchedulingToCache(String getSchedulingInfoUrl, String dateKey) {
+    private Map<String, List<ResponseSchedulingDto>> saveSchedulingToCache(String getSchedulingInfoUrl, String dateKey, RedisCache redisCache, String redisKey) {
         log.info("开始拉取排班:{}", dateKey);
-        List<ResponseSchedulingDto> originSchedulingList = new RestTemplate().exchange(
-                getSchedulingInfoUrl,
-                HttpMethod.GET,
-                null,
-                new ParameterizedTypeReference<List<ResponseSchedulingDto>>() {
-                }).getBody();
+        List<ResponseSchedulingDto> originSchedulingList = requestScheduling(getSchedulingInfoUrl, redisCache, redisKey);
         Map<String, List<ResponseSchedulingDto>> driverSchedulingMap = new HashMap<>(200);
         // 按照员工工号来获取排班信息
@@ -177,7 +175,7 @@ public class SchedulingCache {
         return driverSchedulingMap;
     }
-    public List<ResponseSchedulingDto> requestScheduling(String getSchedulingInfoUrl) {
+    public List<ResponseSchedulingDto> requestScheduling(String getSchedulingInfoUrl, RedisCache redisCache, String key) {
         List<ResponseSchedulingDto> originSchedulingList = null;
         int index = 0;
         int size = 0;
@@ -197,6 +195,11 @@ public class SchedulingCache {
             }
         }
+
+        if (size > 0 && Objects.nonNull(redisCache)) {
+            redisCache.setCacheObject(key, "1", 30, TimeUnit.HOURS);
+        }
+
         return originSchedulingList;
     }
@@ -9,6 +9,8 @@ import com.arcsoft.face.enums.DetectOrient;
 import com.arcsoft.face.enums.ErrorInfo;
 import com.ruoyi.exception.InterruptException;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
@@ -24,8 +26,14 @@ import java.util.Objects;
 public class FaceEngineConfig {
     private FaceEngine faceEngine;
+    @Value("${spring.profiles.active}")
+    private String profilesActive;
+
     @Bean
     public FaceEngine createFaceEngine(BsthSystemConfig bsthSystemConfig) {
+        if(isDev()){
+            return null;
+        }
         FaceEngine faceEngine = new FaceEngine(bsthSystemConfig.getFaceLibPath());
 //        FaceEngine faceEngine = new FaceEngine("D:\\\\arcsoft_lib");
         //激活引擎
@@ -76,4 +84,8 @@ public class FaceEngineConfig {
             faceEngine.unInit();
         }
     }
+
+    public  boolean isDev(){
+        return StringUtils.equals("druid-dev",profilesActive);
+    }
 }
@@ -65,6 +65,16 @@ public class RefreshController {
         return ResponseResult.success();
     }
+    @GetMapping(value = "/scheduling/{dateStr}")
+    @ApiOperation("scheduling")
+//    @PreAuthorize("@ss.hasPermi('refresh:scheduling')")
+    public ResponseResult<Boolean> scheduling(@PathVariable  String dateStr) throws ParseException {
+        Date date = DateUtil.YYYY_MM_DD_LINK_HH_MM_SS.parse(dateStr);
+        driverJob.runScheduling(date.getTime());
+
+        return ResponseResult.success();
+    }
+
     @GetMapping(value = "/key/info/local")
     @ApiOperation("/key/info/local")
     @PreAuthorize("@ss.hasPermi('refresh:key:info:local')")
@@ -36,6 +36,7 @@ import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
 import com.ruoyi.exception.InterruptException;
 import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
+import com.ruoyi.in.domain.CalDriverScheduling;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.domain.SignInV1;
 import com.ruoyi.in.service.ISignInService;
@@ -167,20 +168,20 @@ public class DssDriverController extends BaseController {
                 SignInResponseVo vo = new SignInResponseVo();
                 if (Objects.nonNull(signInV1)) {
-                    BeanUtils.copyProperties(signInV1,vo);
+                    BeanUtils.copyProperties(signInV1, vo);
                     vo.setDeviceId(signIn.getDeviceId());
                     vo.setSiteName(signInV1.getEquipment().getName());
                     vo.setName(signInV1.getDriver().getPersonnelName());
                     vo.setPosts(signInV1.getPosts());
-                    ResponseResult<DssSignVo> responseResult = ResponseResult.success(convertSignInVo(vo, dto, dictData,signInV1));
+                    ResponseResult<DssSignVo> responseResult = ResponseResult.success(convertSignInVo(vo, dto, dictData, signInV1));
                     responseResult.setMsg(Convert.toStr(ajaxResult.get(AjaxResult.MSG_TAG)));
                     return responseResult;
                 }
             }
             return ResponseResult.error(Convert.toInt(ajaxResult.get(AjaxResult.CODE_TAG)), Convert.toStr(ajaxResult.get(AjaxResult.MSG_TAG)));
-        } catch (  IOException e) {
+        } catch (IOException e) {
             log.error("签到信息异常，传入的参数为:[{}]", dto, e);
             return ResponseResult.error();
         }
@@ -210,7 +211,7 @@ public class DssDriverController extends BaseController {
                 SignInResponseVo vo = new SignInResponseVo();
                 if (Objects.nonNull(signInV1)) {
-                    BeanUtils.copyProperties(signInV1,vo);
+                    BeanUtils.copyProperties(signInV1, vo);
                     vo.setDeviceId(signIn.getDeviceId());
                     vo.setSiteName(signInV1.getEquipment().getName());
@@ -243,8 +244,12 @@ public class DssDriverController extends BaseController {
             return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
-        SignIn signIn = convertSignIn(dto);
-        SignIn dataSignIn = signInService.getLastOne(signIn);
+        CalDriverScheduling calDriverScheduling = signInServiceV1.findSchedulingByDateTime(dto.getStaffCode(), new Date(), 1);
+        if(Objects.isNull(calDriverScheduling) || Objects.isNull(calDriverScheduling.getDriverScheduling()) || Objects.isNull(calDriverScheduling.getDriverScheduling().getSignInId())){
+            return ResponseResult.success(convertGetWineRecordVo(null));
+        }
+
+        SignIn dataSignIn = signInService.getById(calDriverScheduling.getDriverScheduling().getSignInId());
         return ResponseResult.success(convertGetWineRecordVo(dataSignIn));
     }
@@ -509,6 +514,7 @@ public class DssDriverController extends BaseController {
         signIn.setCreateTime(dto.getSignTime());
         signIn.setType(1);
+        signIn.setSingnIn("4");
         if (Objects.nonNull(dto.getTestValue())) {
             signIn.setAlcoholFlag(ConstSignInConstSignInProperties.ALCOHOL_FLAG_YES);
@@ -600,7 +606,7 @@ public class DssDriverController extends BaseController {
         return resource;
     }
-    private DssSignVo convertSignInVo(SignInResponseVo responseVo, DssSignDTO dto, SysDictData dictData,SignInV1 signInV1) {
+    private DssSignVo convertSignInVo(SignInResponseVo responseVo, DssSignDTO dto, SysDictData dictData, SignInV1 signInV1) {
         DssSignVo vo = new DssSignVo();
         vo.setTestId(Convert.toStr(responseVo.getId()));
@@ -611,7 +617,7 @@ public class DssDriverController extends BaseController {
             vo.setTestResult(1);
         }
-        Integer result = Objects.equals(1,signInV1.getSignIn().getStatus())?0:1;
+        Integer result = Objects.equals(1, signInV1.getSignIn().getStatus()) ? 0 : 1;
         vo.setResult(result);
         return vo;
@@ -622,13 +628,14 @@ public class DssDriverController extends BaseController {
     }
     private GetWineRecordVo convertGetWineRecordVo(SignIn signIn) {
+        GetWineRecordVo vo = new GetWineRecordVo();
         if (Objects.isNull(signIn)) {
-            return null;
+            vo.setCheck(true);
+            return vo;
         }
-        GetWineRecordVo vo = new GetWineRecordVo();
         vo.setCheckTime(signIn.getCreateTime());
-        String key = REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW + ConstDateUtil.formatDate("yyyyMMdd") + ":" + signIn.getJobCode();
+        String key = REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW + ConstDateUtil.formatDate("yyyyMMdd") + ":" + signIn.getJobCode()+":"+signIn.getSchedulingId();
         Integer count = redisCache.getCacheObject(key);
         if (Objects.nonNull(count) && SIGN_IN_ERROR_COUNT.compareTo(count) <= 0) {
@@ -640,27 +647,27 @@ public class DssDriverController extends BaseController {
         return vo;
     }
-    private LinggangScheduling convertScheduling(GetBusPlanListDTO dto)  {
+    private LinggangScheduling convertScheduling(GetBusPlanListDTO dto) {
         LinggangScheduling scheduling = new LinggangScheduling();
         if (Objects.equals(1, dto.getDateType())) {
             scheduling.setStartScheduleDate(DateUtil.shortDate(DateUtils.addDays(new Date(), 1)));
             scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
-            String timeStr = DateUtil.YYYY_MM_DD_LINK.format(scheduling.getEndScheduleDate())+" 06:00:00";
+            String timeStr = DateUtil.YYYY_MM_DD_LINK.format(scheduling.getEndScheduleDate()) + " 06:00:00";
             try {
                 scheduling.setFcsjT(DateUtil.YYYY_MM_DD_LINK.parse(timeStr).getTime());
             } catch (ParseException e) {
-                log.error("格式化时间错误",e);
+                log.error("格式化时间错误", e);
             }
         } else if (Objects.equals(0, dto.getDateType())) {
             scheduling.setStartScheduleDate(DateUtil.shortDate(new Date()));
             scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
-            String timeStr = DateUtil.YYYY_MM_DD_LINK.format(scheduling.getEndScheduleDate())+" 06:00:00";
+            String timeStr = DateUtil.YYYY_MM_DD_LINK.format(scheduling.getEndScheduleDate()) + " 06:00:00";
             try {
                 scheduling.setFcsjT(DateUtil.YYYY_MM_DD_LINK.parse(timeStr).getTime());
             } catch (ParseException e) {
-                log.error("格式化时间错误",e);
+                log.error("格式化时间错误", e);
             }
         } else {
             scheduling.setStartScheduleDate(DateUtil.shortDate(new Date()));
+package com.ruoyi.controller.dss2;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.crypto.asymmetric.Sign;
+import com.ruoyi.common.ConstSignInConstSignInProperties;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.domain.driver.NewDriver;
+import com.ruoyi.domain.dss.sign.vo.DssSignVo;
+import com.ruoyi.domain.dss2.driver.dto.DssDetailSignV2DTO;
+import com.ruoyi.domain.dss2.driver.dto.DssSignV2DTO;
+import com.ruoyi.domain.dss2.driver.vo.DssSignInV2Vo;
+import com.ruoyi.driver.service.IDriverService;
+import com.ruoyi.in.domain.CalDriverScheduling;
+import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.in.domain.SignInV1;
+import com.ruoyi.in.service.ISignInService;
+import com.ruoyi.in.service.SignInServiceV1;
+import com.ruoyi.in.service.impl.SignInServiceImpl;
+import com.ruoyi.pojo.response.SignInResponseVo;
+import com.ruoyi.service.BigViewServiceV1;
+import com.ruoyi.service.driver.NewDriverService;
+import com.ruoyi.system.service.ISysDictDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.domain.ResponseResult;
+
+import java.util.Date;
+import java.util.Objects;
+
+@RestController
+@Slf4j
+@RequestMapping("/dss/v2")
+@Api(tags = "【蓝斯二期】设备信息")
+public class DssDriverV2Controller {
+
+    @Autowired
+    private SignInServiceV1 signInServiceV1;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+    @Autowired
+    private BigViewServiceV1 bigViewServiceV1;
+    @Autowired
+    private ISignInService signInService;
+    @Autowired
+    private NewDriverService newDriverService;
+
+    @ApiOperation("线下签到")
+    @PostMapping("/offline/sign/in/add")
+    public ResponseResult<DssSignVo> addSign(@RequestBody DssSignV2DTO signV2DTO, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        NewDriver driver = newDriverService.getOne(signV2DTO.getAuditJobCode());
+        if (Objects.isNull(driver)) {
+            return ResponseResult.error("无法查找到审核人员");
+        }
+
+
+        SignIn signIn = convertSignIn(signV2DTO);
+        signIn.setCreateBy(Convert.toStr(driver.getId()));
+        AjaxResult ajaxResult = signInServiceV1.addSignInOffice(signIn);
+
+        if (Objects.nonNull(ajaxResult) && ajaxResult.isSuccess()) {
+            SysDictData sysDictData = new SysDictData();
+            sysDictData.setDictType("drinking");
+            SysDictData dictData = sysDictDataService.getOne(sysDictData);
+
+            SignInV1 signInV1 = (SignInV1) ajaxResult.get(AjaxResult.DATA_TAG);
+
+            SignInResponseVo vo = new SignInResponseVo();
+            if (Objects.nonNull(signInV1)) {
+                BeanUtils.copyProperties(signInV1, vo);
+
+                vo.setDeviceId(signIn.getDeviceId());
+
+                vo.setName(signInV1.getDriver().getPersonnelName());
+                vo.setPosts(signInV1.getPosts());
+                ResponseResult<DssSignVo> responseResult = ResponseResult.success(convertSignInVo(vo, signV2DTO, dictData, signInV1));
+                responseResult.setMsg(Convert.toStr(ajaxResult.get(AjaxResult.MSG_TAG)));
+                return responseResult;
+            }
+        }
+
+        return ResponseResult.error(Convert.toInt(ajaxResult.get(AjaxResult.CODE_TAG)), Convert.toStr(ajaxResult.get(AjaxResult.MSG_TAG)));
+    }
+
+    @ApiOperation("签到详情")
+    @PostMapping("/offline/sign/in")
+    public ResponseResult<DssSignInV2Vo> detailSignIn(@RequestBody DssDetailSignV2DTO signV2DTO, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        Date date = signV2DTO.getDate();
+        if (Objects.isNull(date)) {
+            date = new Date();
+        }
+
+        CalDriverScheduling calDriverScheduling = signInServiceV1.findSchedulingByDateTime(signV2DTO.getJobCode(), date, 1);
+        if (Objects.isNull(calDriverScheduling) || Objects.isNull(calDriverScheduling.getDriverScheduling())
+                || Objects.isNull(calDriverScheduling.getDriverScheduling().getSignInId())) {
+            return ResponseResult.success();
+        }
+        SignIn signIn = signInService.getById(calDriverScheduling.getDriverScheduling().getSignInId());
+        if (Objects.isNull(signIn)) {
+            return ResponseResult.success();
+        }
+        DssSignInV2Vo vo = convertDssSignInV2Vo(signIn);
+        return ResponseResult.success(vo);
+    }
+
+
+    private SignIn convertSignIn(DssSignV2DTO dto) {
+        SignIn signIn = new SignIn();
+//        signIn.setImage();
+        signIn.setJobCode(dto.getStaffCode());
+
+        signIn.setCreateTime(dto.getSignTime());
+        signIn.setType(1);
+
+        if (Objects.nonNull(dto.getTestValue())) {
+            signIn.setAlcoholFlag(ConstSignInConstSignInProperties.ALCOHOL_FLAG_YES);
+            signIn.setAlcoholIntake(Convert.toBigDecimal(dto.getTestValue()));
+        }
+        signIn.setSingnIn("104");
+        signIn.setImage(dto.getImageContent());
+
+//        SysDictData sysDictData = querySystData(null,"drunkenness");
+//        if(Objects.nonNull(sysDictData)){
+//
+//        }
+
+        return signIn;
+    }
+
+
+    private DssSignVo convertSignInVo(SignInResponseVo responseVo, DssSignV2DTO dto, SysDictData dictData, SignInV1 signInV1) {
+        DssSignVo vo = new DssSignVo();
+        vo.setTestId(Convert.toStr(responseVo.getId()));
+
+
+        Integer testResult = bigViewServiceV1.isSignStatusZoneEnum(signInV1.getSignIn()) ? 2 : 0;
+        vo.setTestResult(testResult);
+        if (Objects.isNull(dictData) || Objects.equals(testResult, 0) && dto.getTestValue() > Convert.toLong(dictData.getDictValue())) {
+            vo.setTestResult(1);
+        }
+
+        Integer result = Objects.equals(1, signInV1.getSignIn().getStatus()) ? 0 : 1;
+        vo.setResult(result);
+
+        return vo;
+    }
+
+    private DssSignInV2Vo convertDssSignInV2Vo(SignIn signIn) {
+        DssSignInV2Vo vo = new DssSignInV2Vo();
+        vo.setId(Convert.toInt(signIn.getId()));
+        vo.setStatus(signIn.getStatus());
+        vo.setType(signIn.getType());
+        vo.setExType(signIn.getExType());
+        vo.setAlcoholIntake(Convert.toStr(signIn.getAlcoholIntake()));
+        vo.setAlcoholFlag(signIn.getAlcoholFlag());
+        vo.setJobCode(signIn.getJobCode());
+        vo.setSignInDate(signIn.getCreateTime());
+
+        return vo;
+    }
+}
@@ -28,8 +28,6 @@ public class DriverScheduling {
     private String remark;
     @TableField(exist = false)
     private String siteName;
-
-    private Integer alcoholCount;
     /**
      * 不是当前表的属性
      */
@@ -58,4 +56,6 @@ public class DriverScheduling {
     @TableField(exist = false)
     private long minTime;
+    @TableField(value = "alcohol_count")
+    private Integer alcoholCount;
 }
+package com.ruoyi.domain.dss2.driver.dto;
+
+import com.alibaba.fastjson2.JSON;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "查询人员签到")
+@Accessors(chain = true)
+public class DssDetailSignV2DTO {
+    @NotEmpty(message = "工号不能为空")
+    @ApiModelProperty(value = "工号")
+    private String jobCode;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "查询时间,yyyy-MM-dd HH:mm:ss")
+    private Date date;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}
+package com.ruoyi.domain.dss2.driver.dto;
+
+import com.alibaba.fastjson2.JSON;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.domain.dss.sign.dto.DssSignHealthDataDTO;
+import com.ruoyi.domain.dss.sign.dto.DssSignQuestionRecordDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "人员线下签到")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DssSignV2DTO {
+
+    @NotEmpty(message = "司机工号 不能为空")
+    @ApiModelProperty(value = "司机工号", required = true)
+    private String staffCode;
+
+    @NotEmpty(message = "审核人员工号 不能为空")
+    @ApiModelProperty(value = "审核人员工号", required = true)
+    private String auditJobCode;
+
+    @NotNull(message = "时间不能为空")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "时间", required = true)
+    private Date signTime;
+
+
+    @ApiModelProperty(value = "酒测记录值")
+    private Integer testValue;
+
+    @ApiModelProperty(value = "体温度值,null表示不需岗前检测")
+    private BigDecimal temperature;
+
+    @ApiModelProperty(value = "情绪类型")
+    private Integer emotion;
+
+    @ApiModelProperty(value = "问卷渠道")
+    private String channelCode;
+
+    @ApiModelProperty(value = "健康数据有效性; 0:否，1:是")
+    private String healthCheck;
+
+    @ApiModelProperty(value = "健康数据")
+    private DssSignHealthDataDTO healthData;
+
+    @ApiModelProperty(value = "答题记录")
+    private DssSignQuestionRecordDTO questionRecord;
+    @ApiModelProperty(value = "图片内容Base64")
+    private String imageContent;
+
+
+    @Override
+    public String toString() {
+        String imageContent = this.getImageContent();
+        this.setImageContent(null);
+        String str = JSON.toJSONString(this);
+        this.setImageContent(imageContent);
+        return str;
+    }
+}
+package com.ruoyi.domain.dss2.driver.vo;
+
+import com.alibaba.fastjson2.JSON;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "人员签到-详情VO")
+public class DssSignInV2Vo {
+    @ApiModelProperty(value = "ID", example = "1")
+    private Integer id;
+
+    @ApiModelProperty(value = "工号")
+    private String jobCode;
+
+    @ApiModelProperty(value = "签到结果 1 成功 2 异常", example = "1")
+    private Integer status;
+
+    @ApiModelProperty(value = "酒精测试 1 已测试 2 未测试", example = "1")
+    private Integer alcoholFlag;
+
+    @ApiModelProperty(value = "签到签退 1 签到成功 2 签退成功", example = "1")
+    private Integer type;
+
+    @ApiModelProperty(value = "酒精摄入量")
+    private String alcoholIntake;
+
+    @ApiModelProperty(value = "异常类型：0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常,44饮酒", example = "1")
+    private Integer exType;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "签到时间,yyyy-MM-dd HH:mm:ss")
+    private Date signInDate;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}
@@ -168,11 +168,11 @@ public class LinggangScheduling {
         if(Objects.isNull(linggangScheduling)){
             return false;
         }
-        return Objects.equals(this.getScheduleDate(),linggangScheduling.getScheduleDate()) && Objects.equals(this.lineName,linggangScheduling.getLineName())
-                && Objects.equals(this.jobCode,linggangScheduling.getJobCode())  && Objects.equals(this.name,linggangScheduling.getName()) && Objects.equals(this.posts,linggangScheduling.getPosts())
-                && Objects.equals(this.lpName,linggangScheduling.getLpName()) && Objects.equals(this.nbbm,linggangScheduling.getNbbm()) && Objects.equals(this.getBcType(),linggangScheduling.getBcType())
-                && Objects.equals(this.fcsjT,linggangScheduling.getFcsjT()) && Objects.equals(this.zdsjT,linggangScheduling.getZdsjT()) && Objects.equals(this.qdzcode,linggangScheduling.getQdzcode())
-                && Objects.equals(this.zdzcode,linggangScheduling.getZdzcode()) && Objects.equals(this.type,linggangScheduling.getType());
+        return Objects.equals(this.getScheduleDate(),linggangScheduling.getScheduleDate())
+                && Objects.equals(this.jobCode,linggangScheduling.getJobCode())
+                && Objects.equals(this.getBcType(),linggangScheduling.getBcType())
+                && Objects.equals(this.getNbbm(),linggangScheduling.getNbbm())
+                && Objects.equals(this.fcsjT,linggangScheduling.getFcsjT());
     }
     @Override
@@ -2,11 +2,17 @@ package com.ruoyi.in.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.in.domain.CalDriverScheduling;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.domain.SignInV1;
 import java.io.IOException;
+import java.util.Date;
 public interface SignInServiceV1 extends IService<SignInV1> {
     AjaxResult addsignInV1(SignIn signIn) throws IOException;
+
+    AjaxResult addSignInOffice(SignIn signIn);
+
+    CalDriverScheduling findSchedulingByDateTime(String job, Date date,Integer type);
 }
 package com.ruoyi.in.service.impl;
+import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.ConstDriverProperties;
@@ -13,10 +14,12 @@ import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.redispre.GlobalRedisPreName;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.common.utils.uuid.UUID;
 import com.ruoyi.domain.DriverScheduling;
+import com.ruoyi.domain.sign.in.resource.LinggangSignInResource;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.equipment.domain.Equipment;
@@ -32,7 +35,9 @@ import com.ruoyi.scheduling.service.SchedulingServiceV1;
 import com.ruoyi.service.BigViewServiceV1;
 import com.ruoyi.service.SchedulingService;
 import com.ruoyi.service.ThreadJobService;
+import com.ruoyi.service.sign.in.resource.LinggangSignInResourceService;
 import com.ruoyi.utils.ConstDateUtil;
+import com.ruoyi.utils.UploadUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -75,6 +80,10 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
     @Autowired
     private RedisCache redisCache;
+    @Autowired
+    private UploadUtil uploadUtil;
+    @Autowired
+    private LinggangSignInResourceService signInResourceService;
     private static final FastDateFormat HHMM = FastDateFormat.getInstance("HH:mm");
@@ -123,12 +132,74 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
         } else if (Objects.equals(2, signIn.getType())) {
             calDriverScheduling = findSchedulingByDateTime(schedulings, dateTime, ConstDriverProperties.BC_TYPE_IN);
         } else {
+            calDriverScheduling = findSchedulingByDateTime(schedulings, dateTime, ConstDriverProperties.BC_TYPE_OUT);
+
             if (checkAlcoholIntake(signIn.getAlcoholIntake())) {
-                AjaxResult ajaxResult = bigViewServiceV1.getAjaxResultByDriverSignInfo(signIn,signInV1,calDriverScheduling.getDriverScheduling());
+                AjaxResult ajaxResult = bigViewServiceV1.getAjaxResultByDriverSignInfo(signIn, signInV1, calDriverScheduling.getDriverScheduling());
                 if (Objects.nonNull(ajaxResult)) {
                     return ajaxResult;
                 }
             }
+
+        }
+
+        if (Objects.isNull(calDriverScheduling.getDriverScheduling())) {
+            log.info("当天没有满足要求的数据:dateTime:[{}],signIn:[{}],scheduling:[{}]", dateTime, signIn, JSON.toJSONString(scheduling));
+            saveSignOfNoScheduling(signIn, ErrorTypeProperties.WORK_DAY_ERROR);
+            return AjaxResult.success(ErrorTypeProperties.WORK_DAY_ERROR);
+        }
+
+        scheduling = calDriverScheduling.getDriverScheduling();
+        signInV1.setDriverScheduling(calDriverScheduling.getDriverScheduling());
+
+        if (Objects.isNull(scheduling.getSignInId())) {
+            switchAndChooseTime(signIn, scheduling, dateTime);
+            switchAndChooseAlcohol(signIn, driver, scheduling);
+
+        } else {
+            log.info("签到的数据为：[{}]", scheduling);
+            SignInV1 sourceSign = getById(scheduling.getSignInId());
+            if (Objects.nonNull(sourceSign)) {
+                switchAndChooseTime(signIn, scheduling, dateTime);
+                switchAndChooseAlcohol(signIn, driver, scheduling);
+            }
+        }
+
+        signInV1.setSignIn(signIn);
+
+        return saveData(signIn, scheduling, calDriverScheduling, driver, signInV1);
+    }
+
+    @Override
+    public AjaxResult addSignInOffice(SignIn signIn) {
+        SignInV1 signInV1 = new SignInV1();
+        signInV1.setSignIn(signIn);
+
+        // 查询员工信息
+        Driver driver = driverMapper.getDriverInfoByJobCode(signIn.getJobCode());
+        if (Objects.isNull(driver)) {
+            log.info("这个工号的员工不存在:[{}]", signIn);
+            return AjaxResult.warn("这个工号的员工不存在！");
+        }
+        signInV1.setDriver(driver);
+
+        if (Objects.isNull(signIn.getCreateTime())) {
+            signIn.setCreateTime(DateUtils.getNowDate());
+        }
+
+        long dateTime = signIn.getCreateTime().getTime();
+        Date date = DateUtils.shortDate(new Date(dateTime));
+        DriverScheduling scheduling = null;
+        CalDriverScheduling calDriverScheduling = null;
+
+        List<DriverSchedulingV1> schedulings = schedulingServiceV1.queryByJobCodeAndSchedulingDate(signIn.getJobCode(), date);
+        if (CollectionUtils.isEmpty(schedulings)) {
+            saveSignOfNoScheduling(signIn, ErrorTypeProperties.WORK_DAY_ERROR);
+            switchAndChooseAlcohol(signIn, driver, null);
+            return saveData(signIn, null, null, driver, signInV1);
+        } else if (Objects.equals(2, signIn.getType())) {
+            calDriverScheduling = findSchedulingByDateTime(schedulings, dateTime, ConstDriverProperties.BC_TYPE_IN);
+        } else {
             calDriverScheduling = findSchedulingByDateTime(schedulings, dateTime, ConstDriverProperties.BC_TYPE_OUT);
         }
@@ -146,7 +217,7 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
             switchAndChooseAlcohol(signIn, driver, scheduling);
         } else {
-            log.info("签到的数据为：[{}]",scheduling);
+            log.info("签到的数据为：[{}]", scheduling);
             SignInV1 sourceSign = getById(scheduling.getSignInId());
             if (Objects.nonNull(sourceSign)) {
                 switchAndChooseTime(signIn, scheduling, dateTime);
@@ -156,16 +227,62 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
         signInV1.setSignIn(signIn);
+
+
         return saveData(signIn, scheduling, calDriverScheduling, driver, signInV1);
     }
-    private AjaxResult saveData(SignIn signIn, DriverScheduling scheduling, CalDriverScheduling calDriverScheduling, Driver driver, SignInV1 signInV1) {
+    @Override
+    public CalDriverScheduling findSchedulingByDateTime(String job, Date date, Integer type) {
+        long dateTime = date.getTime();
+        List<DriverSchedulingV1> schedulings = schedulingServiceV1.queryByJobCodeAndSchedulingDate(job, date);
+        if (CollectionUtils.isEmpty(schedulings)) {
+            return null;
+        } else if (Objects.equals(2, type)) {
+            return findSchedulingByDateTime(schedulings, dateTime, ConstDriverProperties.BC_TYPE_IN);
+        } else {
+            return findSchedulingByDateTime(schedulings, dateTime, ConstDriverProperties.BC_TYPE_OUT);
+        }
+    }
+    private AjaxResult saveData(SignIn signIn, DriverScheduling scheduling, CalDriverScheduling calDriverScheduling, Driver driver, SignInV1 signInV1) {
+        String videoContent = signIn.getImage();
+        signIn.setImage(null);
         signInMapper.insertSignIn(signIn);
+
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(signIn.getImage())) {
+
+            signIn.setImage(null);
+        }
+        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(".mp4");
+
+            uploadUtil.uploadVideoOfBase64(videoContent, builder.toString());
+
+            LinggangSignInResource signInResource = new LinggangSignInResource();
+            signInResource.setSignId(signIn.getId());
+            signInResource.setResourceType(2);
+            signInResource.setTime(new Date(scheduling.getFcsjT()));
+            signInResource.setCreateTime(new Date());
+            signInResource.setPath(builder.toString());
+            signInResource.setIndex1(4);
+            signInResource.setCreateBy(Convert.toLong(signIn.getCreateBy()));
+            signInResourceService.save(signInResource);
+        }
         signInV1.setId(signInV1.getId());
         // 更新考勤
         if (Objects.nonNull(calDriverScheduling)) {
-            schedulingService.computedSignInBySignIn(scheduling, calDriverScheduling.getIndex(), signIn,true);
+            schedulingService.computedSignInBySignIn(scheduling, calDriverScheduling.getIndex(), signIn, true);
         }
         if (TempCache.checkJobCodeExist(signIn.getJobCode())) {
@@ -264,6 +264,7 @@ public class DriverJob implements InitializingBean {
     public void runScheduling(long timeLong) {
         long timestamp = System.currentTimeMillis();
         Date date = new Date(timeLong);
+//        date = DateUtils.addHours(date,-1);
         String formatDate = DateUtil.YYYY_MM_DD.format(date);
         String timeOut = DateUtil.HH_MM_ss.format(date);
@@ -273,7 +274,8 @@ public class DriverJob implements InitializingBean {
         log.info("开始获取{}的排班数据", formatDate);
         boolean isSameDay = DateUtils.isSameDay(new Date(), date);
-        String url = isSameDay ? GET_SCHEDULING_INFO_URL : getSchedulingInfoPlan;
+        int hour = date.getHours();
+        String url = isSameDay ? hour < 5 ? property.getGetSchedulingInfo() : GET_SCHEDULING_INFO_URL : getSchedulingInfoPlan;
         int type = isSameDay ? 1 : 100;
         LinggangScheduling scheduling = new LinggangScheduling();
@@ -281,24 +283,30 @@ public class DriverJob implements InitializingBean {
         scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
         Set<Long> idSets = null;
+        String key = "Scheduling:timeStr:" + formatDate;
         if (isSameDay) {
-            String key = "Scheduling:timeStr:" + formatDate;
-            long timestampValu = timestamp;
-            if (!redisCache.hasKey(key)) {
-                redisCache.setCacheObject(key, "1", 30, TimeUnit.HOURS);
-                timestampValu = 0;
-            }
+            long timestampValu = DateUtils.addHours(date, -1).getTime();
             scheduling.setType(100);
             List<LinggangScheduling> linggangSchedulings = schedulingService.list(scheduling);
             idSets = linggangSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
-            try {
-                log.info("url:[{}];formatDate:[{}]；timestamp：[{}]", url, formatDate, timestamp);
-                getSchedulingInfoUrl = String.format(url, "77", formatDate, timestampValu, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
+            if (hour < 5) {
+                try {
+                    log.info("url:[{}];formatDate:[{}]；timestamp：[{}]", url, formatDate, timestamp);
+                    getSchedulingInfoUrl = String.format(url, "77", formatDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            } else {
+                try {
+                    timestampValu = 0;
+                    log.info("url:[{}];formatDate:[{}]；timestamp：[{}]", url, formatDate, timestamp);
+                    getSchedulingInfoUrl = String.format(url, "77", formatDate, timestampValu, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            }
         } else {
             try {
                 log.info("url:[{}];formatDate:[{}]；timestamp：[{}]", url, formatDate, timestamp);
@@ -313,7 +321,7 @@ public class DriverJob implements InitializingBean {
         String requestId = JwtAuthenticationTokenFilter.getRequestIdOfMDCValue();
         // 获取排班信息并存入redis
-        saveSchedulingToRedis(getSchedulingInfoUrl, formatDate, timeOut, date, type, idSets, requestId);
+        saveSchedulingToRedis(getSchedulingInfoUrl, formatDate, timeOut, date, type, idSets, requestId, redisCache, key);
         // 删除两天前排班信息
         if (isSameDay) {
             deleteScheduling();
@@ -410,10 +418,10 @@ public class DriverJob implements InitializingBean {
     }
-    public Map<String, List<ResponseSchedulingDto>> saveSchedulingToRedis(String getSchedulingInfoUrl, String dateKey, String timeOut, Date date, int type, Set<Long> idSets, String requestId) {
+    public Map<String, List<ResponseSchedulingDto>> saveSchedulingToRedis(String getSchedulingInfoUrl, String dateKey, String timeOut, Date date, int type, Set<Long> idSets, String requestId, RedisCache redisCache, String redisKey) {
         JwtAuthenticationTokenFilter.putMDC("job", requestId);
         log.info("开始拉取排班:{};[{}]", dateKey, getSchedulingInfoUrl);
-        List<ResponseSchedulingDto> originSchedulingList = schedulingCache.requestScheduling(getSchedulingInfoUrl);
+        List<ResponseSchedulingDto> originSchedulingList = schedulingCache.requestScheduling(getSchedulingInfoUrl, redisCache, redisKey);
         log.info("originSchedulingList:[{}]", JSON.toJSONString(originSchedulingList));
         Map<String, List<ResponseSchedulingDto>> driverSchedulingMap = new HashMap<>(200);
         // 以员工号为key存入排班集合
@@ -7,6 +7,7 @@ import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.domain.SignInV1;
 import com.ruoyi.pojo.vo.bigViewVo.FleetState;
 import com.ruoyi.pojo.vo.bigViewVo.LineInfo;
+import com.ruoyi.scheduling.domain.DriverSchedulingV1;
 import java.util.Date;
@@ -28,7 +29,7 @@ public interface BigViewServiceV1 {
      * @param signIn
      * @return com.ruoyi.common.core.domain.AjaxResult
      */
-    AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn,SignInV1 signInV1,DriverScheduling scheduling);
+    AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn, SignInV1 signInV1, DriverScheduling driverScheduling);
     /***
      *  是否是早签
@@ -50,7 +50,6 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.springframework.web.client.RestTemplate;
 import sun.misc.BASE64Decoder;
@@ -490,7 +489,6 @@ public class ThreadJobService {
      * @param timeOut
      */
     @Async
-    @Transactional(rollbackFor = {Exception.class})
     public synchronized void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, String timeOut, Date date, int type, Set<Long> idSets, String requestId) {
         JwtAuthenticationTokenFilter.putMDC("job", requestId);
 //        //查询当天是否保存过考情表  如果不存在则保存
@@ -619,7 +617,10 @@ public class ThreadJobService {
               if(CollectionUtils.isNotEmpty(schedulings1)){
                   System.out.println("bbbbbbbbbbb");
               }
-                schedulingService.saveBatch(schedulings);
+                for (LinggangScheduling linggangScheduling : schedulings) {
+                    schedulingService.save(linggangScheduling);
+                }
+
             }
         }
         String dateStr1 = DateUtil.YYYY_MM_DD_LINK.format(date);
@@ -13,6 +13,7 @@ import com.ruoyi.in.service.SignInServiceV1;
 import com.ruoyi.pojo.vo.bigViewVo.FleetInfoVo;
 import com.ruoyi.pojo.vo.bigViewVo.FleetState;
 import com.ruoyi.pojo.vo.bigViewVo.LineInfo;
+import com.ruoyi.scheduling.domain.DriverSchedulingV1;
 import com.ruoyi.scheduling.service.SchedulingServiceV1;
 import com.ruoyi.service.BigViewServiceV1;
 import com.ruoyi.template.service.IFleetLineTemplateService;
@@ -92,20 +93,26 @@ public class BigViewServiceV1Impl implements BigViewServiceV1 {
     }
     @Override
-    public AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn,SignInV1 signInV1,DriverScheduling scheduling) {
+    public AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn, SignInV1 signInV1, DriverScheduling driverScheduling) {
         String key = StringUtils.join(REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW, ConstDateUtil.FAST_YYYY_MM_DD.format(new Date()), ":", signIn.getJobCode());
-        String key1 =  StringUtils.join(REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW, ConstDateUtil.FAST_YYYY_MM_DD.format(new Date()), ":", signIn.getJobCode(),":",scheduling.getId());
+        if (Objects.isNull(driverScheduling)) {
+            return null;
+        }
+        String key1 = StringUtils.join(key, ":", driverScheduling.getId());
         // 驾驶员酒精测试连续超标两次则提示换人
+        redisCache.getCacheObject(key);
         Integer count = redisCache.getCacheObject(key1);
+
+        if (Objects.isNull(driverScheduling.getAlcoholCount())) {
+            driverScheduling.setAlcoholCount(2);
+        }
         if (Objects.isNull(count) || count.equals(0)) {
             count = 1;
             redisCache.setCacheObject(key, count, 1, TimeUnit.DAYS);
-            redisCache.setCacheObject(key1, count, 1, TimeUnit.DAYS);
         } else {
             redisCache.setCacheObject(key, ++count, 1, TimeUnit.DAYS);
-            redisCache.setCacheObject(key1, ++count, 1, TimeUnit.DAYS);
         }
-        if (SIGN_IN_ERROR_COUNT.compareTo(count) <= 0) {
+        if (driverScheduling.getAlcoholCount() - count <= 0) {
             return AjaxResult.success(SIGN_IN_ERROR + ": " + (StringUtils.isEmpty(signIn.getRemark()) ? "" : signIn.getRemark()) + "酒精测试不通过" + count + "次请更换车辆驾驶员。", signInV1);
         }
@@ -12,6 +12,7 @@ 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.SpringApplicationUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
@@ -38,8 +39,6 @@ public class FaceServiceImpl implements FaceService {
     @Autowired
     private NewDriverService newDriverService;
     @Autowired
-    private FaceEngine faceEngine;
-    @Autowired
     private BsthSystemConfig bsthSystemConfig;
@@ -126,7 +125,7 @@ public class FaceServiceImpl implements FaceService {
         //特征比对
         FaceSimilar faceSimilar = new FaceSimilar();
-        int errorCode = faceEngine.compareFaceFeature(targetFaceFeature, sourceFaceFeature, faceSimilar);
+        int errorCode = SpringApplicationUtil.getBean(FaceEngine.class).compareFaceFeature(targetFaceFeature, sourceFaceFeature, faceSimilar);
         if (errorCode != ErrorInfo.MOK.getValue()) {
             log.error("人脸对比失败:[{}]", dr);
@@ -137,7 +136,7 @@ public class FaceServiceImpl implements FaceService {
     private FaceFeature generateFaceFeature(NewDriver driver, ImageInfo image) {
         List<FaceInfo> faceInfoList = new ArrayList<>();
-        int errorCode = faceEngine.detectFaces(image.getImageData(), image.getWidth(), image.getHeight(), image.getImageFormat(), faceInfoList);
+        int errorCode = SpringApplicationUtil.getBean(FaceEngine.class).detectFaces(image.getImageData(), image.getWidth(), image.getHeight(), image.getImageFormat(), faceInfoList);
         if (errorCode != ErrorInfo.MOK.getValue()) {
             log.error("人脸对比失败，请检查数据:[{}];错误代码：[{}]", driver, errorCode);
             return null;
@@ -150,7 +149,7 @@ public class FaceServiceImpl implements FaceService {
         }
         FaceFeature faceFeature = new FaceFeature();
-        errorCode = faceEngine.extractFaceFeature(image.getImageData(), image.getWidth(), image.getHeight(), image.getImageFormat(), faceInfoList.get(0), faceFeature);
+        errorCode = SpringApplicationUtil.getBean(FaceEngine.class).extractFaceFeature(image.getImageData(), image.getWidth(), image.getHeight(), image.getImageFormat(), faceInfoList.get(0), faceFeature);
         if (errorCode != ErrorInfo.MOK.getValue()) {
             log.error("提取对比特征失败，请检查数据:[{}];错误代码：[{}]", driver, errorCode);
             return null;
+package com.ruoyi.utils;
+
+import org.springframework.context.ConfigurableApplicationContext;
+
+public class SpringApplicationUtil {
+    private static ConfigurableApplicationContext applicationContext;
+
+    public static void setApplicationContext(ConfigurableApplicationContext app) {
+        SpringApplicationUtil.applicationContext = app;
+    }
+
+    public static  <T> T getBean(Class<T> tClass) {
+        return SpringApplicationUtil.applicationContext.getBean(tClass);
+    }
+}
@@ -165,7 +165,8 @@ api:
         getCompanyInfo:
         # 获取排班信息
         getSchedulingInfo: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
-        getSchedulingInfoNew: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk4modify/%s/%s/%d?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew1: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
         getSchedulingInfoPlan: http://58.34.47.74:9089/webservice/rest/schedule/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
     config:
         password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
@@ -5,7 +5,7 @@
     />
 <!--	<property name="log.path" value="/home/ruoyi/logs" />-->
     <!-- 日志输出格式 -->
-	<property name="log.pattern" value="%d{HH:mm:ss.SSS}[%X{userId}][%X{requestId}][%thread][%logger{20}]-[%method,%line]-%msg%n" />
+	<property name="log.pattern" value="%d{yyyyMMdd HH:mm:ss.SSS}[%X{userId}][%X{requestId}][%thread][%logger{20}]-[%method,%line]-%msg%n" />
 	<!-- 控制台输出 -->
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">