feat: 签退时间和签到时间相隔过近打卡逻辑进行补充。

guzijian
1 parent e3af5b24
Showing 4 changed files with 68 additions and 30 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/utils/ToolUtils.java
Bsth-admin/src/main/test/com.ruoyi/TestBsthApplication.java
@@ -626,7 +626,10 @@ 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())) + "前一小时内打卡。";
+            LocalDateTime time = ConstDateUtil.stringTransformLocalDateTime(ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", new Date(currentScheduling.getTimestamps())), "yyyy-MM-dd HH:mm:ss");
+            LocalDateTime subHours = time.plusHours(-1);
+            return "请在" + ConstDateUtil.formatDate("HH:mm", time) + "到"
+                    + ConstDateUtil.formatDate("HH:mm", subHours) + "之间打卡";
         } else {
             // 延后一小时
             LocalDateTime time = ConstDateUtil.stringTransformLocalDateTime(ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", new Date(currentScheduling.getTimestamps())), "yyyy-MM-dd HH:mm:ss");
@@ -145,7 +145,7 @@ public class SchedulingService {
         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 (SignInServiceImpl.checkTimerSign(nowBetween, scheduling.getBcType())) {
-            if (nowBetween < -60L || (BC_TYPE_IN.equals(scheduling.getBcType()) && nowBetween < 0L) ) {
+            if (nowBetween < -60L || (BC_TYPE_IN.equals(scheduling.getBcType()) && nowBetween < 0L)) {
                 sb.append(EARLY);
             } else {
                 sb.append(SIGN_STATUS_DELAY_ENUM.getDescription(scheduling.getBcType()));
@@ -158,7 +158,6 @@ public class SchedulingService {
             int index = signIn.getRemark().indexOf(ALCOHOL_SIGN_IN_ERROR);
             if (index != -1) {
                 sb.append("," + signIn.getRemark().substring(index));
-
             }
         }
         return sb.toString();
@@ -175,31 +174,55 @@ public class SchedulingService {
             signIn.setRemark("您已经打卡过了，请勿在3分钟内重复打卡");
             return;
         }
-        //   目前也有效 -》 无需更新 || 目前无效 -》往后更新  TODO 判断时间   之前的有效 但是时间还在有效范围内打卡的话会导致排班表数据不匹配
+        //   目前也有效 -》 无需更新 || 目前无效 -》往后更新
+        //   TODO 判断时间   之前的有效 但是人员提前打卡且还在上次操作有效范围内需要往后偏移
+        //    但是操作一样时间还在有效范围内打卡的话会导致排班表数据不匹配
+        int index = dto.size() > globalIndex.getIndex() ? globalIndex.getIndex() + 1 : globalIndex.getIndex();
         if (signIn.getExType().equals(SIGN_NO_EX_NUM)) {
-            return;
+            if (signIn.getType().equals(bcTypeTransform(dto.get(globalIndex.getIndex()).getBcType()))) {
+                return;
+            }
+            // 校验下一次的时间
+            DriverSignInRecommendation nextClosestTimestamp = computedTheCurrentClosestTimestamp(dto, signIn.getCreateTime().getTime(), 1);
+            LocalDateTime endTime = ConstDateUtil.getLocalDateTimeByLongTime(nextClosestTimestamp.getTimestamps());
+            LocalDateTime nowTime = ConstDateUtil.getLocalDateTimeByLongTime(signIn.getCreateTime().getTime());
+            long nowBetween = ChronoUnit.MINUTES.between(endTime, nowTime);
+            boolean result = SignInServiceImpl.checkTimerSign(nowBetween, nextClosestTimestamp.getBcType());
+            // 不在范围内设置异常
+            if (result) {
+                signIn.setExType(SIGN_TIME_OUT_EX_NUM);
+            }
         }
-        int index = globalIndex.getIndex() + 1;
         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());
         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);
+        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);
     }
+    private Integer bcTypeTransform(String bcType) {
+        if (BC_TYPE_OUT.equals(bcType)) {
+            return 1;
+        } else {
+            return 2;
+        }
+    }
+
     private String getPrompt(Date date, String bcType) {
         if (BC_TYPE_OUT.equals(bcType)) {
-            return "请在" + ConstDateUtil.formatDate("HH:mm", date) + "前后一小时内打卡。";
+            LocalDateTime time = ConstDateUtil.stringTransformLocalDateTime(ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", date), "yyyy-MM-dd HH:mm:ss");
+            LocalDateTime subTime = time.plusHours(-1);
+            return "请在" + ConstDateUtil.formatDate("HH:mm", subTime) + "到" +
+                    ConstDateUtil.formatDate("HH:mm", time) + "之间打卡";
         } 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) + "之间打卡";
+            LocalDateTime addHours = time.plusHours(1);
+            return "请在" + ConstDateUtil.formatDate("HH:mm", time) + "到" +
+                    ConstDateUtil.formatDate("HH:mm", addHours) + "之间打卡";
         }
     }
@@ -70,7 +70,7 @@ public class ToolUtils {
                 scheduling.setRemark(SIGN_STATUS_DELAY_ENUM.getDescription(scheduling.getBcType()));
             }
         }
