feat: 修改签退时间范围

guzijian
1 parent 8684c715
Showing 4 changed files with 100 additions and 18 deletions
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/SchedulingService.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/utils/ConstDateUtil.java
@@ -506,7 +506,7 @@ public class SignInServiceImpl implements ISignInService {
     private boolean driverCheckTimeOut(GlobalIndex globalIndex, SignIn signIn, List<DriverScheduling> dto, long now) {
         try {
-            Boolean result = true;
+            boolean result = true;
             DriverSignInRecommendation currentScheduling = schedulingService.computedTheCurrentClosestTimestamp(dto, now, 0);
             LocalDateTime endTime = ConstDateUtil.getLocalDateTimeByLongTime(currentScheduling.getTimestamps());
             LocalDateTime nowTime = ConstDateUtil.getLocalDateTimeByLongTime(now);
@@ -516,49 +516,50 @@ public class SignInServiceImpl implements ISignInService {
                 return handlerExceptionRecord(dto, now, globalIndex, signIn);
             }
             // 不在有效时间范围内，判断当前是否有签到记录  当前应签到还是签退
-            if (!(Math.abs(nowBetween) <= 60)) {
+            if (checkTimerSign(nowBetween, currentScheduling.getBcType())) {
                 // 签到一个逻辑 当前无记录
                 if (currentScheduling.getBcType().equals(BC_TYPE_OUT) && Objects.isNull(currentScheduling.getSignInId())) {
                     DriverSignInRecommendation lastClosestTimestamp = schedulingService.computedTheCurrentClosestTimestamp(dto, now, -1);
                     // 给出签到范围
                     // 上一次无记|签到,type:签退  当前时间小于最近签到时间 -> 超时签退
                     if (nowBetween < -60L && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_OUT) && lastClosestTimestamp.getBcType().equals(BC_TYPE_IN)) {
-                        signIn.setRemark(SIGN_OUT_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(lastClosestTimestamp.getTimestamps())) + "前后一小时内打卡。");
+                        signIn.setRemark(SIGN_OUT_TIMEOUT + getPrompt(lastClosestTimestamp));
                         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 + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
+                        signIn.setRemark(SIGN_IN_TIMEOUT + getPrompt(currentScheduling));
                         globalIndex.setIndex(currentScheduling.getIndex());
                         result = false;
                     }
                     // 当前最近无记录|签到,type:签到|签退  -> 签到超时给上
                     else {
-                        signIn.setRemark(SIGN_IN_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
+                        signIn.setRemark(SIGN_IN_TIMEOUT + getPrompt(currentScheduling));
                         globalIndex.setIndex(currentScheduling.getIndex());
                         result = false;
                     }
                 }
+
                 // 签退一个逻辑 当前无记录
                 if (currentScheduling.getBcType().equals(BC_TYPE_IN) && Objects.isNull(currentScheduling.getSignInId())) {
                     DriverSignInRecommendation lastClosestTimestamp = schedulingService.computedTheCurrentClosestTimestamp(dto, now, -1);
                     // 上一次无记|签退,type:签到  当前时间小于最近签退时间 -> 签到异常
                     if (nowBetween < -60L && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_IN)) {
-                        signIn.setRemark(SIGN_IN_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(lastClosestTimestamp.getTimestamps())) + "前后一小时内打卡。");
+                        signIn.setRemark(SIGN_IN_TIMEOUT + getPrompt(lastClosestTimestamp));
                         globalIndex.setIndex(lastClosestTimestamp.getIndex());
                         result = false;
                     }
                     // 当前无记|签退 ， type：签退|签到  ——> 签退异常
                     else {
-                        signIn.setRemark(SIGN_OUT_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
+                        signIn.setRemark(SIGN_OUT_TIMEOUT + getPrompt(currentScheduling));
                         globalIndex.setIndex(currentScheduling.getIndex());
                         result = false;
                     }
                 }
                 // 签退|签到 当前有记录
                 if (!Objects.isNull(currentScheduling.getSignInId())) {
-                    String prompt = "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。";
+                    String prompt = getPrompt(currentScheduling);
                     signIn.setRemark((currentScheduling.getBcType().equals(BC_TYPE_IN) ? SIGN_OUT_TIMEOUT : SIGN_IN_TIMEOUT) + prompt);
                     globalIndex.setIndex(currentScheduling.getIndex());
                     result = false;
@@ -569,10 +570,36 @@ public class SignInServiceImpl implements ISignInService {
             }
             return result;
         } catch (Exception e) {
+            log.info(e.getMessage());
             return true;
         }
     }
+    private String getPrompt(DriverSignInRecommendation currentScheduling) {
+        if (BC_TYPE_OUT.equals(currentScheduling.getBcType())) {
+            return "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。";
+        } else {
+            // 正两小时 负 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 hours = time.plusHours(-1);
+            return "请在" + ConstDateUtil.formatDate("HH:mm", hours) + "到"
+                    + ConstDateUtil.formatDate("HH:mm", addHours) + "之间打卡";
+        }
+    }
+
+
+
+    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 Boolean handlerExceptionRecord(List<DriverScheduling> dto, long now, GlobalIndex globalIndex, SignIn signIn) {
         DriverSignInRecommendation currentScheduling = schedulingService.computedTheCurrentClosestTimestamp(dto, now, 0);
         LocalDateTime endTime = ConstDateUtil.getLocalDateTimeByLongTime(currentScheduling.getTimestamps());
@@ -142,7 +142,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 (!(Math.abs(nowBetween) <= 60)) {
+        if (checkTimerSign(nowBetween, scheduling.getBcType())) {
             if (nowBetween < -60L) {
                 return "早签";
             } else {
@@ -152,6 +152,17 @@ public class SchedulingService {
         return signIn.getRemark();
     }
+    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;
@@ -163,24 +174,36 @@ public class SchedulingService {
             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);
-        }
+        //   目前有效记录 -》进行修改  变成无效
+//        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 = "请在" + ConstDateUtil.formatDate("HH:mm", new Date(date)) + "前后一小时内打卡。";
+        String prompt = getPrompt(new Date(date), scheduling.getBcType());
         signIn.setRemark((scheduling.getBcType().equals(BC_TYPE_IN) ? SIGN_OUT_TIMEOUT : SIGN_IN_TIMEOUT) + prompt);
         signIn.setRemark(signIn.getRemark().replaceFirst(",$", "。"));
-        // 之前是签到 |  目前无效 -》往后更新
-
+        //   目前无效 -》往后更新
         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);
     }
+    private String getPrompt(Date date, String bcType) {
+        if (BC_TYPE_OUT.equals(bcType)) {
+            return "请在" + ConstDateUtil.formatDate("HH:mm", date) + "前后一小时内打卡。";
+        } else {
+            // 正两小时 负 1小时
+            LocalDateTime time = ConstDateUtil.stringTransformLocalDateTime(ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", date),"yyyy-MM-dd HH:mm:ss");
+            LocalDateTime addHours = time.plusHours(2);
+            LocalDateTime hours = time.plusHours(-1);
+            return "请在" + ConstDateUtil.formatDate("HH:mm", hours) + "到"
+                    + ConstDateUtil.formatDate("HH:mm", addHours) + "之间打卡";
+        }
+    }
+
     public List<ReportViewResponseVo> queryReportTableResponseVo(ReportViewRequestVo requestVo, HttpServletResponse response) {
         // 处理天
         if (requestVo.getExportFlag().equals(NOW)) {
@@ -459,9 +459,28 @@ public class ThreadJobService {
                 bcList.add(scheduling3);
             }
         }
+        // 测试用例
+        bcList.add(getDriverSchedulingTest("2023-09-26 03:20:00","2023-09-26 09:30:00","out"));
+        bcList.add(getDriverSchedulingTest("2023-09-26 03:20:00","2023-09-26 09:30:00","in"));
         return bcList;
     }
+    private DriverScheduling getDriverSchedulingTest(String startTime, String endTime,String bcType) {
+        DriverScheduling scheduling = new DriverScheduling();
+        	scheduling.setJobCode("700001");
+        	scheduling.setName("测试");
+        	scheduling.setPosts("测试");
+        	scheduling.setScheduleDate(new Date());
+        	scheduling.setLineName("");
+        	scheduling.setLpName("");
+        	scheduling.setNbbm("");
+        	scheduling.setFcsjT(ConstDateUtil.parseDate(startTime).getTime());
+        	scheduling.setZdsjT(ConstDateUtil.parseDate(endTime).getTime());
+        	scheduling.setFleetName("");
+        	scheduling.setBcType(bcType);
+        return scheduling;
+    }
+
     private static DriverScheduling getDriverScheduling(RuleAttendanceMain ruleAttendanceMain) {
         DriverScheduling scheduling = new DriverScheduling();
         scheduling.setPosts(ruleAttendanceMain.getPosts());
@@ -10,6 +10,13 @@ import java.util.Date;
 import java.util.List;
 public class ConstDateUtil {
+
+    public static LocalDateTime stringTransformLocalDateTime(String dateString, String pattern){
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        return LocalDateTime.parse(dateString,formatter);
+    }
+
+
     public static String formatDate(String pattern){
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
         return simpleDateFormat.format(new Date());
@@ -28,6 +35,12 @@ public class ConstDateUtil {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
         return simpleDateFormat.format(date);
     }
+
+    public static String formatDate(String pattern,LocalDateTime date){
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        return date.format(formatter);
+    }
+
     public static String formatDate(String pattern,LocalDate date){
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
         return simpleDateFormat.format(date);