踢人调用更改

risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/impl/RiskUserHandleService.java

@@ -67,7 +67,7 @@ public class RiskUserHandleService {
                         RiskRuleConfigService.FixedRuleResult ruleResult = riskRuleConfigService.getFixedRulesForThisChat(riskUserInfo.getChatId(),roomId +"");
                         log.info("handleRiskUser, ruleResult: {}, roomInfo: {}", ruleResult, roomInfo);
                         if(ruleResult.isNormalCountEnough && !ruleResult.isAbnormalRatioHighEnough) {//正常进入用户满足需求，且异常率符合阈值
-                            boolean success = riskUserOperateService.checkAndKickExternalUser(staff, riskUserInfo, externalVid,Long.parseLong(roomInfo.getRoomId()));
+                            boolean success = riskUserOperateService.kick(staff,Long.parseLong(roomInfo.getRoomId()),externalVid);
                             if (success) {
                                 log.info("handleRiskUser to be kick user, vid: {},name: {},chatId: {},chatName:{} ", externalVid,riskUserInfo.getExternalNickname(),riskUserInfo.getChatId(),riskUserInfo.getGroupName());
                                 return 1;

risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/impl/RiskUserOperateService.java

@@ -27,7 +27,6 @@ import java.util.*;
 public class RiskUserOperateService {
     @Autowired
     private QywxConfig qywxConfig; // 注入配置类
-
     @Autowired
     private WorkWechatRoomInfoMapper workWechatRoomInfoMapper;
     @Value("${qywx.corpid}")
@@ -48,7 +47,7 @@ public class RiskUserOperateService {
         return true;
     }
 
-    public void kick(UserBase staff, long roomId, long vid) {
+    public boolean kick(UserBase staff, long roomId, long vid) {
         Map<String, Object> requestBody = new HashMap<>();
         requestBody.put("uuid", staff.getUuid());
         requestBody.put("oprType", 1);
@@ -60,12 +59,14 @@ public class RiskUserOperateService {
             QwCommonResModel<RoomListResponse> roomInfo = QwCommonResModel.parseResponse(response.get(), RoomListResponse.class);
             if (roomInfo.getErrcode() == 0) {
                 LOGGER.info("Kick external user {} from room {} successfully", vid, roomId);
+                return true;
             } else {
                 LOGGER.error("Failed to kick external user {} from room {}: {}", vid, roomId, roomInfo.getErrmsg());
             }
         } else {
             LOGGER.error("Failed to kick external user {} from room {}: No response", vid, roomId);
         }
+        return false;
     }
 
     //增加校验，是否在群内