下载场景

src/main/java/com/fdkankan/manage/service/IRtkAccountService.java

@@ -33,6 +33,7 @@ public interface IRtkAccountService extends IService<RtkAccount> {
     RtkAccount getByUserName(String userName);
 
     List<RtkAccount> getByNotFailure();
+    Long getCanUseCount();
 
     Integer insExcelList(List<HashMap<Integer, String>> excelRowList);
 }

src/main/java/com/fdkankan/manage/service/impl/RtkAccountServiceImpl.java

@@ -82,6 +82,7 @@ public class RtkAccountServiceImpl extends ServiceImpl<IRtkAccountMapper, RtkAcc
         if(redisUtil.hasKey(redisKey)){
             String jsonStr = redisUtil.get(redisKey);
             RtkAccount rtkAccount = JSONObject.parseObject(jsonStr, RtkAccount.class);
+            log.info("rtkAccount:{}",jsonStr);
             Boolean flag = checkAccountFailureTime(rtkAccount.getId());
             if(flag){
                 redisUtil.expire(redisKey,time);
@@ -102,13 +103,13 @@ public class RtkAccountServiceImpl extends ServiceImpl<IRtkAccountMapper, RtkAcc
             dingdingService.sendDingDingMsg(0);
             throw new BusinessException(ResultCode.RTK_ACCOUNT_NOT_EXIT);
         }
-        dingdingService.modelThreshold(list.size() -1,this.count());
+        dingdingService.modelThreshold(list.size() -1,this.getCanUseCount());
 
         RtkAccount rtkAccount = null;
         RtkUseLog rtkUseLog = rtkUseLogService.getByRtkSn(rtkSnCode);
         if(rtkUseLog != null && rtkUseLog.getRtkAccountId() != null){
             RtkAccount rtkAccount2 = this.getById(rtkUseLog.getRtkAccountId());
-            if(rtkAccount2 != null && rtkAccount2.getStatus() == 1){
+            if(rtkAccount2 != null && rtkAccount2.getStatus() == 1 && rtkAccount2.getUseStatus() == 0){
                 rtkAccount = rtkAccount2;
             }
         }
@@ -121,6 +122,13 @@ public class RtkAccountServiceImpl extends ServiceImpl<IRtkAccountMapper, RtkAcc
         return rtkAccount;
     }
 
+    @Override
+    public Long getCanUseCount() {
+        LambdaQueryWrapper<RtkAccount> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(RtkAccount::getUseStatus,0);
+        return this.count(wrapper);
+    }
+
     private Boolean checkAccountFailureTime(Integer accountId) {
         RtkAccount dbRtkAccount = this.getById(accountId);
         if(dbRtkAccount == null || dbRtkAccount.getStatus() == 3 || dbRtkAccount.getUseStatus() == 1){

src/main/java/com/fdkankan/manage/task/TaskService.java

@@ -92,13 +92,14 @@ public class TaskService {
     public void checkAccountDb() {
         LambdaQueryWrapper<RtkAccount> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(RtkAccount::getStatus,0,1);
+        wrapper.eq(RtkAccount::getUseStatus,0);
         wrapper.orderByAsc(RtkAccount::getUpdateTime);
         List<RtkAccount> list = rtkAccountService.list(wrapper);
         if(list == null || list.isEmpty()){
             dingdingService.sendDingDingMsg(0);
             return;
         }
-        dingdingService.modelThreshold(list.size(),rtkAccountService.count());
+        dingdingService.modelThreshold(list.size(),rtkAccountService.getCanUseCount());
     }