fix: 新增清除异常接口

guzijian
1 parent f23b8ae6
Showing 6 changed files with 47 additions and 12 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/redispre/GlobalRedisPreName.java
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
@@ -19,8 +19,5 @@ public interface GlobalRedisPreName {
      */
     String REDIS_PERSONNEL_DRIVER = "personnel:driver";
  
-    /**
-     * 其他人员
-     */
  
 }
@@ -211,4 +211,14 @@ public class DriverController extends BaseController {
         return driverService.faceRegistrationFeedback(vo.getDeviceId(), vo.getJobCodes());
     }
  
+    /**
+     * 清除指定工号异常记录
+     */
+    @ApiOperation("清除指定工号异常记录")
+    @DeleteMapping("/clear/{jobCode}")
+    public AjaxResult clearExceptionRecordByJobCode(@PathVariable("jobCode") String jobCode) {
+        driverService.clearExceptionRecordByJobCode(jobCode);
+        return AjaxResult.success("清除成功");
+    }
+
 }
@@ -100,4 +100,6 @@ public interface IDriverService
     void saveDriverSignInfo(DriverSignInRequestVo vo);
  
     void updateDrivers(List<Driver> drivers);
+
+    void clearExceptionRecordByJobCode(String jobCode);
 }
@@ -47,6 +47,7 @@ import static com.ruoyi.common.ApiProperties.PERSONNEL_API_KEY;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.SIGN_FACE_ACTIVE;
 import static com.ruoyi.common.global.ResultCode.CODE_207;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
+import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW;
  
 /**
  * 驾驶员信息Service业务层处理
@@ -374,6 +375,13 @@ public class DriverServiceImpl implements IDriverService {
         driverMapper.updateDriverInfoByJobCodes(drivers);
     }
  
+    @Override
+    public void clearExceptionRecordByJobCode(String jobCode) {
+        String dateKey = REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW + ConstDateUtil.formatDate(new Date());
+        log.info("在:{}时间工号:{}的异常记录被清除了",dateKey,jobCode);
+        redisCache.deleteCacheMapValue(dateKey,jobCode);
+    }
+
     /**
      * 获取新的imageUrl
      *
@@ -180,10 +180,6 @@ public class SignInServiceImpl implements ISignInService {
         SignInResponseVo vo = getSignInResponseVo(signIn, equipment);
         signIn.setCreateTime(new Date());
         signIn.setRemark("");
-        // 测试用户特殊处理
-        if (signIn.getJobCode().equals("700002") || signIn.getJobCode().equals("700001")) {
-            return AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo);
-        }
         // 签到检查
         if (checkSignIn(signIn, driver)) {
             signIn.setStatus(SIGN_IN_SUCCESS);
@@ -195,6 +191,11 @@ public class SignInServiceImpl implements ISignInService {
  
         uploadImage(signIn);
         signInMapper.insertSignIn(signIn);
+
+        // 测试用户特殊处理
+        if (signIn.getJobCode().equals("700002") || signIn.getJobCode().equals("700001")) {
+            return AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo);
+        }
         // TODO redis 存储每个人的签到 用于后续考勤
  
         // 驾驶人员二次签到酒精测试异常
@@ -278,6 +279,8 @@ public class SignInServiceImpl implements ISignInService {
                 // 查询数据库
                 result = true;
                 break;
+            default:
+                break;
         }
  
         // 超时校验司售人员
@@ -30,8 +30,7 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
  
-import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
-import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_PERSONNEL_TOKEN;
+import static com.ruoyi.common.redispre.GlobalRedisPreName.*;
  
 /**
  * 该定时任务用户获取驾驶员信息
@@ -159,6 +158,21 @@ public class DriverJob implements InitializingBean {
         return result;
     }
  
+    public void clearExceptionYesterdayRecord() {
+        // 获取当前日期时间
+        Calendar calendar = Calendar.getInstance();
+
+        // 将日期减去一天
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+
+        // 获取昨天的日期时间
+        Date yesterday = calendar.getTime();
+        String dateKey = REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW + ConstDateUtil.formatDate(yesterday);
+        log.info("开始清除昨天的异常数据:{}", dateKey);
+        REDIS_CACHE.deleteObject(dateKey);
+        log.info("清除昨天的异常数据完成:{}", dateKey);
+    }
+
     /**
      * 获取排班任务请求
      * 24小时执行一次
@@ -166,11 +180,11 @@ public class DriverJob implements InitializingBean {
     public void getSchedulingInfo() {
         long timestamp = System.currentTimeMillis();
         String formatDate = ConstDateUtil.formatDate(timestamp);
-        log.info("获取排班任务触发时间:{}",formatDate);
+        log.info("获取排班任务触发时间:{}", formatDate);
         // 获取排班请求
         String getSchedulingInfoUrl = null;
  
-        log.info("开始获取{}的排班数据",formatDate);
+        log.info("开始获取{}的排班数据", formatDate);
         try {
             getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", formatDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
         } catch (Exception e) {
@@ -179,7 +193,7 @@ public class DriverJob implements InitializingBean {
         // 获取排班信息并存入redis
         saveSchedulingToRedis(getSchedulingInfoUrl, formatDate);
  
-        log.info("获取{}的排班数据完毕",formatDate);
+        log.info("获取{}的排班数据完毕", formatDate);
     }
  
     /**
@@ -226,6 +240,7 @@ public class DriverJob implements InitializingBean {
         return driverSchedulingMap;
     }
  
+
     public static void getDrivers(String accessToken) throws Exception {
 //        Map<String, String> configMap = getStringStringMap(timestamp);
 //        String sign = getSHA1(configMap);