新的打卡日志

liujun001
1 parent 71818d8d
Showing 10 changed files with 167 additions and 100 deletions
Bsth-admin/src/main/java/com/ruoyi/common/cache/NowSchedulingCache.java
Bsth-admin/src/main/java/com/ruoyi/common/cache/SchedulingCache.java
Bsth-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/service/impl/SchedulingServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/service/BigViewServiceV1.java
Bsth-admin/src/main/java/com/ruoyi/service/SchedulingService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceV1Impl.java
Bsth-admin/src/main/resources/mapper/in/SignInMapper.xml
Bsth-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -68,7 +68,7 @@ public class NowSchedulingCache {
      * @param date
      * @return int 0 为刷新成功、1为传入对象值为空或工号为空或传入的DriverScheduling的ID为空
      */
-    public  int refreshDriveScheDulingCacheByDateAndJobCode(DriverScheduling driverScheduling, Date date) {
+    public int refreshDriveScheDulingCacheByDateAndJobCode(DriverScheduling driverScheduling, Date date) {
         if (Objects.isNull(driverScheduling) || Objects.isNull(date) || StringUtils.isEmpty(driverScheduling.getJobCode())
                 || Objects.isNull(driverScheduling.getId())) {
             log.warn("刷新本地打卡缓存信息失败，传入的对象为空。传入的时间：{},传入的数据对象：{}", date, driverScheduling);
@@ -154,33 +154,36 @@ public class NowSchedulingCache {
      * @param index
      * @param 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))){
+    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())){
+                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)))) {
+            if (Objects.isNull(cacheNowDayScheduling.get(key)) || Objects.isNull(cacheNowDayScheduling.get(key).get(signIn.getJobCode()))) {
+                return;
+            }
+            int size = CollectionUtils.size(cacheNowDayScheduling.get(key).get(signIn.getJobCode()));
+            if (size <= index) {
+                return;
+            }
             DriverScheduling scheduling = cacheNowDayScheduling.get(key).get(signIn.getJobCode()).get(index);
             scheduling.setSignInId(signIn.getId());
             scheduling.setRemark(remark);
             Integer exType = signIn.getExType();
-            if(isNew){
-                exType = bigViewServiceV1.isSignStatusWineEnum(signIn)?3:bigViewServiceV1.isSignStatusDelayEnum(signIn)?1:Objects.equals(2,signIn.getExType())?2:0;
+            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());
@@ -189,7 +192,7 @@ public class NowSchedulingCache {
             scheduling.setAlcoholIntake(signIn.getAlcoholIntake());
-            cacheNowDayScheduling.get(key).get(signIn.getJobCode()).set(index,scheduling);
+            cacheNowDayScheduling.get(key).get(signIn.getJobCode()).set(index, scheduling);
         }
     }
@@ -36,7 +36,7 @@ public class SchedulingCache {
     public SchedulingCache(SchedulerProperty property) {
         log.info("项目启动加载中获取实时班次并存入缓存-----");
-        schedulingInit(property);
+//        schedulingInit(property);
     }
@@ -7,18 +7,15 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.file.FileUploadException;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 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.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,37 @@ 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 < 6) {
-            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 < 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);
+//        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 < 6) {
+//            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 < 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);
+        return signInServiceV1.addsignInV1(signIn);
     }
 //    /**
@@ -27,6 +27,7 @@ import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.domain.SignInV1;
 import com.ruoyi.in.mapper.SignInMapper;
 import com.ruoyi.in.mapper.SignInMapperV1;
+import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.in.service.SignInServiceV1;
 import com.ruoyi.scheduling.service.SchedulingServiceV1;
 import com.ruoyi.service.BigViewServiceV1;
@@ -75,6 +76,8 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
     @Autowired
     private RedisCache redisCache;
+    @Autowired
+    private ISignInService signInService;
     private static final FastDateFormat HHMM = FastDateFormat.getInstance("HH:mm");
