优化签到流程

liujun001
1 parent 772893f3
Showing 10 changed files with 130 additions and 80 deletions
Bsth-admin/src/main/java/com/ruoyi/common/cache/NowSchedulingCache.java
Bsth-admin/src/main/java/com/ruoyi/domain/DriverSchedulingV1.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
Bsth-admin/src/main/java/com/ruoyi/in/domain/CalDriverScheduling.java
Bsth-admin/src/main/java/com/ruoyi/in/domain/SignIn.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/service/SchedulingService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceImpl.java
@@ -3,25 +3,28 @@ package com.ruoyi.common.cache;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapUtil;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.errorScheduling.domain.ErrorJobcode;
 import com.ruoyi.errorScheduling.service.IErrorJobcodeService;
 import com.ruoyi.in.domain.SignIn;
-import com.ruoyi.domain.DriverScheduling;
+import com.ruoyi.service.BigViewServiceV1;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.utils.ConstDateUtil;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 @Component
 public class NowSchedulingCache {
+    @Autowired
+    private BigViewServiceV1 bigViewServiceV1;
+
     private final DriverSchedulingMapper schedulingMapper;
     static Logger log = LoggerFactory.getLogger(SchedulingCache.class);
     /**
@@ -151,17 +154,43 @@ public class NowSchedulingCache {
      * @param index
      * @param signIn
      */
-    public void updateCacheByJobCode(String remark, String key, Integer index, SignIn signIn) {
+    public void updateCacheByJobCode(String remark, String key, Integer index, SignIn signIn,boolean isNew,DriverScheduling sourceScheduling) {
+        if(isNew && Objects.nonNull(sourceScheduling)){
+            if(Objects.isNull(cacheNowDayScheduling.get(key))){
+                return;
+            }
+
+            int size = CollectionUtils.size(cacheNowDayScheduling.get(key).get(signIn.getJobCode()));
+            for (int i = 0; i < size; i++) {
+                if(Objects.equals(cacheNowDayScheduling.get(key).get(signIn.getJobCode()).get(i).getId(),sourceScheduling.getId())){
+                    index = i;
+                    break;
+                }
+            }
+
+            
+            
+
+        }
         if (key.equals(ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(0)))
                 || key.equals(ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1)))) {
             DriverScheduling scheduling = cacheNowDayScheduling.get(key).get(signIn.getJobCode()).get(index);
             scheduling.setSignInId(signIn.getId());
             scheduling.setRemark(remark);
-            scheduling.setExType(signIn.getExType());
+
+            Integer exType = signIn.getExType();
+            if(isNew){
+                exType = bigViewServiceV1.isSignStatusWineEnum(signIn)?3:bigViewServiceV1.isSignStatusDelayEnum(signIn)?1:Objects.equals(2,signIn.getExType())?2:0;
+            }
+            scheduling.setExType(exType);
             scheduling.setSignTime(signIn.getCreateTime());
             scheduling.setSignType(signIn.getType());
             scheduling.setAlcoholFlag(signIn.getAlcoholFlag());
             scheduling.setAlcoholIntake(signIn.getAlcoholIntake());
+
+
+            cacheNowDayScheduling.get(key).get(signIn.getJobCode()).set(index,scheduling);
         }
     }
+
 }
 package com.ruoyi.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 /**
  * @author liujun
  * @date 2024年09月23日 15:36
  */
 @TableName("scheduling")
+@Data
 public class DriverSchedulingV1 extends DriverScheduling {
+    @TableField(exist = false)
+    private Integer index;
 }
@@ -450,10 +450,12 @@ public class DriverServiceImpl implements IDriverService {
                 vo = DriverResponseVo.createDriverResponseVo(recommendation.getTimestamps(), driver, SIGN_IN_OUT_STRING, !alcoholFlag, schedulingFlag, recommendation.getNbbm(), recommendation.getLpName(), recommendation.getLineName());
             }
+
             // 如果驾驶员酒精测试在之前不合格 必须重测
