完善企微登录接口入参

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

@@ -7,7 +7,7 @@ import com.tzld.piaoquan.risk.control.model.qywx.QwLoginCheckCode;
 import com.tzld.piaoquan.risk.control.model.qywx.QwLoginQRCodeModel;
 
 public interface QwLoginService {
-    QwCommonResModel<QwLoginQRCodeModel> getLoginQRCode(String vid,String phoneNumber);
+    QwCommonResModel<QwLoginQRCodeModel> getLoginQRCode(String vid);
     int checkQRCode(QwLoginCheckCode checkQrcode);
     String getRunClients();
     UserBase checkLogin(String uuid);

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

@@ -35,11 +35,11 @@ public class QwLoginServiceImpl implements QwLoginService {
     @Value("${qwcallback.url}")
     private String qwCallbackUrl;
     private static final Logger LOGGER = LoggerFactory.getLogger(QwLoginServiceImpl.class);
+    @Autowired
     private UserBaseMapper userBaseMapper;
 
     @Override
-    public QwCommonResModel<QwLoginQRCodeModel> getLoginQRCode(String vid, String platformPhone) {
-//        UserBase user = qwUserService.getUserByMobile(platformPhone);
+    public QwCommonResModel<QwLoginQRCodeModel> getLoginQRCode(String vid) {
         String uuid = "";
         uuid = initUUID(vid);
         // TODO 写入平台库表：platformPhone关联的uuid
@@ -111,6 +111,8 @@ public class QwLoginServiceImpl implements QwLoginService {
             System.out.println("init,response: " + response);
             QwCommonResModel<QwInitResponseModel> initModel = QwCommonResModel.parseResponse(response.get(), QwInitResponseModel.class);
             String uuid = initModel.getData().getUuid();
+            LOGGER.info("init success,uuid: {},platform user id:{}", uuid, userId);
+            System.out.println("init success,uuid: " + uuid);
             this.saveUserBaseUUID(uuid, userId);
             return uuid;
         } else {

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

@@ -1,12 +1,22 @@
 package com.tzld.piaoquan.risk.control.service.impl;
 
+import com.tzld.piaoquan.risk.control.model.qywx.RoomListResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 @Slf4j
 @Service
 public class RiskRuleConfigService {
-
-
+//    @Autowired
+//
+//    //过滤规则，打开开关的群生效
+//    Map<String, List<RoomListResponse.RoomInfo>> kickOpenedRoom(Map<String, List<RoomListResponse.RoomInfo>> tobeOperate) {
+//        Map<String, List<RoomListResponse.RoomInfo>> filterdMap = tobeOperate;
+//        return null;
+//    }
 
 }

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

@@ -25,6 +25,9 @@ public class RiskUserHandleService {
     private QywxUserDataService qwUserService;
     @Autowired
     private RiskUserOperateService riskUserOperateService;
+    @Autowired
+    private RiskRuleConfigService riskRuleConfigService;
+
     @Value("${qywx.corpid}")
     private String corpid;
     @Value("${qywx.scorpid}")
@@ -50,6 +53,9 @@ public class RiskUserHandleService {
         if (toBeOperate.isEmpty()) return;
         log.info("handleRiskUser, toBeOperate: {}", toBeOperate);
         //TODO:检查过滤规则是否配置
+//        riskRuleConfigService.isKickOpen()
+
+
         //找到待踢的人,找到终止
         for (Map.Entry<String, List<RoomListResponse.RoomInfo>> entry : toBeOperate.entrySet()) {
             String staffVid = entry.getKey(); // Key: staff vid内部员工

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

@@ -38,10 +38,9 @@ public class QwLoginController {
 
     @PostMapping("/getQrCode")
     public CommonResponse<QwLoginQRCodeModel> getQrCode(@RequestBody Map<String, String> request) {
-        String phoneNumber = request.get("qwPhoneNum");
         String vid = request.get("vid");
-        LOGGER.info("getQrCode,phoneNumber: {}, vid: {}", phoneNumber, vid);
-        QwCommonResModel<QwLoginQRCodeModel> loginModel = qwLoginService.getLoginQRCode(vid,phoneNumber);
+        LOGGER.info("getQrCode, vid: {}", vid);
+        QwCommonResModel<QwLoginQRCodeModel> loginModel = qwLoginService.getLoginQRCode(vid);
         return CommonResponse.success(loginModel.getData());
     }