@@ -142,7 +145,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);
@@ -153,10 +156,11 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
     }
     private AjaxResult saveData(SignIn signIn, DriverScheduling scheduling, CalDriverScheduling calDriverScheduling, Driver driver, SignInV1 signInV1) {
+
         signInMapper.insertSignIn(signIn);
         // 更新考勤
         if (Objects.nonNull(calDriverScheduling)) {
-            schedulingService.computedSignInBySignIn(scheduling, calDriverScheduling.getIndex(), signIn,true);
+            schedulingService.computedSignInBySignIn(scheduling, calDriverScheduling.getIndex(), signIn, true, signInService);
         }
         if (TempCache.checkJobCodeExist(signIn.getJobCode())) {
@@ -256,16 +260,27 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
             String fcsjHHMM = HHMM.format(zdsj);
             String dzsjHHMM = HHMM.format(date1);
+            Calendar calendar = new GregorianCalendar();
+            calendar.setTime(org.apache.commons.lang3.time.DateUtils.addMinutes(zdsj, 1));
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
+
+            Date date = Math.abs(calendar.getTime().getTime()-dateTime)>Math.abs(zdsj.getTime()-dateTime)?zdsj:calendar.getTime();
+
             String remark = org.apache.commons.lang3.StringUtils.join(ErrorTypeProperties.SIGN_OUT_TIMEOUT, "请在", fcsjHHMM, "到", dzsjHHMM, "之间打卡");
-            return switchAndChooseTime(signIn, dateTime, zdsj, 80, remark);
+            return switchAndChooseTime(signIn, dateTime, date, 80, remark);
         } else {
             Date fcsj = new Date(scheduling.getFcsjT());
             String fcsjHHMM = HHMM.format(org.apache.commons.lang3.time.DateUtils.addMinutes(fcsj, -60));
             String dzsjHHMM = HHMM.format(fcsj);
+            Calendar calendar = new GregorianCalendar();
+            calendar.setTime(org.apache.commons.lang3.time.DateUtils.addMinutes(fcsj, 1));
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
             String remark = org.apache.commons.lang3.StringUtils.join(ErrorTypeProperties.SIGN_IN_TIMEOUT, "请在", fcsjHHMM, "到", dzsjHHMM, "之间打卡");
-            return switchAndChooseTime(signIn, dateTime, fcsj, -60, remark);
+            return switchAndChooseTime(signIn, dateTime, calendar.getTime(), -60, remark);
         }
     }
@@ -346,19 +361,26 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
      */
     private CalDriverScheduling findSchedulingByDateTime(List<DriverSchedulingV1> schedulings, long dateTime, String type) {
         int size = CollectionUtils.size(schedulings);
+        Set<Long> values = new LinkedHashSet<>();
         for (int i = 0; i < size; i++) {
             DriverSchedulingV1 s = schedulings.get(i);
             s.setIndex(i);
             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));
+                values.add(s.getMinTime());
             } else {
                 s.setMinTime(Long.MAX_VALUE);
             }
         }
+//        Optional<DriverSchedulingV1> optional = schedulings.stream().filter(s -> Objects.isNull(s.getSignInId())).min(Comparator.comparing(DriverScheduling::getMinTime));
+//        if (optional.isPresent()) {
+//            return new CalDriverScheduling(optional.get());
+//        }
+        Optional<DriverSchedulingV1> optional = schedulings.stream().filter(s -> org.apache.commons.lang3.StringUtils.equalsAnyIgnoreCase(type, s.getBcType())).min(Comparator.comparing(DriverScheduling::getMinTime));
+
-        Optional<DriverSchedulingV1> optional = schedulings.stream().min(Comparator.comparing(DriverScheduling::getMinTime));
         return new CalDriverScheduling(optional.orElse(null));
     }
@@ -2,11 +2,14 @@ package com.ruoyi.scheduling.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.domain.DriverSchedulingV1;
 import com.ruoyi.scheduling.mapper.SchedulingMapperV1;
 import com.ruoyi.scheduling.service.SchedulingServiceV1;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