-            if ("驾驶员".equals(driver.getPosts())) {
+            if ("驾驶员".equals(driver.getPosts()) && BC_TYPE_OUT.equals(recommendation.getBcType())) {
                 String key = REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW + ConstDateUtil.formatDate("yyyyMMdd") + ":" + driver.getJobCode();
                 Integer count = redisCache.getCacheObject(key);
+                log.info("key:[{}],count:[{}]",key,count);
                 if (!Objects.isNull(count) && !Objects.isNull(vo)) {
                     vo.setCheckAlcohol(alcoholFlag);
                 }
@@ -12,13 +12,10 @@ import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.in.service.SignInServiceV1;
 import com.ruoyi.pojo.response.SignInResponseVo;
-import com.ruoyi.utils.ConstDateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.RandomUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -26,13 +23,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.Date;
 import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
-import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW;
 /**
  * 签到Controller
@@ -110,36 +101,36 @@ public class SignInController extends BaseController {
     @PostMapping("/newAdd")
     @ApiOperation("新增签到（设备传入）")
     public AjaxResult addSignIn(@ApiParam @RequestBody @Validated SignIn signIn) throws FileUploadException, IOException {
-        String key = MessageFormat.format("sign:assignment:{0}", signIn.getJobCode());
-        if (redisCache.hasKey(key)) {
-            log.info(" sing method  old sign :[{}]", signIn);
-            return signInService.addSignIn(signIn);
-        }
-
-        Integer num = RandomUtils.nextInt(0, 10);
-        if (num < 3) {
-            redisCache.setCacheObject(key, num, 5, TimeUnit.MINUTES);
-            log.info("[{}] sing method 走新的签到方式 :[{}] ", num, signIn);
-            key = StringUtils.join(REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW, ConstDateUtil.FAST_YYYY_MM_DD.format(new Date()), ":", signIn.getJobCode());
-            Integer count = redisCache.getCacheObject(key);
-            try {
+//        String key = MessageFormat.format("sign:assignment:{0}", signIn.getJobCode());
+//        if (redisCache.hasKey(key)) {
+//            log.info(" sing method  old sign :[{}]", signIn);
+//            return signInService.addSignIn(signIn);
+//        }
+//
+//        Integer num = RandomUtils.nextInt(0, 10);
+//        if (num < 3) {
+//            redisCache.setCacheObject(key, num, 5, TimeUnit.MINUTES);
+//            log.info("[{}] sing method 走新的签到方式 :[{}] ", num, signIn);
+//            key = StringUtils.join(REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW, ConstDateUtil.FAST_YYYY_MM_DD.format(new Date()), ":", signIn.getJobCode());
+//            Integer count = redisCache.getCacheObject(key);
+//            try {
                 return signInServiceV1.addsignInV1(signIn);
-            } catch (Exception e) {
-                if (Objects.isNull(count)) {
-                    count = 0;
-                } else {
-                    count = count - 1;
-                }
-                if (redisCache.hasKey(key)) {
-                    redisCache.setCacheObject(key, count, 1, TimeUnit.DAYS);
-                }
-                log.error("[{}] sing method 走新的签到方式，签到失败 :[{}]", num, signIn, e);
-            }
-
-        }
-
-        log.info("[{}] sing method  old sign :[{}]", num, signIn);
-        return signInService.addSignIn(signIn);
+//            } catch (Exception e) {
+//                if (Objects.isNull(count) || count < 1) {
+//                    count = 0;
+//                } else {
+//                    count = count - 1;
+//                }
+//                if (redisCache.hasKey(key)) {
+//                    redisCache.setCacheObject(key, count, 1, TimeUnit.DAYS);
+//                }
+//                log.error("[{}] sing method 走新的签到方式，签到失败 :[{}]", num, signIn, e);
+//            }
+//
+//        }
+
+//        log.info("[{}] sing method  old sign :[{}]", num, signIn);
+//        return signInService.addSignIn(signIn);
     }
 //    /**
 package com.ruoyi.in.domain;
 import com.ruoyi.domain.DriverScheduling;
+import com.ruoyi.domain.DriverSchedulingV1;
 import lombok.Data;
+import java.util.Objects;
+
 /**
  * @author liujun
  * @date 2024年09月23日 11:29
@@ -17,4 +20,9 @@ public class CalDriverScheduling {
         this.index = index;
         this.driverScheduling = driverScheduling;
     }
+
+    public CalDriverScheduling(DriverSchedulingV1 driverScheduling) {
+        this.index = Objects.isNull(driverScheduling) ? null : driverScheduling.getIndex();
+        this.driverScheduling = driverScheduling;
+    }
 }
@@ -92,7 +92,7 @@ public class SignIn extends BaseEntity {
     @Excel(name = "酒精摄入量")
     @ApiModelProperty("酒精摄入量 52.12")
     private BigDecimal alcoholIntake;
-    @Excel(name = "异常类型",readConverterExp = "0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常,200=早签,300=迟到")
+    @Excel(name = "异常类型",readConverterExp = "0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常,20=早签,30=迟到")
     @ApiModelProperty("异常类型")
     private Integer exType;
@@ -155,6 +155,7 @@ public class SignInServiceImpl implements ISignInService {
     }
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult addSignIn(SignIn signIn) throws IOException {
         // 查询员工信息
         Driver driver = driverMapper.getDriverInfoByJobCode(signIn.getJobCode());
@@ -170,16 +171,7 @@ public class SignInServiceImpl implements ISignInService {
         List<DriverScheduling> dto = schedulingService.queryScheduling(signIn.getJobCode(), now);
         handleSignBody(signIn, driver, globalIndex, now, dto);
-
-        if (CollectionUtils.isNotEmpty(dto)) {
-            int size = CollectionUtils.size(dto);
-            if (size > 0 && globalIndex.getIndex() < size) {
-                log.info("签到签退数据为：[{}]", dto.get(globalIndex.getIndex()));
-            }
-        } else {
-            log.info("没有签到或签退的数据");
-        }
-        if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && CollectionUtils.isNotEmpty(dto) && Objects.equals(dto.get(globalIndex.getIndex()).getBcType(), BC_TYPE_OUT)) {
+        if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && CollectionUtils.isNotEmpty(dto) && Objects.nonNull(dto.get(globalIndex.getIndex())) && Objects.equals(dto.get(globalIndex.getIndex()).getBcType(), BC_TYPE_OUT)) {
             AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
             if (!Objects.isNull(result)) {
                 String msg = "签到异常: 请使用手持式酒精测试棒进行酒测";
@@ -191,7 +183,7 @@ public class SignInServiceImpl implements ISignInService {
         uploadImage(signIn, vo);
         signInMapper.insertSignIn(signIn);
         // 更新考勤
-        schedulingService.computedSignInBySignIn(dto, signIn, globalIndex);
+        schedulingService.computedSignInBySignIn(dto, signIn, globalIndex,false,null);
         if (TempCache.checkJobCodeExist(signIn.getJobCode())) {
             TempCache.updateSignStatus(signIn.getJobCode());
@@ -302,7 +294,7 @@ public class SignInServiceImpl implements ISignInService {
         if (CollectionUtil.isNotEmpty(dto)) {
             schedulingMapper.updateRoster(dto.get(globalIndex.getIndex()), signIn.getId(), signIn.getExType(), signIn.getCreateTime(), signIn.getRemark(), signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
             // 更新缓存
-            nowSchedulingCache.updateCacheByJobCode(signIn.getRemark(), ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn);
+            nowSchedulingCache.updateCacheByJobCode(signIn.getRemark(), ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn,false,null);
         }
         // 异常保存到异常异常中
@@ -362,7 +354,7 @@ public class SignInServiceImpl implements ISignInService {
             for (SignInResponseVo sign : value) {
                 GlobalIndex globalIndex = new GlobalIndex();
                 checkSignIn(sign.getCreateTime().getTime(), resultMap.get(sign.getJobCode()), globalIndex, sign, drivers.get(sign.getJobCode()));
-                schedulingService.computedSignInBySignIn(resultMap.get(sign.getJobCode()), sign, globalIndex);
+                schedulingService.computedSignInBySignIn(resultMap.get(sign.getJobCode()), sign, globalIndex,false,null);
             }
         }
     }
@@ -387,9 +379,9 @@ public class SignInServiceImpl implements ISignInService {
         for (SignIn signIn : signInList) {
             handlerExOutData(transformMap.get(signIn.getJobCode()), signIn);
-            schedulingService.computedSignInBySignIn(new ArrayList<>(Arrays.asList(transformMap.get(signIn.getJobCode()))), signIn, new GlobalIndex());
+            schedulingService.computedSignInBySignIn(new ArrayList<>(Arrays.asList(transformMap.get(signIn.getJobCode()))), signIn, new GlobalIndex(),false,null);
 //            // 更新缓存
-            nowSchedulingCache.updateCacheByJobCode(signIn.getRemark(), ConstDateUtil.formatDate(transformMap.get(signIn.getJobCode()).getScheduleDate()), 0, signIn);
+            nowSchedulingCache.updateCacheByJobCode(signIn.getRemark(), ConstDateUtil.formatDate(transformMap.get(signIn.getJobCode()).getScheduleDate()), 0, signIn,false,null);
             signInMapper.updateSignIn(signIn);
         }
@@ -40,13 +40,13 @@ import org.apache.commons.lang3.time.FastDateFormat;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
 import static com.ruoyi.common.ErrorTypeProperties.SIGN_IN_ERROR;
@@ -79,6 +79,7 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
     private static final FastDateFormat HHMM = FastDateFormat.getInstance("HH:mm");
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult addsignInV1(SignIn signIn) throws IOException {
         SignInV1 signInV1 = new SignInV1();
@@ -141,6 +142,7 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
             switchAndChooseAlcohol(signIn, driver, scheduling);
         } else {
+            log.info("签到的数据为：[{}]",scheduling);
             SignInV1 sourceSign = getById(scheduling.getSignInId());
             if (Objects.nonNull(sourceSign)) {
                 switchAndChooseTime(signIn, scheduling, dateTime);
@@ -154,7 +156,7 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
         signInMapper.insertSignIn(signIn);
         // 更新考勤
         if (Objects.nonNull(calDriverScheduling)) {
-            schedulingService.computedSignInBySignIn(scheduling, calDriverScheduling.getIndex(), signIn);
+            schedulingService.computedSignInBySignIn(scheduling, calDriverScheduling.getIndex(), signIn,true);
         }
         if (TempCache.checkJobCodeExist(signIn.getJobCode())) {
@@ -173,7 +175,11 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
         // 酒精测试后续恢复的需要删除异常的酒测缓存
         BeanUtils.copyProperties(signIn, signInV1);
         if (SIGN_IN_SUCCESS.equals(signIn.getStatus())) {
-            String prompt = signIn.getRemark().replace("正常", "");
+            String prompt = "正常";
+            if (org.apache.commons.lang3.StringUtils.isNotEmpty(signIn.getRemark())) {
+                prompt = signIn.getRemark().replace("正常", "");
+            }
+
             if (signIn.getType().equals(SIGN_OUT)) {
                 return AjaxResult.success(SIGN_OUT_SUCCESS_STRING + "," + prompt, signInV1);
             } else {
@@ -207,7 +213,7 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
             Integer extype = Objects.isNull(signIn.getExType()) ? 0 : signIn.getExType();
             if (checkAlcoholIntake(signIn.getAlcoholIntake())) {
                 threadJobService.asyncSendEmail(scheduling, signIn, driver);
-                signIn.setRemark(join(signIn.getRemark(), ErrorTypeProperties.ALCOHOL_SIGN_IN_ERROR, signIn.getAlcoholIntake().toString(), "mg/100ml。"));
+                signIn.setRemark(join(signIn.getRemark(), org.apache.commons.lang3.StringUtils.join(ErrorTypeProperties.ALCOHOL_SIGN_IN_ERROR, signIn.getAlcoholIntake().toString(), "mg/100ml。")));
                 signIn.setExType(extype + ConstSignInConstSignInProperties.SIGN_ALCOHOL_EX_NUM);
                 signIn.setStatus(ConstSignInConstSignInProperties.SIGN_IN_FAIL);
@@ -339,18 +345,21 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
      * @return com.ruoyi.domain.DriverScheduling
      */
     private CalDriverScheduling findSchedulingByDateTime(List<DriverSchedulingV1> schedulings, long dateTime, String type) {
+        int size = CollectionUtils.size(schedulings);
+        for (int i = 0; i < size; i++) {
+            DriverSchedulingV1 s = schedulings.get(i);
+            s.setIndex(i);
-        AtomicInteger atomicInteger = new AtomicInteger(-1);
-        Optional<DriverSchedulingV1> optional = schedulings.stream().map(s -> {
-            atomicInteger.addAndGet(1);
             if (Objects.nonNull(s.getFcsjT()) && org.apache.commons.lang3.StringUtils.equalsAnyIgnoreCase(org.apache.commons.lang3.StringUtils.trim(s.getBcType()), type)) {
                 s.setMinTime(Math.abs(s.getFcsjT() - dateTime));
             } else {
                 s.setMinTime(Long.MAX_VALUE);
             }
-            return s;
-        }).min(Comparator.comparing(DriverScheduling::getMinTime));
-        return new CalDriverScheduling(atomicInteger.get(), optional.orElse(null));
+
+        }
+
+        Optional<DriverSchedulingV1> optional = schedulings.stream().min(Comparator.comparing(DriverScheduling::getMinTime));
+        return new CalDriverScheduling(optional.orElse(null));
     }
     /**
@@ -115,7 +115,7 @@ public class SchedulingService {
      * @param signIn
      * @param globalIndex
      */
-    public void computedSignInBySignIn(List<DriverScheduling> dto, SignIn signIn, GlobalIndex globalIndex) {
+    public void computedSignInBySignIn(List<DriverScheduling> dto, SignIn signIn, GlobalIndex globalIndex, boolean isNew,DriverScheduling sourceScheduling) {
         // 无排班不记录不在考勤表不更新
         if (CollectionUtil.isEmpty(dto)) {
             return;
@@ -126,12 +126,14 @@ public class SchedulingService {
         if (Objects.isNull(dto.get(globalIndex.getIndex()).getSignInId()) || dto.size() == 1) {
             schedulingMapper.updateRoster(dto.get(globalIndex.getIndex()), signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
             // 更新缓存
-            nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn);
+            nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn, isNew,sourceScheduling);
+
         }
         // 之前的无效
         else if (!SIGN_NO_EX_NUM.equals(dto.get(globalIndex.getIndex()).getExType())) {
             schedulingMapper.updateRoster(dto.get(globalIndex.getIndex()), signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
-            nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn);
+            nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn, isNew,sourceScheduling);
+
         }
         // 之前的有效
         else {
@@ -145,7 +147,7 @@ public class SchedulingService {
      *
      * @param signIn
      */
-    public void computedSignInBySignIn(DriverScheduling driverScheduling, int index, SignIn signIn) {
+    public void computedSignInBySignIn(DriverScheduling driverScheduling, int index, SignIn signIn,boolean isNew) {
         // 无排班不记录不在考勤表不更新
         if (Objects.isNull(driverScheduling)) {
             return;
@@ -156,21 +158,21 @@ public class SchedulingService {
         if (Objects.isNull(driverScheduling.getSignInId())) {
             schedulingMapper.updateRoster(driverScheduling, signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
             // 更新缓存
-            nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(driverScheduling.getScheduleDate()), index, signIn);
+            nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(driverScheduling.getScheduleDate()), index, signIn,isNew,driverScheduling);
         }
         // 之前的无效
         else if (!SIGN_NO_EX_NUM.equals(driverScheduling.getExType())) {
             schedulingMapper.updateRoster(driverScheduling, signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
-            nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(driverScheduling.getScheduleDate()), index, signIn);
+            nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(driverScheduling.getScheduleDate()), index, signIn,isNew,driverScheduling);
         }
         // 之前的有效
         else {
-            handlerRecord(driverScheduling, signIn, index);
+            handlerRecord(driverScheduling, signIn, index,isNew);
         }
     }
-    private void handlerRecord(DriverScheduling scheduling, SignIn signIn, Integer index) {
+    private void handlerRecord(DriverScheduling scheduling, SignIn signIn, Integer index,boolean isNew) {
         if (Objects.isNull(scheduling)) {
             return;
         }
@@ -194,7 +196,7 @@ public class SchedulingService {
         String remark = getRemark(scheduling, signIn);
         signInMapper.updateSignIn(signIn);
         schedulingMapper.updateRoster(scheduling, signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
-        nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(scheduling.getScheduleDate()), index, signIn);
+        nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(scheduling.getScheduleDate()), index, signIn,isNew,scheduling);
     }
@@ -233,6 +235,13 @@ public class SchedulingService {
         }
         if (bigViewServiceV1.isSignStatusWineEnum(signIn) && StringUtils.isNotEmpty(signIn.getRemark())) {
+            if(StringUtils.indexOf(scheduling.getRemark(),signIn.getRemark()) > -1){
+                return scheduling.getRemark();
+            }
+
+            if(StringUtils.indexOf(sb.toString(),signIn.getRemark()) > -1){
+                return sb.toString();
+            }
             int index = signIn.getRemark().indexOf(ALCOHOL_SIGN_IN_ERROR);
             if (index != -1) {
                 sb.append("," + signIn.getRemark().substring(index));
@@ -279,7 +288,7 @@ public class SchedulingService {
         String remark = getRemark(dto, signIn, index);
         signInMapper.updateSignIn(signIn);
         schedulingMapper.updateRoster(scheduling, signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
-        nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex() + 1, signIn);
+        nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex() + 1, signIn,false,scheduling);
     }
     private Integer bcTypeTransform(String bcType) {
@@ -460,10 +460,15 @@ public class BigViewServiceImpl implements BigViewService {
         if (DRIVER_STRING.equals(scheduling.getPosts())) {
             LineInfo.PersonInfoVo driverInfoVo = matchMap.get(nbbm).getDriverInfoVo();
             if (!Objects.isNull(driverInfoVo)) {
+
                 // 第二次签到时间未到不记录状态
                 if (time - scheduling.getFcsjT() < 0) {
                     return;
                 }
+
+                if(Objects.isNull(driverInfoVo.getSignStatus()) || Objects.isNull(personInfoVo.getSignStatus())){
+                    return;
+                }
                 //   如有多异常覆盖策略 异常等级排 未签 -》 迟到 -》 酒驾
                 if (driverInfoVo.getSignStatus().compareTo(personInfoVo.getSignStatus()) > 0) {
                     return;