优化签到

liujun001
1 parent b5881267
Showing 1 changed file with 14 additions and 9 deletions
Bsth-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
@@ -29,6 +29,7 @@ import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW;
@@ -115,26 +116,30 @@ public class SignInController extends BaseController {
             return signInService.addSignIn(signIn);
         }
-        Integer num = RandomUtils.nextInt(0, 9);
-        if (num < 5) {
+        Integer num = RandomUtils.nextInt(0, 10);
+        if (num < 3) {
             redisCache.setCacheObject(key, num, 5, TimeUnit.MINUTES);
             log.info("[{}] sing method 走新的签到方式 :[{}] ", num, signIn);
+            key = StringUtils.join(REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW, ConstDateUtil.FAST_YYYY_MM_DD.format(new Date()), ":", signIn.getJobCode());
+            Integer count = redisCache.getCacheObject(key);
             try {
                 return signInServiceV1.addsignInV1(signIn);
             } catch (Exception e) {
-                key = StringUtils.join(REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW, ConstDateUtil.FAST_YYYY_MM_DD.format(new Date()), ":", signIn.getJobCode());
+                if (Objects.isNull(count)) {
+                    count = 0;
+                } else {
+                    count = count - 1;
+                }
                 if (redisCache.hasKey(key)) {
-                    redisCache.setCacheObject(key, 0, 1, TimeUnit.DAYS);
+                    redisCache.setCacheObject(key, count, 1, TimeUnit.DAYS);
                 }
-
                 log.error("[{}] sing method 走新的签到方式，签到失败 :[{}]", num, signIn, e);
-                return AjaxResult.error("签到失败，请再测试一次");
             }
-        } else {
-            log.info("[{}] sing method  old sign :[{}]", num, signIn);
-            return signInService.addSignIn(signIn);
         }
+
+        log.info("[{}] sing method  old sign :[{}]", num, signIn);
+        return signInService.addSignIn(signIn);
     }
 //    /**