@@ -15,9 +18,25 @@ public class SchedulingServiceV1Impl extends ServiceImpl&lt;SchedulingMapperV1, Dri
     @Override
     public List<DriverSchedulingV1> queryByJobCodeAndSchedulingDate(String jobCode, Date date) {
+        String dateStr = DateUtils.FAST_YYYY_MM_DD.format(org.apache.commons.lang3.time.DateUtils.addDays(date, 1));
+        dateStr = StringUtils.join(dateStr, " 06:30:30");
         LambdaQueryWrapper<DriverSchedulingV1> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(DriverSchedulingV1::getJobCode, jobCode).eq(DriverSchedulingV1::getScheduleDate, date);
-        wrapper.orderByAsc(DriverSchedulingV1::getFcsjT);
+        try {
+            Date date1 = DateUtils.FAST_YYYY_MM_DDHHMMSS.parse(dateStr);
+
+//            dateStr = DateUtils.FAST_YYYY_MM_DD.format(org.apache.commons.lang3.time.DateUtils.addDays(date, -1));
+            dateStr = DateUtils.FAST_YYYY_MM_DD.format(date);
+            dateStr = StringUtils.join(dateStr, " 00:00:00");
+            Date date2 = DateUtils.FAST_YYYY_MM_DDHHMMSS.parse(dateStr);
+
+            wrapper.eq(DriverSchedulingV1::getJobCode, jobCode);
+            wrapper.and(wr -> {
+                wr.eq(DriverSchedulingV1::getScheduleDate, date).or().between(DriverSchedulingV1::getFcsjT, date2.getTime(), date1.getTime());
+            });
+            wrapper.orderByAsc(DriverSchedulingV1::getFcsjT);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
         return list(wrapper);
     }
@@ -25,7 +44,7 @@ public class SchedulingServiceV1Impl extends ServiceImpl&lt;SchedulingMapperV1, Dri
     public List<DriverSchedulingV1> queryByNbbmAndDate(String nbbm, Date date) {
         LambdaQueryWrapper<DriverSchedulingV1> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(DriverSchedulingV1::getNbbm, nbbm).eq(DriverSchedulingV1::getScheduleDate, date);
-      
+
         return list(wrapper);
     }
 }
@@ -11,7 +11,7 @@ import java.util.Date;
 public interface BigViewServiceV1 {
-    void asyncRefreshRedisValue(SignIn signIn, Driver driver, DriverScheduling driverScheduling,String dateStr, Date date) throws InterruptedException;
+    void asyncRefreshRedisValue(SignIn signIn, Driver driver, DriverScheduling driverScheduling, String dateStr, Date date) throws InterruptedException;
     AjaxResult queryBigViewQueryLineInfo(Date date);
@@ -30,6 +30,13 @@ public interface BigViewServiceV1 {
     AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn);
     /***
+     * 是否正常
+     * @param signIn
+     * @return
+     */
+    boolean isNormal(SignIn signIn);
+
+    /***
      *  是否是早签
      * @author liujun
      * @date 2024/9/25 14:51
@@ -69,6 +76,7 @@ public interface BigViewServiceV1 {
      * @return boolean
      */
     boolean isSignStatusZoneEnum(SignIn signIn);
+
     /***
      *  是否是驾驶员
      * @author liujun
@@ -7,6 +7,7 @@ import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.mapper.SignInMapper;
+import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.in.service.impl.SignInServiceImpl;
 import com.ruoyi.pojo.DriverSignInRecommendation;
 import com.ruoyi.pojo.GlobalIndex;
@@ -115,7 +116,7 @@ public class SchedulingService {
      * @param signIn
      * @param globalIndex
      */
-    public void computedSignInBySignIn(List<DriverScheduling> dto, SignIn signIn, GlobalIndex globalIndex, boolean isNew,DriverScheduling sourceScheduling) {
+    public void computedSignInBySignIn(List<DriverScheduling> dto, SignIn signIn, GlobalIndex globalIndex, boolean isNew, DriverScheduling sourceScheduling) {
         // 无排班不记录不在考勤表不更新
         if (CollectionUtil.isEmpty(dto)) {
             return;
@@ -126,13 +127,13 @@ 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, isNew,sourceScheduling);
+            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, isNew,sourceScheduling);
+            nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn, isNew, sourceScheduling);
         }
         // 之前的有效
