feat: 修改金高签到逻辑

guzijian
1 parent bf58e609
Showing 6 changed files with 68 additions and 56 deletions
Bsth-admin/src/main/java/com/ruoyi/common/ErrorTypeProperties.java
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/ThreadJobService.java
Bsth-admin/src/main/resources/application-druid-prd.yml
@@ -10,6 +10,10 @@ public interface ErrorTypeProperties {
     String ALCOHOL_SIGN_IN_ERROR = "酒精测试超标,";
     String WORK_DAY_ERROR = "当天没有排班,";
     String SIGN_IN_TIMEOUT = "没有在规定时间内签到,";
-    String SIGN_OUT_TIMEOUT = "没有在规定时间内签退,";
+//    String SIGN_OUT_TIMEOUT = "没有在规定时间内签退,";
+    /**
+     * 金高没有签退
+     */
+    String SIGN_OUT_TIMEOUT = "没有在规定时间内签到,";
 }
@@ -40,9 +40,9 @@ public class NowSchedulingCache {
             List<DriverScheduling> schedulingList = schedulingMapper.queryToDay(date, null, null, null);
             handlerResultMap(resultMap, schedulingList);
             // 获取错误排班
-            List<ErrorJobcode> errorScheduling = ThreadJobService.getErrorScheduling(resultMap);
+//            List<ErrorJobcode> errorScheduling = ThreadJobService.getErrorScheduling(resultMap);
             // 插入错误排班
-            errorJobcodeService.insertBatchErrorJobcode(errorScheduling);
+//            errorJobcodeService.insertBatchErrorJobcode(errorScheduling);
             // 更新缓存
             cacheNowDayScheduling.put(date, resultMap);
         }
@@ -73,7 +73,7 @@ import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE
 @Service
 public class DriverServiceImpl implements IDriverService {
-    private Logger log = LoggerFactory.getLogger(DriverServiceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(DriverServiceImpl.class);
     @Autowired
     private ISysNoticeService noticeService;
@@ -164,9 +164,9 @@ public class DriverServiceImpl implements IDriverService {
             LocalDateTime endTime = ConstDateUtil.getLocalDateTimeByLongTime(timeMap.get(index).getTimestamps());
             long nowBetween = ChronoUnit.MINUTES.between(endTime, nowTime);
             // 如果当前有效范围内签到记录无效如酒精测试异常则重复当前操作
-            if ((Math.abs(nowBetween) <= 60) && timeMap.get(index).getExType().equals(SIGN_ALCOHOL_EX_NUM) && timeMap.get(index).getBcType().equals(BC_TYPE_OUT)) {
+            if ((Math.abs(nowBetween) <= 60)) {
                 return timeMap.get(index);
-            } else {
+            } else if (nowBetween > 60L){
                 index = index < timeMap.size() - 1 ? index + 1 : index;
             }
         }
@@ -358,6 +358,7 @@ public class DriverServiceImpl implements IDriverService {
             } else {
                 // 特定设备是无需酒精测试的
                 vo.setCheckAlcohol(needCheckAlcoholDevice);
+                vo.setPlanAction("签到");
                 vos.add(vo);
             }
         }
@@ -517,52 +517,7 @@ public class SignInServiceImpl implements ISignInService {
             }
             // 不在有效时间范围内，判断当前是否有签到记录  当前应签到还是签退
             if (!(Math.abs(nowBetween) <= 60)) {
-                // 签到一个逻辑 当前无记录
-                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())) + "前后一小时内打卡。");
-                        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())) + "前后一小时内打卡。");
-                        globalIndex.setIndex(currentScheduling.getIndex());
-                        result = false;
-                    }
-                    // 当前最近无记录|签到,type:签到|签退  -> 签到超时给上
-                    else {
-                        signIn.setRemark(SIGN_IN_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
-                        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())) + "前后一小时内打卡。");
-                        globalIndex.setIndex(lastClosestTimestamp.getIndex());
-                        result = false;
-                    }
-                    // 当前无记|签退 ， type：签退|签到  ——> 签退异常
-                    else {
-                        signIn.setRemark(SIGN_OUT_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
-                        globalIndex.setIndex(currentScheduling.getIndex());
-                        result = false;
-                    }
-                }
-                // 签退|签到 当前有记录
-                if (!Objects.isNull(currentScheduling.getSignInId())) {
-                    String prompt = "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。";
-                    signIn.setRemark((currentScheduling.getBcType().equals(BC_TYPE_IN) ? SIGN_OUT_TIMEOUT : SIGN_IN_TIMEOUT) + prompt);
-                    globalIndex.setIndex(currentScheduling.getIndex());
-                    result = false;
-                }
+                result = handlerTimerOutSign(globalIndex, signIn, dto, now, result, currentScheduling, nowBetween);
             } else {
                 globalIndex.setIndex(currentScheduling.getIndex());
                 result = true;
@@ -573,6 +528,56 @@ public class SignInServiceImpl implements ISignInService {
         }
     }
