错误参数调整

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

@@ -62,7 +62,7 @@ public class RiskUserHandleService {
                 if (riskUserOperateService.isInRoom(staff,Long.parseLong(roomInfo.getRoomId()),externalVid)){//risk用户在这个群内，且开关打开
                     //固定规则校验，chatId转化到roomId
                     long roomId = chatIdToRoomId(staff.getUuid(), riskUserInfo.getChatId());
-                    if ((roomInfo + "").equals(roomInfo.getRoomId())) {//匹配群
+                    if ((roomId + "").equals(roomInfo.getRoomId())) {//匹配群
                         log.info("handleRiskUser, chatIdToRoomId , staff: {}, riskUserInfo: {}", staff, riskUserInfo);
                         RiskRuleConfigService.FixedRuleResult ruleResult = riskRuleConfigService.getFixedRulesForThisChat(riskUserInfo.getChatId(),roomId +"");
                         log.info("handleRiskUser, ruleResult: {}, roomInfo: {}", ruleResult, roomInfo);

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

@@ -9,12 +9,15 @@ 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;
+import org.apache.rocketmq.shaded.org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.UUID;
+
 @RestController
 @RequestMapping("/qw")
 @Slf4j
@@ -32,12 +35,16 @@ public class ReceiveRiskInfoController {
     @UnAuth
     @PostMapping("/push/riskuser")
     public CommonResponse<RiskUserDelResult> receiveRiskUser(@RequestBody String rawJson) {
+//        String traceId = UUID.randomUUID().toString();
+//        MDC.put("traceId", traceId);
+
         log.info("receiveRiskUser, raw json: {}", rawJson);
         RiskUserInfo userInfo = JSON.parseObject(rawJson, RiskUserInfo.class); // 手动解析
         int ret =  riskUserHandleService.handleRiskUser(userInfo);
         // 创建数据对象并设置 is_del 值
         RiskUserDelResult result = new RiskUserDelResult();
         result.setIsDel(ret); // 成功为1，失败为0
+//        MDC.clear();
         return CommonResponse.success(result);
     }
 }