@@ -147,7 +148,7 @@ public class SchedulingService {
      *
      * @param signIn
      */
-    public void computedSignInBySignIn(DriverScheduling driverScheduling, int index, SignIn signIn,boolean isNew) {
+    public void computedSignInBySignIn(DriverScheduling driverScheduling, int index, SignIn signIn, boolean isNew, ISignInService signInService) {
         // 无排班不记录不在考勤表不更新
         if (Objects.isNull(driverScheduling)) {
             return;
@@ -156,23 +157,42 @@ 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,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,isNew,driverScheduling);
-        }
-        // 之前的有效
-        else {
-            handlerRecord(driverScheduling, signIn, index,isNew);
+            changeScheduling(driverScheduling,signIn,remark,index,isNew);
+        }else{
+            SignIn sourceSign = signInService.selectSignInById(driverScheduling.getSignInId());
+            if(Objects.isNull(sourceSign)){
+                changeScheduling(driverScheduling,signIn,remark,index,isNew);
+            }else if(bigViewServiceV1.isEarly(sourceSign) && bigViewServiceV1.isNormal(signIn)){
+                //第一次是早签，第二次正常签到，覆盖原来的数据。
+                changeScheduling(driverScheduling,signIn,remark,index,isNew);
+            }else if(bigViewServiceV1.isNormal(sourceSign)  && bigViewServiceV1.isSignStatusWineEnum(signIn)){
+                //第一次正常签到，第二次酒驾，覆盖原来的数据。
+                changeScheduling(driverScheduling,signIn,remark,index,isNew);
+            }else if(!bigViewServiceV1.isEarly(sourceSign) && !bigViewServiceV1.isSignStatusDelayEnum(sourceSign) &&
+                    !bigViewServiceV1.isSignStatusWineEnum(sourceSign) && bigViewServiceV1.isSignStatusWineEnum(signIn)){
+                //第一次正常签到，第二次酒驾，覆盖原来的数据。
+                changeScheduling(driverScheduling,signIn,remark,index,isNew);
+            }else if(!bigViewServiceV1.isEarly(sourceSign) && !bigViewServiceV1.isSignStatusDelayEnum(sourceSign) &&
+                    bigViewServiceV1.isSignStatusWineEnum(sourceSign) && bigViewServiceV1.isNormal(signIn)){
+                //第一次在签到时间范围内签到且酒驾，第二次正常，覆盖原来的数据。
+                changeScheduling(driverScheduling,signIn,remark,index,isNew);
+            }else if(bigViewServiceV1.isSignStatusDelayEnum(sourceSign) &&  bigViewServiceV1.isSignStatusWineEnum(sourceSign) ){
+                //第一次迟到签到且酒驾，第二次测试覆盖原来的数据。
+                changeScheduling(driverScheduling,signIn,remark,index,isNew);
+            }else{
+                handlerRecord(driverScheduling, signIn, index, isNew);
+            }
         }
     }
-    private void handlerRecord(DriverScheduling scheduling, SignIn signIn, Integer index,boolean isNew) {
+    private void changeScheduling(DriverScheduling driverScheduling,SignIn signIn,String remark,Integer index,boolean isNew){
+        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, isNew, driverScheduling);
+    }
+
+    private void handlerRecord(DriverScheduling scheduling, SignIn signIn, int index, boolean isNew) {
         if (Objects.isNull(scheduling)) {
             return;
         }
@@ -193,10 +213,10 @@ public class SchedulingService {
         }
-        String remark = getRemark(scheduling, signIn);
+//        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,isNew,scheduling);
+       // 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, isNew, scheduling);
     }
@@ -221,7 +241,7 @@ public class SchedulingService {
                 sb.append("," + signIn.getRemark().substring(index));
             }
         }
