优化流量分配方案

liujun001
1 parent 71de797a
Showing 2 changed files with 47 additions and 20 deletions
Bsth-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
@@ -4,6 +4,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 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.poi.ExcelUtil;
@@ -11,11 +12,13 @@ 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.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -23,7 +26,12 @@ 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.concurrent.TimeUnit;
+
+import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW;
 /**
  * 签到Controller
@@ -40,6 +48,8 @@ public class SignInController extends BaseController {
     private ISignInService signInService;
     @Autowired
     private SignInServiceV1 signInServiceV1;
+    @Autowired
+    private RedisCache redisCache;
     /**
@@ -99,10 +109,28 @@ 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, 9);
-        if (num < 3) {
+        if (num < 5) {
+            redisCache.setCacheObject(key, num, 5, TimeUnit.MINUTES);
             log.info("[{}] sing method 走新的签到方式 :[{}] ", num, signIn);
-            return signInServiceV1.addsignInV1(signIn);
+            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 (redisCache.hasKey(key)) {
+                    redisCache.setCacheObject(key, 0, 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);
 package com.ruoyi.in.service.impl;
-import java.io.File;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-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;
 import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.cache.SchedulingCache;
@@ -25,15 +14,18 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.errorScheduling.service.IErrorJobcodeService;
+import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.in.mapper.SignInMapper;
+import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.pojo.DriverSignInRecommendation;
 import com.ruoyi.pojo.GlobalIndex;
-import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.pojo.response.SignInResponseVo;
 import com.ruoyi.service.SchedulingService;
 import com.ruoyi.service.ThreadJobService;
@@ -44,17 +36,24 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.in.mapper.SignInMapper;
-import com.ruoyi.in.domain.SignIn;
-import com.ruoyi.in.service.ISignInService;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+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 static com.ruoyi.common.ConstDriverProperties.*;
-import static com.ruoyi.common.ErrorTypeProperties.*;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
+import static com.ruoyi.common.ErrorTypeProperties.*;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW;
 /**
@@ -648,8 +647,8 @@ public class SignInServiceImpl implements ISignInService {
         if (BC_TYPE_OUT.equals(currentScheduling.getBcType())) {
             LocalDateTime time = ConstDateUtil.stringTransformLocalDateTime(ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", new Date(currentScheduling.getTimestamps())), "yyyy-MM-dd HH:mm:ss");
             LocalDateTime subHours = time.plusHours(-1);
-            return "请在" + ConstDateUtil.formatDate("HH:mm", time) + "到"
-                    + ConstDateUtil.formatDate("HH:mm", subHours) + "之间打卡";
+            return "请在" + ConstDateUtil.formatDate("HH:mm", subHours) + "到"
+                    + ConstDateUtil.formatDate("HH:mm", time) + "之间打卡";
         } else {
             // 延后一小时
             LocalDateTime time = ConstDateUtil.stringTransformLocalDateTime(ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", new Date(currentScheduling.getTimestamps())), "yyyy-MM-dd HH:mm:ss");