风控增加解封记录

redis unlock key过期调用风控增加解封记录

yt-adage/adage-service/src/main/java/com/ytpm/adage/monitor/RedisKeyExpirationListener.java

@@ -3,6 +3,7 @@ package com.ytpm.adage.monitor;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.adage.dao.AppUserMapper;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-algebraic/algebraic-service/src/main/java/com/ytpm/algebraic/monitor/RedisKeyExpirationListener.java

@@ -3,6 +3,7 @@ package com.ytpm.algebraic.monitor;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.algebraic.dao.AppUserMapper;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-allusion/allusion-service/src/main/java/com/ytpm/allusion/monitor/RedisKeyExpirationListener.java

@@ -3,6 +3,7 @@ package com.ytpm.allusion.monitor;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.allusion.dao.AppUserMapper;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-answer/answer-service/src/main/java/com/ytpm/answer/monitor/RedisKeyExpirationListener.java

@@ -3,6 +3,7 @@ package com.ytpm.answer.monitor;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.answer.dao.AppUserMapper;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-arithmetic/arithmetic-service/src/main/java/com/ytpm/arithmetic/monitor/RedisKeyExpirationListener.java

@@ -3,6 +3,7 @@ package com.ytpm.arithmetic.monitor;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.arithmetic.dao.AppUserMapper;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-calculator/calculator-service/src/main/java/com/ytpm/calculator/monitor/RedisKeyExpirationListener.java

@@ -3,6 +3,7 @@ package com.ytpm.calculator.monitor;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.calculator.dao.AppUserMapper;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-carp/carp-service/src/main/java/com/ytpm/carp/monitor/RedisKeyExpirationListener.java

@@ -3,6 +3,7 @@ package com.ytpm.carp.monitor;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.carp.dao.AppUserMapper;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-countstep/countstep-service/src/main/java/com/ytpm/countstep/monitor/RedisKeyExpirationListener.java

@@ -3,6 +3,7 @@ package com.ytpm.countstep.monitor;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.countstep.dao.AppUserMapper;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-diary/diary-service/src/main/java/com/ytpm/diary/monitor/RedisKeyExpirationListener.java

@@ -3,6 +3,7 @@ package com.ytpm.diary.monitor;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.diary.dao.AppUserMapper;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-dtw/dtw-service/src/main/java/com/ytpm/dtw/monitor/RedisKeyExpirationListener.java

@@ -3,6 +3,7 @@ package com.ytpm.dtw.monitor;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.dtw.dao.AppUserMapper;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-emoticons/emoticons-service/src/main/java/com/ytpm/emoticons/monitor/RedisKeyExpirationListener.java

@@ -3,6 +3,7 @@ package com.ytpm.emoticons.monitor;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.emoticons.dao.AppUserMapper;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-funarith/funarith-service/src/main/java/com/ytpm/funarith/monitor/RedisKeyExpirationListener.java

@@ -2,6 +2,7 @@ package com.ytpm.funarith.monitor;
 
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.funarith.dao.AppUserMapper;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-idiom/idiom-service/src/main/java/com/ytpm/idiom/monitor/RedisKeyExpirationListener.java

@@ -2,6 +2,7 @@ package com.ytpm.idiom.monitor;
 
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.idiom.dao.AppUserMapper;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-irun/irun-service/src/main/java/com/ytpm/irun/monitor/RedisKeyExpirationListener.java

@@ -3,6 +3,7 @@ package com.ytpm.irun.monitor;
 import cn.hutool.core.util.StrUtil;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.irun.dao.AppUserMapper;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
@@ -26,6 +27,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -56,6 +59,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-lemon/lemon-service/src/main/java/com/ytpm/lemon/monitor/RedisKeyExpirationListener.java

@@ -2,6 +2,7 @@ package com.ytpm.lemon.monitor;
 
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.lemon.dao.AppUserMapper;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-lime/lime-service/src/main/java/com/ytpm/lime/monitor/RedisKeyExpirationListener.java

@@ -2,6 +2,7 @@ package com.ytpm.lime.monitor;
 
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.lime.dao.AppUserMapper;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-mileage/mileage-service/src/main/java/com/ytpm/mileage/monitor/RedisKeyExpirationListener.java

@@ -2,6 +2,7 @@ package com.ytpm.mileage.monitor;
 
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.mileage.dao.AppUserMapper;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-nofeeds/nofeeds-service/src/main/java/com/ytpm/nofeeds/monitor/RedisKeyExpirationListener.java

@@ -2,6 +2,7 @@ package com.ytpm.nofeeds.monitor;
 
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.nofeeds.dao.AppUserMapper;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-picking/picking-service/src/main/java/com/ytpm/picking/monitor/RedisKeyExpirationListener.java

@@ -2,6 +2,7 @@ package com.ytpm.picking.monitor;
 
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.picking.dao.AppUserMapper;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-raisepig/raisepig-service/src/main/java/com/ytpm/raisepig/monitor/RedisKeyExpirationListener.java

@@ -2,6 +2,7 @@ package com.ytpm.raisepig.monitor;
 
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.raisepig.dao.AppUserMapper;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-risk/risk-feign/src/main/java/com/ytpm/feign/RiskFeign.java

