优化签到流程

liujun001
1 parent f22dd4a4
Showing 1 changed file with 38 additions and 29 deletions
Bsth-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
@@ -7,15 +7,18 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.file.FileUploadException;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.in.service.SignInServiceV1;
 import com.ruoyi.pojo.response.SignInResponseVo;
+import com.ruoyi.utils.ConstDateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.RandomUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -23,7 +26,13 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 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;
 /**
  * 签到Controller
@@ -101,36 +110,36 @@ public class SignInController extends BaseController {
     @PostMapping("/newAdd")
     @ApiOperation("新增签到（设备传入）")
     public AjaxResult addSignIn(@ApiParam @RequestBody @Validated SignIn signIn) throws FileUploadException, IOException {
-//        String key = MessageFormat.format("sign:assignment:{0}", signIn.getJobCode());
-//        if (redisCache.hasKey(key)) {
-//            log.info(" sing method  old sign :[{}]", signIn);
-//            return signInService.addSignIn(signIn);
-//        }
-//
-//        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 {
+        String key = MessageFormat.format("sign:assignment:{0}", signIn.getJobCode());
+        if (redisCache.hasKey(key)) {
+            log.info(" sing method  old sign :[{}]", signIn);
+            return signInService.addSignIn(signIn);
+        }
+
+        Integer num = RandomUtils.nextInt(0, 10);
+        if (num < 6) {
+            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) {
-//                if (Objects.isNull(count) || count < 1) {
-//                    count = 0;
-//                } else {
-//                    count = count - 1;
-//                }
-//                if (redisCache.hasKey(key)) {
-//                    redisCache.setCacheObject(key, count, 1, TimeUnit.DAYS);
-//                }
-//                log.error("[{}] sing method 走新的签到方式，签到失败 :[{}]", num, signIn, e);
-//            }
-//
-//        }
-
-//        log.info("[{}] sing method  old sign :[{}]", num, signIn);
-//        return signInService.addSignIn(signIn);
+            } catch (Exception e) {
+                if (Objects.isNull(count) || count < 1) {
+                    count = 0;
+                } else {
+                    count = count - 1;
+                }
+                if (redisCache.hasKey(key)) {
+                    redisCache.setCacheObject(key, count, 1, TimeUnit.DAYS);
+                }
+                log.error("[{}] sing method 走新的签到方式，签到失败 :[{}]", num, signIn, e);
+            }
+
+        }
+
+        log.info("[{}] sing method  old sign :[{}]", num, signIn);
+        return signInService.addSignIn(signIn);
     }
 //    /**