+    private Boolean handlerTimerOutSign(GlobalIndex globalIndex, SignIn signIn, List<DriverScheduling> dto, long now, Boolean result, DriverSignInRecommendation currentScheduling, long nowBetween) {
+        // 签到一个逻辑 当前无记录
+        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())) + "前后一小时内打卡。");
+                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())) + "前后一小时内打卡。");
+                globalIndex.setIndex(currentScheduling.getIndex());
+                result = false;
+            }
+            // 当前最近无记录|签到,type:签到|签退  -> 签到超时给上
+            else {
+                signIn.setRemark(SIGN_IN_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
+                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())) + "前后一小时内打卡。");
+                globalIndex.setIndex(lastClosestTimestamp.getIndex());
+                result = false;
+            }
+            // 当前无记|签退 ， type：签退|签到  ——> 签退异常
+            else {
+                signIn.setRemark(SIGN_OUT_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
+                globalIndex.setIndex(currentScheduling.getIndex());
+                result = false;
+            }
+        }
+        // 签退|签到 当前有记录
+        if (!Objects.isNull(currentScheduling.getSignInId())) {
+            String prompt = "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。";
+            signIn.setRemark((currentScheduling.getBcType().equals(BC_TYPE_IN) ? SIGN_OUT_TIMEOUT : SIGN_IN_TIMEOUT) + prompt);
+            globalIndex.setIndex(currentScheduling.getIndex());
+            result = false;
+        }
+        return result;
+    }
+
     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());
@@ -402,6 +402,8 @@ public class ThreadJobService {
         // 处理非司售人员的排班明细
         bcList.addAll(handleOtherPostsScheduling());
+        // 金高只需要签到
+        bcList = bcList.stream().filter(item->BC_TYPE_OUT.equals(item.getBcType())).collect(Collectors.toList());
         // 插入排班
         schedulingMapper.insertRoster(bcList);
         // 异常数据过多，不通过自增获取id再次查询获取
@@ -414,9 +416,9 @@ public class ThreadJobService {
             // 更新缓存
             nowSchedulingCache.setCacheScheduling(date, resultMap);
             // 获取错误排班
-            List<ErrorJobcode> errorScheduling = getErrorScheduling(resultMap);
+//            List<ErrorJobcode> errorScheduling = getErrorScheduling(resultMap);
             // 插入错误排班
-            errorJobcodeService.insertBatchErrorJobcode(errorScheduling);
+//            errorJobcodeService.insertBatchErrorJobcode(errorScheduling);
         }
     }
@@ -30,7 +30,7 @@ spring:
                 # 测试地址
                 url: jdbc:mysql://127.0.0.1:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
                 username: root
-                password: qinpugongjiao20230730
+                password: jingaogongjiao20230730
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -70,7 +70,7 @@ spring:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
                 login-username: qpgj
-                login-password: 2023#manager@qpgjuse
+                login-password: 2023#manager@jsgjuse
             filter:
                 stat:
                     enabled: true