-        return sb.toString();
+        return StringUtils.isEmpty(sb.toString()) ? "正常" : sb.toString();
     }
     private String getRemark(DriverScheduling scheduling, SignIn signIn) {
@@ -230,16 +250,15 @@ public class SchedulingService {
             sb.append(EARLY);
         } else if (bigViewServiceV1.isSignStatusDelayEnum(signIn)) {
             sb.append(SIGN_STATUS_DELAY_ENUM.getDescription(scheduling.getBcType()));
-        } else {
+        } else if (StringUtils.isNotEmpty(signIn.getRemark())) {
             sb.append(signIn.getRemark());
         }
-
         if (bigViewServiceV1.isSignStatusWineEnum(signIn) && StringUtils.isNotEmpty(signIn.getRemark())) {
-            if(StringUtils.indexOf(scheduling.getRemark(),signIn.getRemark()) > -1){
+            if (StringUtils.indexOf(scheduling.getRemark(), signIn.getRemark()) > -1) {
                 return scheduling.getRemark();
             }
-            if(StringUtils.indexOf(sb.toString(),signIn.getRemark()) > -1){
+            if (StringUtils.indexOf(sb.toString(), signIn.getRemark()) > -1) {
                 return sb.toString();
             }
             int index = signIn.getRemark().indexOf(ALCOHOL_SIGN_IN_ERROR);
@@ -247,7 +266,7 @@ public class SchedulingService {
                 sb.append("," + signIn.getRemark().substring(index));
             }
         }
-        return sb.toString();
+        return StringUtils.isEmpty(sb.toString()) ? "正常" : sb.toString();
     }
@@ -288,7 +307,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,false,scheduling);
+        nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex() + 1, signIn, false, scheduling);
     }
     private Integer bcTypeTransform(String bcType) {
@@ -186,6 +186,11 @@ public class BigViewServiceV1Impl implements BigViewServiceV1 {
         return null;
     }
+    @Override
+    public boolean isNormal(SignIn signIn) {
+        return Objects.nonNull(signIn) && Objects.equals(signIn.getExType(), 0);
+    }
+
     @Override
     public boolean isEarly(SignIn signIn) {
@@ -195,7 +200,7 @@ public class BigViewServiceV1Impl implements BigViewServiceV1 {
     @Override
     public boolean isSignStatusWineEnum(SignIn signIn) {
-        return Objects.nonNull(signIn) && (Objects.equals(3, signIn.getExType()) || Objects.equals(23, signIn.getExType()) || Objects.equals(33, signIn.getExType()));
+        return Objects.nonNull(signIn) && Objects.nonNull(signIn.getExType()) && signIn.getExType() % 10 == 3;
     }
@@ -206,7 +211,7 @@ public class BigViewServiceV1Impl implements BigViewServiceV1 {
     @Override
     public boolean isSignStatusZoneEnum(SignIn signIn) {
-        return Objects.nonNull(signIn) && Objects.equals(0, signIn.getExType());
+        return !isSignStatusWineEnum(signIn);
     }
     @Override
@@ -36,6 +36,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="alcoholIntake" column="alcohol_intake"/>
         <result property="remark" column="remark"/>
+        <result property="exType" column="ex_type"/>
     </resultMap>
     <sql id="selectSignInVo">
@@ -52,7 +53,8 @@
                type,
                update_time,
                alcohol_intake,
-               remark
+               remark,
+               ex_type
         from sign_in
     </sql>
 package com.ruoyi.common.utils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
+
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.*;
 import java.util.Date;
 import java.util.Objects;
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.apache.commons.lang3.time.FastDateFormat;
-
 /**
  * 时间工具类
  *
@@ -36,7 +32,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
-    public static FastDateFormat FAST_YYYY_MM_DD = FastDateFormat.getInstance("yyyy-MM-DD");
+    public static FastDateFormat FAST_YYYY_MM_DD = FastDateFormat.getInstance("yyyy-MM-dd");
+    public static FastDateFormat FAST_YYYY_MM_DDHHMMSS = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss");
     /**
      * 获取当前Date型日期