-        // 签退客户说把时间约定在正负一小时以内
+        // 签退客户说把时间约定在负一小时以内
         // 签退
         if (BC_TYPE_IN.equals(scheduling.getBcType()) && !Objects.isNull(scheduling.getSignTime()) && SIGN_STATUS_ZONE_ENUM.getStatus().equals(scheduling.getExType())) {
             // 实际签退时间
@@ -3,6 +3,7 @@ package com.ruoyi;
 import com.ruoyi.BsthApplication;
 import com.ruoyi.common.cache.NowSchedulingCache;
+import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.driver.service.IDriverService;
 import com.ruoyi.in.domain.SignIn;
@@ -38,31 +39,42 @@ public class TestBsthApplication {
     @Test
     public void testAddSignIn() {
+//        724778 722104 722576
         // 模拟前端签到
         String [] params = new String[] {
-                "2024-02-19 04:30:06,1,1,0",
-                "2024-02-19 05:03:06,1,1,0",
-                "2024-02-19 11:30:30,2,0,0",
-                "2024-02-19 12:16:15,2,0,0",
-                "2024-02-19 15:13:03,1,1,0",
-                "2024-02-19 16:13:03,1,1,0",
-                "2024-02-19 21:36:03,1,1,0",};
+                "2024-03-20 3:45:44,1,1,0",
+                "2024-03-20 07:45:44,1,1,0",
+//                "2024-03-20 11:27:57,2,1,0",
+//                "2024-03-20 11:39:30,2,0,0",
+                "2024-03-20 12:21:02,2,0,0",
+//                "2024-03-20 21:45:35,2,1,0",
+                "2024-03-20 17:45:35,2,1,0",
+        };
         try {
             for (int i = 0; i < params.length; i++) {
                 String[] strings = params[i].split(",");
-                SignIn signIn = new SignIn();
-                signIn.setJobCode("722017");
-                signIn.setCreateTime(ConstDateUtil.parseDate(strings[0]));
-                signIn.setType(Integer.parseInt(strings[1]));
-                signIn.setDeviceId("003");
-                signIn.setAlcoholFlag(Integer.parseInt(strings[2]));
-                signIn.setAlcoholIntake(new BigDecimal(strings[3]));
-                signInService.addSignIn(signIn);
+                SignIn signIn1 = new SignIn();
+                SignIn signIn2 = new SignIn();
+                SignIn signIn3 = new SignIn();
+                signIn1.setJobCode("722902");
+                signIn1.setCreateTime(ConstDateUtil.parseDate(strings[0]));
+                signIn1.setType(Integer.parseInt(strings[1]));
+                signIn1.setDeviceId("003");
+                signIn1.setAlcoholFlag(Integer.parseInt(strings[2]));
+                signIn1.setAlcoholIntake(new BigDecimal(strings[3]));
+                signInService.addSignIn(signIn1);
+//
+//                BeanUtils.copyProperties(signIn1,signIn2);
+//                signIn2.setJobCode("722104");
+//                signInService.addSignIn(signIn2);
+//                BeanUtils.copyProperties(signIn1,signIn3);
+//                signIn3.setJobCode("722576");
+//                signInService.addSignIn(signIn3);
             }
             ReportViewRequestVo vo = new ReportViewRequestVo();
-            vo.setDate("2024-02-19");
-            vo.setJobCode("722017");
+            vo.setDate("2024-3-19");
+            vo.setJobCode("722519");
             System.out.println();
             for (ReportViewResponseVo responseVo : reportService.getReportScrollViewTable(vo, null)) {
                 System.out.println(responseVo);