feat: 修改提示

guzijian
1 parent 41afbd8f
Showing 5 changed files with 33 additions and 77 deletions
ruoyi-admin/src/main/java/com/ruoyi/in/service/ISignInService.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/vo/RuleAttendanceMainRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/service/SchedulingService.java
ruoyi-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
@@ -35,14 +35,6 @@ public interface ISignInService
     public List<SignInResponseVo> selectSignInList(SignInResponseVo signIn);
     /**
-     * 新增签到
-     * 
-     * @param signIn 签到
-     * @return 结果
-     */
-    public AjaxResult insertSignIn(SignIn signIn);
-
-    /**
      * 修改签到
      * 
      * @param signIn 签到
@@ -8,6 +8,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import cn.hutool.core.collection.CollectionUtil;
@@ -112,51 +113,6 @@ public class SignInServiceImpl implements ISignInService {
         return vos;
     }
-    /**
-     * 新增签到
-     *
-     * @param signIn 签到
-     * @return 结果
-     */
-    @Override
-    public AjaxResult insertSignIn(SignIn signIn) {
-        // 查询员工信息
-        Driver driver = driverMapper.getDriverInfoByJobCode(signIn.getJobCode());
-        if (Objects.isNull(driver)) return AjaxResult.error("这个工号的员工不存在！");
-        // 查询地址
-        Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
-        SignInResponseVo vo = getSignInResponseVo(driver, signIn, equipment);
-        signIn.setCreateTime(new Date());
-        signIn.setRemark("");
-        // 签到检查 酒精检查 超时检查 排班检查
-        GlobalIndex globalIndex = new GlobalIndex();
-        long now = System.currentTimeMillis();
-        List<DriverScheduling> dto = schedulingService.queryScheduling(signIn.getJobCode(), now);
-        if (checkSignIn(now, dto, globalIndex, signIn, driver)) {
-            signIn.setStatus(SIGN_IN_SUCCESS);
-        } else {
-            signIn.setStatus(SIGN_IN_FAIL);
-            signIn.setRemark(signIn.getRemark().replaceFirst(",$", "。"));
-        }
-        signIn.setIp(IpUtils.getIpAddr());
-        // base64转图片
-//        uploadImage(signIn);
-        signInMapper.insertSignIn(signIn);
-        // TODO redis 存储每个人的签到 用于后续考勤
-
-        // 驾驶人员二次签到酒精测试异常
-        if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && SIGN_IN_FAIL.equals(signIn.getStatus()) && signIn.getRemark().contains(ALCOHOL_SIGN_IN_ERROR)) {
-            AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
-            if (!Objects.isNull(result)) {
-                return result;
-            }
-        }
-        if (SIGN_IN_FAIL.equals(signIn.getStatus())) {
-            return AjaxResult.success(SIGN_IN_ERROR + ": " + signIn.getRemark(), vo);
-        }
-        return AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo);
-    }
-
     /**
      * 修改签到
@@ -233,10 +189,11 @@ public class SignInServiceImpl implements ISignInService {
             }
         }
         if (SIGN_IN_SUCCESS.equals(signIn.getStatus())) {
+            String prompt = signIn.getRemark().replace("正常", "");
             if (signIn.getType().equals(SIGN_OUT)) {
-                return AjaxResult.success(SIGN_OUT_SUCCESS_STRING, vo);
+                return AjaxResult.success(SIGN_OUT_SUCCESS_STRING + prompt, vo);
             } else {
-                return AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo);
+                return AjaxResult.success(SIGN_IN_SUCCESS_STRING + prompt, vo);
             }
         } else {
             if (signIn.getType().equals(SIGN_OUT)) {
@@ -406,15 +363,14 @@ public class SignInServiceImpl implements ISignInService {
     }
     private AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn, SignInResponseVo vo) {
-        // TODO 待更换 缓存更新为当天签到记录
         String key = REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW + ConstDateUtil.formatDate("yyyyMMdd") + ":" + signIn.getJobCode();
         // 驾驶员酒精测试连续超标两次则提示换人
         Integer count = redisCache.getCacheObject(key);
         if (Objects.isNull(count) || count.equals(0)) {
             count = 1;
-            redisCache.setCacheObject(key, count);
+            redisCache.setCacheObject(key, count, 1, TimeUnit.DAYS);
         } else {
-            redisCache.setCacheObject(key, ++count);
+            redisCache.setCacheObject(key, ++count, 1, TimeUnit.DAYS);
         }
         if (SIGN_IN_ERROR_COUNT.compareTo(count) <= 0) {
             return AjaxResult.success(SIGN_IN_ERROR + ": " + signIn.getRemark() + "酒精测试不通过" + count + "次请更换车辆驾驶员。", vo);
@@ -507,12 +463,8 @@ public class SignInServiceImpl implements ISignInService {
     }
     private boolean checkTimeOut(GlobalIndex globalIndex, SignIn signIn, List<DriverScheduling> dto, String posts, long now) {
-        // 那发车时间和到站时间作为开始上班的时间
-        if (PERSONNEL_POSTS_DRIVER.equals(posts) || PERSONNEL_POSTS_SALES.equals(posts)) {
-            return driverCheckTimeOut(globalIndex, signIn, dto, now);
-        } else {
-            return driverCheckTimeOut(globalIndex, signIn, dto, now);
-        }
+        // 司售人员拿发车时间和到站时间作为开始上班的时间
+        return driverCheckTimeOut(globalIndex, signIn, dto, now);
     }
     private boolean driverCheckTimeOut(GlobalIndex globalIndex, SignIn signIn, List<DriverScheduling> dto, long now) {
@@ -531,21 +483,22 @@ public class SignInServiceImpl implements ISignInService {
                 // 签到一个逻辑 当前无记录
                 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);
+                        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);
+                        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);
+                        signIn.setRemark(SIGN_IN_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm",new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
                         globalIndex.setIndex(currentScheduling.getIndex());
                         result = false;
                     }
@@ -555,20 +508,21 @@ public class SignInServiceImpl implements ISignInService {
                     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);
+                        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);
+                        signIn.setRemark(SIGN_OUT_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm",new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
                         globalIndex.setIndex(currentScheduling.getIndex());
                         result = false;
                     }
                 }
                 // 签退|签到 当前有记录
                 if (!Objects.isNull(currentScheduling.getSignInId())) {
-                    signIn.setRemark(currentScheduling.getBcType().equals(BC_TYPE_IN) ? SIGN_OUT_TIMEOUT : SIGN_IN_TIMEOUT);
+                    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;
                 }
@@ -7,7 +7,7 @@ import lombok.Data;
  */
 @Data
 public class RuleAttendanceMainRequestVo {
-    private String jocCode;
+    private String jobCode;
     private String date;
     private String name;
 }
