fix

api-module/src/main/java/com/tzld/piaoquan/api/controller/WeComThirdPartyController.java

@@ -21,8 +21,8 @@ public class WeComThirdPartyController {
     private WeComThirdPartyService service;
 
     @PostMapping("/init")
-    public CommonResponse<InitResponse> init() {
-        return CommonResponse.success(service.init());
+    public CommonResponse<InitResponse> init(@RequestBody InitRequest request) {
+        return CommonResponse.success(service.init(request));
     }
 
     @PostMapping("/setCallbackUrl")

api-module/src/main/java/com/tzld/piaoquan/api/service/WeComThirdPartyService.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 public interface WeComThirdPartyService {
 
-    InitResponse init();
+    InitResponse init(InitRequest request);
 
     void setCallbackUrl(SetCallbackUrlRequest request);
 

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformDatastatServiceImpl.java

@@ -245,14 +245,14 @@ public class ContentPlatformDatastatServiceImpl implements ContentPlatformDatast
         ContentPlatformAccount user = LoginUserContext.getUser();
         Page<GzhDatastatItemVO> result = new Page<>(param.getPageNum(), param.getPageSize());
         int offset = (param.getPageNum() - 1) * param.getPageSize();
-        int count = dataStatMapperExt.getGzhPushTotalDatastatCount(param, user.getId());
+        int count = dataStatMapperExt.getGzhPushAccountDatastatCount(param, user.getId());
         result.setTotalSize(count);
         if (count == 0) {
             return result;
         }
-        List<ContentPlatformGzhPushDataStatTotal> datastatList = dataStatMapperExt.getGzhPushTotalDatastatList(param,
+        List<ContentPlatformGzhDataStat> datastatList = dataStatMapperExt.getGzhPushAccountDatastatList(param,
                 user.getId(), offset, param.getPageSize());
-        List<GzhDatastatItemVO> list = buildGzhPushDatastatTotalItemVOList(datastatList);
+        List<GzhDatastatItemVO> list = buildGzhDatastatItemVOList(param.getType(), datastatList);
         result.setObjs(list);
         return result;
     }
@@ -284,14 +284,14 @@ public class ContentPlatformDatastatServiceImpl implements ContentPlatformDatast
         ContentPlatformAccount user = LoginUserContext.getUser();
         Page<GzhDatastatItemVO> result = new Page<>(param.getPageNum(), param.getPageSize());
         int offset = (param.getPageNum() - 1) * param.getPageSize();
-        int count = dataStatMapperExt.getGzhPushAccountDatastatCount(param, user.getId());
+        int count = dataStatMapperExt.getGzhPushTotalDatastatCount(param, user.getId());
         result.setTotalSize(count);
         if (count == 0) {
             return result;
         }
-        List<ContentPlatformGzhDataStat> datastatList = dataStatMapperExt.getGzhPushAccountDatastatList(param,
+        List<ContentPlatformGzhPushDataStatTotal> datastatList = dataStatMapperExt.getGzhPushTotalDatastatList(param,
                 user.getId(), offset, param.getPageSize());
-        List<GzhDatastatItemVO> list = buildGzhDatastatItemVOList(param.getType(), datastatList);
+        List<GzhDatastatItemVO> list = buildGzhPushDatastatTotalItemVOList(datastatList);
         result.setObjs(list);
         return result;
     }

api-module/src/main/java/com/tzld/piaoquan/api/service/impl/WeComThirdPartyServiceImpl.java

@@ -48,15 +48,17 @@ public class WeComThirdPartyServiceImpl implements WeComThirdPartyService {
     private RedisUtils redisUtils;
 
     @Override
-    public InitResponse init() {
-        InitRequest request = new InitRequest();
+    public InitResponse init(InitRequest request) {
+        if (Objects.isNull(request)) {
+            request = new InitRequest();
+        }
         request.setProxySituation(0);
         request.setDeverType("ipad");
         String response = apiClient.init(request);
         CommonResponse<InitResponse> commonResponse =
                 JSONObject.parseObject(response, new TypeReference<CommonResponse<InitResponse>>() {});
         if (commonResponse.getErrcode() != 0) {
-            log.error("WeComThirdPartyService init failed, response: {}", response);
+            log.error("WeComThirdPartyService init failed, request: {}, response: {}", request, response);
             return null;
         }
         return commonResponse.getData();
@@ -73,7 +75,7 @@ public class WeComThirdPartyServiceImpl implements WeComThirdPartyService {
         CommonResponse<QrCodeResponse> commonResponse =
                 JSONObject.parseObject(response, new TypeReference<CommonResponse<QrCodeResponse>>() {});
         if (commonResponse.getErrcode() != 0) {
-            log.error("WeComThirdPartyService get qr code failed, response: {}", response);
+            log.error("WeComThirdPartyService get qr code failed, request: {}, response: {}", request, response);
             return null;
         }
         return commonResponse.getData();
@@ -90,7 +92,7 @@ public class WeComThirdPartyServiceImpl implements WeComThirdPartyService {
         CommonResponse<SecondaryValidationResponse> commonResponse =
                 JSONObject.parseObject(response, new TypeReference<CommonResponse<SecondaryValidationResponse>>() {});
         if (commonResponse.getErrcode() != 0) {
-            log.error("WeComThirdPartyService secondary validation failed, response: {}", response);
+            log.error("WeComThirdPartyService secondary validation failed, request: {}, response: {}", request, response);
             return null;
         }
         return commonResponse.getData().getQrcode();
@@ -102,7 +104,7 @@ public class WeComThirdPartyServiceImpl implements WeComThirdPartyService {
         CommonResponse<LoginInfo> commonResponse =
                 JSONObject.parseObject(response, new TypeReference<CommonResponse<LoginInfo>>() {});
         if (commonResponse.getErrcode() != 0) {
-            log.error("WeComThirdPartyService get run client by uuid failed, response: {}", response);
+            log.error("WeComThirdPartyService get run client by uuid failed, request: {}, response: {}", request, response);
             return null;
         }
         new Thread(() -> saveStaffDetail(commonResponse.getData())).start();
@@ -208,7 +210,7 @@ public class WeComThirdPartyServiceImpl implements WeComThirdPartyService {
             CommonResponse<GetInnerContactsResponse> commonResponse =
                     JSONObject.parseObject(response, new TypeReference<CommonResponse<GetInnerContactsResponse>>() {});
             if (commonResponse.getErrcode() != 0) {
-                log.error("WeComThirdPartyService get inner contacts failed, response: {}", response);
+                log.error("WeComThirdPartyService get inner contacts failed, request: {}, response: {}", request, response);
                 return result;
             }
             result.addAll(commonResponse.getData().getList());
@@ -231,7 +233,7 @@ public class WeComThirdPartyServiceImpl implements WeComThirdPartyService {
             CommonResponse<ExternalContactsResponse> commonResponse =
                     JSONObject.parseObject(response, new TypeReference<CommonResponse<ExternalContactsResponse>>() {});
             if (commonResponse.getErrcode() != 0) {
-                log.error("WeComThirdPartyService get external contacts failed, response: {}", response);
+                log.error("WeComThirdPartyService get external contacts failed, request: {}, response: {}", request, response);
                 return result;
             }
             result.addAll(commonResponse.getData().getList());
@@ -254,7 +256,7 @@ public class WeComThirdPartyServiceImpl implements WeComThirdPartyService {
             CommonResponse<GetChatroomMembersResponse> commonResponse =
                     JSONObject.parseObject(response, new TypeReference<CommonResponse<GetChatroomMembersResponse>>() {});
             if (commonResponse.getErrcode() != 0) {
-                log.error("WeComThirdPartyService get chatroom members failed, response: {}", response);
+                log.error("WeComThirdPartyService get chatroom members failed, request: {}, response: {}", request, response);
                 return result;
             }
             result.addAll(commonResponse.getData().getRoomList());
@@ -270,7 +272,7 @@ public class WeComThirdPartyServiceImpl implements WeComThirdPartyService {
         CommonResponse<GetRoomUserListResponse> commonResponse =
                 JSONObject.parseObject(response, new TypeReference<CommonResponse<GetRoomUserListResponse>>() {});
         if (commonResponse.getErrcode() != 0) {
-            log.error("WeComThirdPartyService get room user list failed, response: {}", response);
+            log.error("WeComThirdPartyService get room user list failed, request: {}, response: {}", request, response);
             return result;
         }
         result.addAll(commonResponse.getData().getMember_list());
@@ -283,7 +285,7 @@ public class WeComThirdPartyServiceImpl implements WeComThirdPartyService {
         CommonResponse<CdnUploadImgLinkResponse> commonResponse =
                 JSONObject.parseObject(response, new TypeReference<CommonResponse<CdnUploadImgLinkResponse>>() {});
         if (commonResponse.getErrcode() != 0) {
-            log.error("WeComThirdPartyService cdn upload img link failed, response: {}", response);
+            log.error("WeComThirdPartyService cdn upload img link failed, request: {}, response: {}", request, response);
             return null;
         }
         return commonResponse.getData();
@@ -295,7 +297,7 @@ public class WeComThirdPartyServiceImpl implements WeComThirdPartyService {
         CommonResponse<SendAppMsgResponse> commonResponse =
                 JSONObject.parseObject(response, new TypeReference<CommonResponse<SendAppMsgResponse>>() {});
         if (commonResponse.getErrcode() != 0) {
-            log.error("WeComThirdPartyService send app msg failed, response: {}", response);
+            log.error("WeComThirdPartyService send app msg failed, request: {}, response: {}", request, response);
         }
     }
 
@@ -319,7 +321,7 @@ public class WeComThirdPartyServiceImpl implements WeComThirdPartyService {
         CommonResponse<CreateRoomWxResponse> commonResponse =
                 JSONObject.parseObject(response, new TypeReference<CommonResponse<CreateRoomWxResponse>>() {});
         if (commonResponse.getErrcode() != 0) {
-            log.error("WeComThirdPartyService create room failed, response: {}", response);
+            log.error("WeComThirdPartyService create room failed, request: {}, response: {}", request, response);
             ThirdPartWeComStaff staff = getStaffByUuid(request.getUuid());
             LarkRobotUtil.sendWeComThirdPartMessage(
                     "【建群失败通知】\n" +
@@ -344,7 +346,7 @@ public class WeComThirdPartyServiceImpl implements WeComThirdPartyService {
                     JSONObject.parseObject(response, new TypeReference<CommonResponse<AntiSpamRuleResponse>>() {
                     });
             if (commonResponse.getErrcode() != 0) {
-                log.error("WeComThirdPartyService query crm AntiSpamRule failed, response: {}", response);
+                log.error("WeComThirdPartyService query crm AntiSpamRule failed, request: {}, response: {}", request, response);
                 return result;
             }
             result.addAll(commonResponse.getData().getList());
@@ -400,7 +402,8 @@ public class WeComThirdPartyServiceImpl implements WeComThirdPartyService {
         String res = apiClient.invitationToRoom(request);
         CommonResponse<String> commonResponse = JSONObject.parseObject(res, new TypeReference<CommonResponse<String>>() {});
         if (commonResponse.getErrcode() != 0) {
-            log.error("WeComThirdPartyService invitationToRoom error, roomId: {}, vids: {}, errMsg: {}", request.getRoomid(), request.getVids(), commonResponse.getErrmsg());
+            log.error("WeComThirdPartyService invitationToRoom error, roomId: {}, vids: {}, errMsg: {}",
+                    request.getRoomid(), request.getVids(), commonResponse.getErrmsg());
             ThirdPartWeComStaff staff = getStaffByUuid(request.getUuid());
             ThirdPartWeComRoom room = getRoomByRoomId(request.getRoomid());
             LarkRobotUtil.sendWeComThirdPartMessage(