同步数据

liujun001
1 parent 21ecea2e
Showing 7 changed files with 21 additions and 8 deletions
Bsth-admin/sql/DDL.sql
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/domain/DriverScheduling.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/LinggangKeyWorkLocation.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/service/BigViewServiceV1.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceV1Impl.java
+ALTER TABLE key_work_location ADD type1 INT NULL COMMENT '状态：1 是归还；0是借出;2是初始状态';
+
+
+ALTER TABLE scheduling ADD alcohol_count INT DEFAULT 2 NULL COMMENT '酒测次数';
 \ No newline at end of file
@@ -285,7 +285,7 @@ public class KeyBoxController extends BaseController {
 //            return ResponseResult.error404();
 //        }
-        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos);
+        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos,0);
         ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.TAKE_OUT);
         if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
@@ -335,7 +335,7 @@ public class KeyBoxController extends BaseController {
         }
-        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos);
+        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos,1);
 //        List<LinggangKeyWorkLocation> errorLocations = locations.stream().filter(l -> Objects.isNull(l.getKeyInfoId())).collect(Collectors.toList());
 //        locations = locations.stream().filter(l -> Objects.nonNull(l.getKeyInfoId())).collect(Collectors.toList());
         ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.REPAY);
@@ -756,7 +756,7 @@ public class KeyBoxController extends BaseController {
         return vo;
     }
-    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto, List<LinggangKeyWorkLocation> schedulings, NewDriver driver, List<KeyInfo> keyInfos) {
+    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto, List<LinggangKeyWorkLocation> schedulings, NewDriver driver, List<KeyInfo> keyInfos,int ty) {
         if (CollectionUtils.isEmpty(dto.getKeyItem())) {
             return Collections.emptyList();
         }
@@ -770,6 +770,7 @@ public class KeyBoxController extends BaseController {
             location.setType(item.getState());
             location.setPlate(item.getPlate());
             location.setTime(dto.getTime());
+            location.setType1(ty);
             if (CollectionUtils.isNotEmpty(schedulings)) {
                 Optional<LinggangKeyWorkLocation> opt = schedulings.stream().filter(s -> Objects.equals(item.getKey(), s.getCabinetNo())).findFirst();
                 if (opt.isPresent()) {
@@ -28,6 +28,8 @@ public class DriverScheduling {
     private String remark;
     @TableField(exist = false)
     private String siteName;
+
+    private Integer alcoholCount;
     /**
      * 不是当前表的属性
      */
@@ -101,6 +101,8 @@ public class LinggangKeyWorkLocation {
     @Excel(name = "状态：1 是归还；0是借出;2是初始状态")
     private java.lang.Integer type;
+    private Integer type1;
+
     @TableField(exist = false)
     private Long scheduleDateTimeDiff;
@@ -128,7 +130,8 @@ public class LinggangKeyWorkLocation {
         }
         return Objects.equals(this.yardId, location.getYardId()) && Objects.equals(this.device, location.getDevice()) && Objects.equals(this.keyInfoId, location.getKeyInfoId())
-                && Objects.equals(this.scheduleDate, location.getScheduleDate()) && Objects.equals(this.schedulingId, location.getSchedulingId()) && Objects.equals(this.type, location.getType());
+                && Objects.equals(this.scheduleDate, location.getScheduleDate()) && Objects.equals(this.schedulingId, location.getSchedulingId())
+                && Objects.equals(this.type, location.getType()) && Objects.equals(this.type1,location.getType1());
     }
@@ -124,7 +124,7 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
             calDriverScheduling = findSchedulingByDateTime(schedulings, dateTime, ConstDriverProperties.BC_TYPE_IN);
         } else {
             if (checkAlcoholIntake(signIn.getAlcoholIntake())) {
-                AjaxResult ajaxResult = bigViewServiceV1.getAjaxResultByDriverSignInfo(signIn,signInV1);
+                AjaxResult ajaxResult = bigViewServiceV1.getAjaxResultByDriverSignInfo(signIn,signInV1,calDriverScheduling.getDriverScheduling());
                 if (Objects.nonNull(ajaxResult)) {
                     return ajaxResult;
                 }
@@ -28,7 +28,7 @@ public interface BigViewServiceV1 {
      * @param signIn
      * @return com.ruoyi.common.core.domain.AjaxResult
      */
-    AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn,SignInV1 signInV1);
+    AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn,SignInV1 signInV1,DriverScheduling scheduling);
     /***
      *  是否是早签
@@ -92,15 +92,18 @@ public class BigViewServiceV1Impl implements BigViewServiceV1 {
     }
     @Override
-    public AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn,SignInV1 signInV1) {
+    public AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn,SignInV1 signInV1,DriverScheduling scheduling) {
         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());
         // 驾驶员酒精测试连续超标两次则提示换人
-        Integer count = redisCache.getCacheObject(key);
+        Integer count = redisCache.getCacheObject(key1);
         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) {