瀏覽代碼

增加返回数据,标识是否删除

刘立冬 1 月之前
父節點
當前提交
24cc10b028

+ 10 - 0
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/qywx/RiskUserDelResult.java

@@ -0,0 +1,10 @@
+package com.tzld.piaoquan.risk.control.model.qywx;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+@Data
+public class RiskUserDelResult {
+    @JSONField(name = "is_del")
+    private Integer isDel;
+}

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

@@ -36,14 +36,14 @@ public class RiskUserHandleService {
     private static final Logger LOGGER = LoggerFactory.getLogger(RiskUserHandleService.class);
 
 
-    public void handleRiskUser(RiskUserInfo riskUserInfo){
+    public int handleRiskUser(RiskUserInfo riskUserInfo){
         log.info("handleRiskUser, riskUserInfo: {}", riskUserInfo);
         //根据名称找到人
         List<UserBase> staffList = findStaffByName(riskUserInfo);
-        if (staffList.isEmpty()) return;
+        if (staffList.isEmpty()) return 0;
         //根据群名匹配到:人-群:哪个员工哪个群
         Map<String, List<RoomListResponse.RoomInfo>> toBeOperate = matchUserAndRoom(staffList, riskUserInfo);
-        if (toBeOperate.isEmpty()) return;
+        if (toBeOperate.isEmpty()) return 0;
         log.info("handleRiskUser, toBeOperate: {}", toBeOperate);
         //TODO:检查过滤规则是否配置
         toBeOperate = riskRuleConfigService.getKickOpenedRoom(toBeOperate);
@@ -63,10 +63,11 @@ public class RiskUserHandleService {
                 boolean success = riskUserOperateService.checkAndKickExternalUser(staff, riskUserInfo, externalVid,Long.parseLong(roomInfo.getRoomId()));
                 if (success) {
                     log.info("handleRiskUser to be kick user, vid: {},name: {}", externalVid,riskUserInfo.getExternalNickname());
-                    return;
+                    return 1;
                 }
             }
         }
+        return 0;
     }
 
     private UserBase findStaffByVid(List<UserBase> staffList, String vid) {

+ 7 - 3
risk-control-server/src/main/java/com/tzld/piaoquan/risk/control/controller/ReceiveRiskInfoController.java

@@ -4,6 +4,7 @@ import com.tzld.piaoquan.risk.control.common.annotation.UnAuth;
 import com.tzld.piaoquan.risk.control.common.base.CommonResponse;
 import com.tzld.piaoquan.risk.control.config.QywxConfig;
 import com.tzld.piaoquan.risk.control.model.qywx.QwLoginCheckCode;
+import com.tzld.piaoquan.risk.control.model.qywx.RiskUserDelResult;
 import com.tzld.piaoquan.risk.control.model.qywx.RiskUserInfo;
 import com.tzld.piaoquan.risk.control.service.impl.RiskUserHandleService;
 import lombok.extern.slf4j.Slf4j;
@@ -29,9 +30,12 @@ public class ReceiveRiskInfoController {
      */
     @UnAuth
     @PostMapping("/push/riskuser")
-    public CommonResponse<String> receiveRiskUser(@RequestBody RiskUserInfo userInfo) {
+    public CommonResponse<RiskUserDelResult> receiveRiskUser(@RequestBody RiskUserInfo userInfo) {
         log.info("receiveRiskUser, userInfo: {}", userInfo);
-        riskUserHandleService.handleRiskUser(userInfo);
-        return CommonResponse.success();
+        int ret =  riskUserHandleService.handleRiskUser(userInfo);
+        // 创建数据对象并设置 is_del 值
+        RiskUserDelResult result = new RiskUserDelResult();
+        result.setIsDel(ret); // 成功为1,失败为0
+        return CommonResponse.success(result);
     }
 }