@@ -2,6 +2,7 @@ package com.ruoyi.service;
 import cn.hutool.core.collection.CollectionUtil;
 import com.ruoyi.common.cache.NowSchedulingCache;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.mapper.SignInMapper;
@@ -77,7 +78,7 @@ public class SchedulingService {
     /**
-     * 计算签到逻辑
+     * 计算当前签到签到逻辑
      *
      * @param dto
      * @param now
@@ -140,17 +141,26 @@ public class SchedulingService {
         if (globalIndex.getIndex() == dto.size() - 1) {
             return;
         }
+        long timer = 1000 * 60 * 5;
+        // 有效的在一分钟内重复签到不做修改
+        if (signIn.getExType().equals(SIGN_NO_EX_NUM) && (DateUtils.getNowDate().getTime() - dto.get(globalIndex.getIndex()).getSignTime().getTime()) <= timer) {
+            signIn.setRemark("您已经打卡过了，您已完成" + (globalIndex.getIndex() + 1) + "次打卡，请勿在5分钟内重复打卡");
+            return;
+        }
         Integer index = globalIndex.getIndex() + 1;
         // 之前是签到 |  目前有效记录 -》进行修改  变成无效
         if (signIn.getExType().equals(SIGN_NO_EX_NUM)) {
             signIn.setStatus(SIGN_IN_FAIL);
             signIn.setExType(SIGN_TIME_OUT_EX_NUM);
-            signIn.setRemark(dto.get(index).getBcType().equals(BC_TYPE_IN) ? SIGN_OUT_TIMEOUT : SIGN_IN_TIMEOUT);
-            signIn.setRemark(signIn.getRemark().replaceFirst(",$", "。"));
             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)) + "前后一小时内打卡。";
+        signIn.setRemark((scheduling.getBcType().equals(BC_TYPE_IN) ? SIGN_OUT_TIMEOUT : SIGN_IN_TIMEOUT) + prompt);
+        signIn.setRemark(signIn.getRemark().replaceFirst(",$", "。"));
         // 之前是签到 |  目前无效 -》往后更新
-        schedulingMapper.updateRoster(dto.get(globalIndex.getIndex() + 1), signIn.getId(), signIn.getExType(), signIn.getCreateTime(), signIn.getRemark(), signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
+        schedulingMapper.updateRoster(scheduling, signIn.getId(), signIn.getExType(), signIn.getCreateTime(), signIn.getRemark(), signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
         nowSchedulingCache.updateCacheByJobCode(ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex() + 1, signIn);
     }
@@ -247,7 +257,7 @@ public class SchedulingService {
         // 相差十五分钟
         if (timeDifferenceInMillis > 0 && timeDifferenceInMillis < (60 * 1000 * 15)) {
             return true;
-        } else if (timeDifferenceInMillis < 0) {
+        } else if (timeDifferenceInMillis <= 0) {
             return true;
         }
         return false;
@@ -165,7 +165,7 @@ public class AttendanceServiceImpl implements AttendanceService {
         List<RuleAttendanceMain> list = attendanceMainService.list(new QueryWrapper<RuleAttendanceMain>()
                 .lambda()
                 .eq(RuleAttendanceMain::getSchedulingDate, vo.getDate())
-                .eq(StringUtils.isNotEmpty(vo.getJocCode()), RuleAttendanceMain::getJobCode, vo.getJocCode()));
+                .eq(StringUtils.isNotEmpty(vo.getJobCode()), RuleAttendanceMain::getJobCode, vo.getJobCode()));
         return list;
     }