fix&feat: 修复超时过滤未到签到时间也显示问题。更改签到规则一小时内变成在计算签到时间一小时以内前，签退变成正1小时负两小时改为计划签退一小时以内。

guzijian
1 parent d3450601
Showing 4 changed files with 49 additions and 94 deletions
Bsth-admin/src/main/java/com/ruoyi/common/cache/NowSchedulingCache.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/SchedulingService.java
@@ -102,16 +102,18 @@ public class NowSchedulingCache {
     /**
      * 更新缓存
+     *
+     * @param remark
      * @param key
      * @param index
      * @param signIn
      */
-    public void updateCacheByJobCode(String key, Integer index, SignIn signIn) {
+    public void updateCacheByJobCode(String remark, String key, Integer index, SignIn signIn) {
         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(signIn.getRemark());
+            scheduling.setRemark(remark);
             scheduling.setExType(signIn.getExType());
             scheduling.setSignTime(signIn.getCreateTime());
             scheduling.setSignType(signIn.getType());
@@ -164,7 +164,7 @@ public class DriverServiceImpl implements IDriverService {
         LocalDateTime nowTime = ConstDateUtil.getLocalDateTimeByLongTime(now);
         LocalDateTime signTime = ConstDateUtil.getLocalDateTimeByLongTime(timeMap.get(index).getTimestamps());
         long range = ChronoUnit.MINUTES.between(signTime, nowTime);
-        // 如果当前记录靠近签退，但是未到签退小于合法范围 上一次记录未签到，则返回签到记录
+        // 如果当前记录靠近签退，但是未到签退小于有效范围 上一次记录未签到，则返回签到记录
         if (dto.size() > 1
                 && BC_TYPE_IN.equals(timeMap.get(index).getBcType())
                 && range < -60L
@@ -174,20 +174,26 @@ public class DriverServiceImpl implements IDriverService {
             index = index - 1;
         }
-        // 如果当前记录是异常的记录且还在目前还在签到范围内
+        // 如果当前记录是异常的记录且还在目前还在打卡范围内
         if (!Objects.isNull(timeMap.get(index).getSignInId()) && dto.size() > 1) {
             LocalDateTime endTime = ConstDateUtil.getLocalDateTimeByLongTime(timeMap.get(index).getTimestamps());
             long nowBetween = ChronoUnit.MINUTES.between(endTime, nowTime);
-            // 如果当前有效范围内签
-            if ((Math.abs(nowBetween) <= 60)) {
-                return timeMap.get(index);
-            } else if (nowBetween > 60L) {
+            // 如果当前不在有效范围内签
+            if (nowBetween > 60L) {
                 index = index < timeMap.size() - 1 ? index + 1 : index;
             }
         }
         return timeMap.get(index);
     }
+    /**
+     * 比较当前时间戳 推荐签到操作
+     *
+     * @param dto
+     * @param now
+     * @param timeMap
+     * @return
+     */
     private static Integer handleSchedulingMap(List<DriverScheduling> dto, Long now, Map<Integer, DriverSignInRecommendation> timeMap) {
         Integer index = 0;
         for (int i = 0; i < dto.size(); i++) {
@@ -374,7 +380,7 @@ public class DriverServiceImpl implements IDriverService {
         for (Driver item : drivers) {
             dto = schedulingService.queryScheduling(item.getJobCode(), now);
             DriverResponseVo vo = handlerRecommendation(item, now, dto, schedulingFlag, alcoholFlag);
-            // 针对指定用户操作
+            // TODO 针对指定用户操作
             if (item.getJobCode().equals("722717") || item.getJobCode().equals("700001")) {
                 if (!CollectionUtil.isEmpty(dto) && vo.getPlanAction().equals(SIGN_IN_STRING)) {
                     vos.add(DriverResponseVo.createDriverResponseVo(null, item, SIGN_IN_STRING, needCheckAlcoholDevice, true, "测试", "测试", "测试"));
@@ -383,6 +389,7 @@ public class DriverServiceImpl implements IDriverService {
                 } else {
                     vos.add(DriverResponseVo.createDriverResponseVo(null, item, SIGN_IN_STRING, needCheckAlcoholDevice, true, "测试", "测试", "测试"));
                 }
+                // 上面可删除
             } else {
                 // 无排班 工种是驾驶员需要酒测
                 if (Objects.isNull(vo)) {
@@ -276,7 +276,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(ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn);
+            nowSchedulingCache.updateCacheByJobCode(signIn.getRemark(), ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn);
         }
         // 异常保存到异常异常中
@@ -353,7 +353,7 @@ public class SignInServiceImpl implements ISignInService {
             schedulingService.computedSignInBySignIn(new ArrayList<>(Arrays.asList(transformMap.get(signIn.getJobCode()))), signIn, new GlobalIndex());
 //            // 更新缓存
-            nowSchedulingCache.updateCacheByJobCode(ConstDateUtil.formatDate(transformMap.get(signIn.getJobCode()).getScheduleDate()), 0, signIn);
+            nowSchedulingCache.updateCacheByJobCode(signIn.getRemark(), ConstDateUtil.formatDate(transformMap.get(signIn.getJobCode()).getScheduleDate()), 0, signIn);
             signInMapper.updateSignIn(signIn);
         }
@@ -484,7 +484,7 @@ public class SignInServiceImpl implements ISignInService {
                 break;
         }
-        // 超时校验司售人员
+        // 超时校验
         if (result) {
             result = checkTimeOut(globalIndex, signIn, dto, posts, now);
             if (!result) {
@@ -517,7 +517,7 @@ public class SignInServiceImpl implements ISignInService {
     }
     private boolean checkTimeOut(GlobalIndex globalIndex, SignIn signIn, List<DriverScheduling> dto, String posts, long now) {
-        // 司售人员拿发车时间和到站时间作为开始上班的时间
+        // 发车时间和到站时间作为开始上班的时间
         return driverCheckTimeOut(globalIndex, signIn, dto, now);
     }
@@ -544,14 +544,8 @@ public class SignInServiceImpl implements ISignInService {
                         globalIndex.setIndex(lastClosestTimestamp.getIndex());
                         result = false;
                     }
-                    // 上一次无记无|签到,type:签退  当前时间小于最近签到时间 -> 超时签退
-                    else if (nowBetween < -60L && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_OUT) && lastClosestTimestamp.getIndex().equals(currentScheduling.getIndex())) {
-                        signIn.setRemark(SIGN_IN_TIMEOUT + getPrompt(currentScheduling));
-                        globalIndex.setIndex(currentScheduling.getIndex());
-                        result = false;
-                    }
-                    // 当前最近无记录|签到,type:签到|签退  -> 签到超时给上
-                    else {
+                    // 上一次无记无|签到,type:签退  当前时间小于最近签到时间 -> 早签 或者 超时
+                    else  {
                         signIn.setRemark(SIGN_IN_TIMEOUT + getPrompt(currentScheduling));
                         globalIndex.setIndex(currentScheduling.getIndex());
                         result = false;
@@ -592,7 +586,9 @@ public class SignInServiceImpl implements ISignInService {
                     }
                     result = false;
                 }
-            } else {
+            }
+            // 有效直接保存记录
+            else {
                 globalIndex.setIndex(currentScheduling.getIndex());
                 result = true;
             }
@@ -604,7 +600,8 @@ public class SignInServiceImpl implements ISignInService {
     }
     private boolean handleTimeOut(String bcType, long nowBetween, GlobalIndex globalIndex, DriverSignInRecommendation currentScheduling) {
-        if (BC_TYPE_OUT.equals(bcType) && nowBetween > 60L || BC_TYPE_IN.equals(bcType) && nowBetween <= 120L) {
+        if ((BC_TYPE_OUT.equals(bcType) && nowBetween > 0 )
+                ||( BC_TYPE_IN.equals(bcType) && nowBetween <= 60L)) {
             return true;
         } else {
             return false;
@@ -613,11 +610,11 @@ public class SignInServiceImpl implements ISignInService {
     private String getPrompt(DriverSignInRecommendation currentScheduling) {
         if (BC_TYPE_OUT.equals(currentScheduling.getBcType())) {
-            return "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。";
+            return "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前一小时内打卡。";
         } else {
-            // 正两小时 负 1小时
+            // 正1小时 负 1小时
             LocalDateTime time = ConstDateUtil.stringTransformLocalDateTime(ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", new Date(currentScheduling.getTimestamps())), "yyyy-MM-dd HH:mm:ss");
-            LocalDateTime addHours = time.plusHours(2);
+            LocalDateTime addHours = time.plusHours(1);
             LocalDateTime hours = time.plusHours(-1);
             return "请在" + ConstDateUtil.formatDate("HH:mm", hours) + "到"
                     + ConstDateUtil.formatDate("HH:mm", addHours) + "之间打卡";
@@ -625,13 +622,13 @@ public class SignInServiceImpl implements ISignInService {
     }
-    private static boolean checkTimerSign(long nowBetween, String bcType) {
+    public static boolean checkTimerSign(long nowBetween, String bcType) {
         // 如果是签到就是正负一小时内有效
         if (BC_TYPE_OUT.equals(bcType)) {
-            return !(Math.abs(nowBetween) <= 60);
+            return !(nowBetween <= 0L && nowBetween >= -60L);
         } else {
-            // 如果是签退就是负1小时 正两小时有效
-            return !((nowBetween >= 0 && nowBetween <= 120L) || (nowBetween < 0 && nowBetween >= -60L));
+            // 如果是签退就是就是正负一小时内有效
+            return !(Math.abs(nowBetween) <= 60);
         }
     }
@@ -643,7 +640,7 @@ public class SignInServiceImpl implements ISignInService {
         globalIndex.setIndex(0);
         // 单条数据 且不在范围内
         if (BC_TYPE_IN.equals(dto.get(0).getBcType())) {
-            if (!(Math.abs(nowBetween) <= 60)) {
+            if (!(nowBetween < 0L && nowBetween >= -60L)) {
                 signIn.setRemark(SIGN_OUT_TIMEOUT);
                 return false;
             } else {
@@ -6,6 +6,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.mapper.SignInMapper;
+import com.ruoyi.in.service.impl.SignInServiceImpl;
 import com.ruoyi.pojo.DriverSignInRecommendation;
 import com.ruoyi.pojo.GlobalIndex;
 import com.ruoyi.domain.DriverScheduling;
@@ -118,20 +119,18 @@ public class SchedulingService {
         if (CollectionUtil.isEmpty(dto)) {
             return;
         }
-
         String remark = getRemark(dto, signIn, globalIndex.getIndex());
-        signIn.setRemark(remark);
         // 更新最新的签到记录判断是否需要更新考勤
         // 记录为空直接插入记录
         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(ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn);
+            nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn);
         }
         // 之前的无效
         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(ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn);
+            nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn);
         }
         // 之前的有效
         else {
@@ -145,7 +144,7 @@ public class SchedulingService {
         DriverScheduling scheduling = dto.get(globalIndex);
         long date = scheduling.getBcType().equals(BC_TYPE_IN) ? scheduling.getZdsjT() : scheduling.getFcsjT();
         long nowBetween = ChronoUnit.MINUTES.between(ConstDateUtil.getLocalDateTimeByLongTime(date), ConstDateUtil.getLocalDateTimeByLongTime(signIn.getCreateTime().getTime()));
-        if (checkTimerSign(nowBetween, scheduling.getBcType())) {
+        if (SignInServiceImpl.checkTimerSign(nowBetween, scheduling.getBcType())) {
             if (nowBetween < -60L) {
                 sb.append(EARLY);
             } else {
@@ -161,34 +160,19 @@ public class SchedulingService {
         return sb.toString();
     }
-    private static boolean checkTimerSign(long nowBetween, String bcType) {
-        // 如果是签到就是正负一小时内有效
-        if (BC_TYPE_OUT.equals(bcType)) {
-            return !(Math.abs(nowBetween) <= 60);
-        } else {
-            // 如果是签退就是负1小时 正两小时有效
-            return !((nowBetween >= 0 && nowBetween <= 120L) || (nowBetween < 0 && nowBetween >= -60L));
-        }
-    }
     private void handlerRecord(List<DriverScheduling> dto, SignIn signIn, GlobalIndex globalIndex) {
         if (globalIndex.getIndex() == dto.size() - 1) {
             return;
         }
-        long timer = 1000 * 60 * 60;
+        long timer = 1000 * 60 * 3;
         // 有效的在一小时内内重复签到不做修改
         if (signIn.getExType().equals(SIGN_NO_EX_NUM) && (DateUtils.getNowDate().getTime() - dto.get(globalIndex.getIndex()).getSignTime().getTime()) <= timer) {
-            signIn.setRemark("您已经打卡过了，请勿在一小时内重复打卡");
+            signIn.setRemark("您已经打卡过了，请勿在3分钟内重复打卡");
             return;
         }
         int index = globalIndex.getIndex() + 1;
-        //   目前有效记录 -》进行修改  变成无效
-//        if (signIn.getExType().equals(SIGN_NO_EX_NUM)) {
-//            signIn.setStatus(SIGN_IN_FAIL);
-//            signIn.setExType(SIGN_TIME_OUT_EX_NUM);
-//            signInMapper.updateSignIn(signIn);
-//        }
         DriverScheduling scheduling = dto.get(index);
         long date = scheduling.getBcType().equals(BC_TYPE_IN) ? scheduling.getZdsjT() : scheduling.getFcsjT();
         String prompt = getPrompt(new Date(date), scheduling.getBcType());
@@ -197,7 +181,7 @@ public class SchedulingService {
         //   目前无效 -》往后更新
         String remark = getRemark(dto, signIn, index);
         schedulingMapper.updateRoster(scheduling, signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
-        nowSchedulingCache.updateCacheByJobCode(ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex() + 1, signIn);
+        nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex() + 1, signIn);
     }
     private String getPrompt(Date date, String bcType) {
@@ -218,39 +202,9 @@ public class SchedulingService {
         if (requestVo.getExportFlag().equals(NOW)) {
             return getDayReportTableResponseVo(requestVo, response);
         }
-//        // 处理月
-//        else if (requestVo.getExportFlag().equals(MONTH)) {
-//            return getMonthReportTableResponseVo(requestVo, response);
-//        }
-
-        return null;
-    }
-
-    private List<ReportViewResponseVo> getMonthReportTableResponseVo(ReportViewRequestVo requestVo, HttpServletResponse response) {
-        // 获取当月到目前为止的所有数据
-        List<String> dayList = getAllDaysOfTheMonth();
-//        for (String date : dayList) {
-//            getDayReportTableResponseVo(date, response);
-//        }
         return null;
     }
-    private List<String> getAllDaysOfTheMonth() {
-        // 获取当前日期
-        LocalDate currentDate = LocalDate.now();
-
-        // 获取当前月份
-        YearMonth currentMonth = YearMonth.from(currentDate);
-        int nowDay = Integer.parseInt(ConstDateUtil.formatDate("dd"));
-        // 构建日期集合
-        List<String> datesInMonth = new ArrayList<>();
-        for (int day = 1; day <= nowDay; day++) {
-            String date = currentMonth.atDay(day).toString();
-            datesInMonth.add(date);
-        }
-        return datesInMonth;
-    }
-
     private List<ReportViewResponseVo> getDayReportTableResponseVo(ReportViewRequestVo vo, HttpServletResponse response) {
         // 签到数据
@@ -262,7 +216,7 @@ public class SchedulingService {
         Map<String, ReportViewResponseVo> resultMap = new HashMap<>(1200);
         for (String key : orangeMap.keySet()) {
             List<DriverScheduling> list = orangeMap.get(key);
-            // 过滤 vo
+            // 如果有选超时过滤的话过滤
             if (filterReportVoList(vo.getStage(), list)) {
                 continue;
             }
@@ -296,18 +250,13 @@ public class SchedulingService {
         if (list.size() < stage) {
             return true;
         }
-
-        if (Objects.isNull(list.get(stage - 1).getSignTime())) {
-            return false;
-        }
-
         DriverScheduling scheduling = list.get(stage - 1);
         // 获取两个 Date 对象之间的时间差（以毫秒为单位）
-        long timeDifferenceInMillis = scheduling.getSignTime().getTime() - (scheduling.getBcType().equals(BC_TYPE_OUT) ? scheduling.getFcsjT() : scheduling.getZdsjT());
+        long signTime = scheduling.getSignTime() == null ? System.currentTimeMillis() : scheduling.getSignTime().getTime();
+        long timeDifferenceInMillis = signTime - (scheduling.getBcType().equals(BC_TYPE_OUT) ? scheduling.getFcsjT() : scheduling.getZdsjT());
+        long diffTime = 60 * 1000 * 15;
         // 相差十五分钟
-        if (timeDifferenceInMillis > 0 && timeDifferenceInMillis < (60 * 1000 * 15)) {
-            return true;
-        } else if (timeDifferenceInMillis <= 0) {
+        if (timeDifferenceInMillis <= diffTime) {
             return true;
         }
         return false;