@@ -4,8 +4,10 @@ import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.feign.fallback.RiskFeignFallBack;
 import com.ytpm.general.Result;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(name = "risk-manage", fallback = RiskFeignFallBack.class)
 public interface RiskFeign {
@@ -13,4 +15,6 @@ public interface RiskFeign {
     Result<?> checkRisk(@RequestBody YtDyzUser ytDyzUser);
     @PostMapping("/public/checkAdRisk")
     Result<?> checkAdRisk(@RequestBody YtDyzUser ytDyzUser);
+    @GetMapping("/public/addDeblockingRecord")
+    Result<?> addBlockingRecord(@RequestParam("userId")String userId);
 }

yt-risk/risk-manage/src/main/java/com/ytpm/controller/PublicApiController.java

@@ -66,4 +66,10 @@ public class PublicApiController {
     public void batchAudit(@RequestParam("userList") List<YtDyzUser> userList){
         riskService.batchAudit(userList);
     }
+
+    @ApiOperation("增加解禁记录")
+    @GetMapping("/addDeblockingRecord")
+    public void addDeblockingRecord(@RequestParam(name = "userId")String userId){
+        riskService.addDeblockingRecord(userId);
+    }
 }

yt-risk/risk-manage/src/main/java/com/ytpm/dao/RiskManageMapper.java

@@ -30,6 +30,8 @@ public interface RiskManageMapper {
      */
     YtPlatformBanned getLastBanned(@Param("userId") String userId);
 
+    YtPlatformBanned getLastBannedByApp(@Param("userId") String userId,@Param("appId")String appId);
+
     /**
      * 增加风控解禁记录
      */

yt-risk/risk-manage/src/main/java/com/ytpm/service/RiskService.java

@@ -109,4 +109,9 @@ public interface RiskService {
      * 批量审核用户
      */
     void batchAudit(List<YtDyzUser> userList);
+
+    /**
+     * 增加解禁记录
+     */
+    void addDeblockingRecord(String userId);
 }

yt-risk/risk-manage/src/main/java/com/ytpm/service/impl/RiskServiceImpl.java

@@ -814,4 +814,25 @@ public class RiskServiceImpl extends ReflectUtil implements RiskService {
         //查询这些用户当天的激励视频收益是否符合
 
     }
+
+    /**
+     * 增加解禁账号
+     */
+    @Override
+    public void addDeblockingRecord(String userId) {
+        YtPlatformBanned lastBanned = riskManageMapper.getLastBanned(userId);
+        if(Objects.isNull(lastBanned))return;
+        YtPlatformDeblocking deblocking = new YtPlatformDeblocking();
+        deblocking.setDeblockingId(IdUtil.fastSimpleUUID());
+        deblocking.setAgentId(lastBanned.getAgentId());
+        deblocking.setBannedId(lastBanned.getBannedId());
+        deblocking.setAppId(lastBanned.getAppId());
+        deblocking.setChannelId(lastBanned.getChannelId());
+        deblocking.setOperator(lastBanned.getOperator());
+        deblocking.setOperatorName(lastBanned.getOperatorName());
+        deblocking.setUserId(userId);
+        deblocking.setDeblockingTime(new Date());
+        deblocking.setDeblockingReason("到期解封");
+        riskManageMapper.addDeblockingRecord(deblocking);
+    }
 }

yt-risk/risk-manage/src/main/resources/mapper/RiskManageMapper.xml

@@ -143,6 +143,14 @@
         order by banned_time desc
         limit 1
     </select>
+    <select id="getLastBannedByApp" resultType="com.ytpm.agent.model.YtPlatformBanned">
+        select
+            banned_id, app_id, user_id, channel_id,agent_id, banned_time, banned_reason, banned_type, banned_limit, operator, operator_name
+        from yt_platform_banned
+        where user_id = #{userId} and app_id = #{appId}
+        order by banned_time desc
+        limit 1
+    </select>
 
     <select id="queryBannedRecord" resultType="com.ytpm.agent.model.YtPlatformBanned">
         select

yt-summary/summary-service/src/main/java/com/ytpm/summary/monitor/RedisKeyExpirationListener.java

@@ -2,6 +2,7 @@ package com.ytpm.summary.monitor;
 
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import com.ytpm.summary.dao.AppUserMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-vitality/vitality-service/src/main/java/com/ytpm/vitality/monitor/RedisKeyExpirationListener.java

@@ -2,6 +2,7 @@ package com.ytpm.vitality.monitor;
 
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import com.ytpm.vitality.dao.AppUserMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }
 

yt-walk/walk-service/src/main/java/com/ytpm/walk/monitor/RedisKeyExpirationListener.java

@@ -2,6 +2,7 @@ package com.ytpm.walk.monitor;
 
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.feign.RiskFeign;
 import com.ytpm.risk.enums.BannedTypeEnum;
 import com.ytpm.walk.dao.AppUserMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +26,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private AppUserMapper appUserMapper;
+    @Resource
+    private RiskFeign riskFeign;
 
     /**
      * Creates new {@link } for {@code __keyevent@*__:expired} messages.
@@ -55,6 +58,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             dyzUser.setUserId(arr[1]);
             dyzUser.setUserStatus(1);
             appUserMapper.updateUser(dyzUser);
+            riskFeign.addBlockingRecord(arr[1]);
         }
     }