From 4e64acf8a2ffe154cef3b0275fe68dc0c42fc27b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sat, 6 Apr 2019 01:19:56 +0800 Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20Upgrading=20dependencies.=20spri?= =?UTF-8?q?ng=20boot=202.1.4=20:sparkles:=20=E6=B7=BB=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E7=89=B9=E6=80=A7=E3=80=82=20=E5=85=AC=E4=BC=97=E5=8F=B7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-common/pigx-common-bom/pom.xml | 2 +- .../mp/controller/WxAccountController.java | 11 +++ .../pigx/mp/service/WxAccountService.java | 9 +++ .../mp/service/impl/WxAccountServiceImpl.java | 67 +++++++++++++++++++ pom.xml | 8 +-- 5 files changed, 92 insertions(+), 5 deletions(-) diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 872624c8c..76a64821e 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -18,7 +18,7 @@ 2.8.0 3.1.0 - 8.0.13 + 8.0.15 1.5.22 3.3.0 diff --git a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java index e7fb20a8a..e6806732e 100755 --- a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java +++ b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java @@ -133,4 +133,15 @@ public class WxAccountController { return new R<>(wxAccountService.list()); } + /** + * 获取公众号接口数据 + * + * @param appId 公众号 + * @param interval 时间间隔 + * @return + */ + @GetMapping("/statistics") + public R statistics(String appId, String interval) { + return wxAccountService.statistics(appId, interval); + } } diff --git a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/WxAccountService.java b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/WxAccountService.java index 926091d84..ab59a9601 100755 --- a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/WxAccountService.java +++ b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/WxAccountService.java @@ -35,4 +35,13 @@ public interface WxAccountService extends IService { * @return */ R generateQr(String appId); + + /** + * 获取公众号统计数据 + * + * @param appId + * @param interval + * @return + */ + R statistics(String appId, String interval); } diff --git a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountServiceImpl.java b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountServiceImpl.java index d5cbe95e3..1f9b6bbb6 100755 --- a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountServiceImpl.java +++ b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountServiceImpl.java @@ -16,6 +16,7 @@ */ package com.pig4cloud.pigx.mp.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.common.core.constant.CommonConstants; @@ -26,10 +27,20 @@ import com.pig4cloud.pigx.mp.mapper.WxAccountMapper; import com.pig4cloud.pigx.mp.service.WxAccountService; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; +import me.chanjar.weixin.mp.api.WxMpDataCubeService; import me.chanjar.weixin.mp.api.WxMpService; +import me.chanjar.weixin.mp.bean.datacube.WxDataCubeArticleResult; +import me.chanjar.weixin.mp.bean.datacube.WxDataCubeInterfaceResult; +import me.chanjar.weixin.mp.bean.datacube.WxDataCubeMsgResult; +import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserCumulate; import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + /** * 公众号账户 * @@ -66,4 +77,60 @@ public class WxAccountServiceImpl extends ServiceImpl> result = new ArrayList<>(); + try { + // 获取累计用户数据 + List cumulateList = cubeService.getUserCumulate(start, end).stream() + .map(WxDataCubeUserCumulate::getCumulateUser) + .collect(Collectors.toList()); + result.add(cumulateList); + + // 获取用户分享数据 + List shareList = cubeService.getUserShare(start, end).stream() + .map(WxDataCubeArticleResult::getShareCount) + .collect(Collectors.toList()); + result.add(shareList); + + // 获取消息发送概况数据 + List upstreamList = cubeService.getUpstreamMsg(start, end).stream() + .map(WxDataCubeMsgResult::getMsgCount) + .collect(Collectors.toList()); + result.add(upstreamList); + + // 获取接口调用概况数据 + List interfaceSummaryList = cubeService.getInterfaceSummary(start, end); + List interfaceList = interfaceSummaryList.stream() + .map(WxDataCubeInterfaceResult::getCallbackCount) + .collect(Collectors.toList()); + result.add(interfaceList); + + // 接口日期保存 + List dateList = interfaceSummaryList.stream() + .map(WxDataCubeInterfaceResult::getRefDate) + .collect(Collectors.toList()); + result.add(dateList); + } catch (WxErrorException e) { + log.error(" 获取公众号统计数据报错", e); + return R.builder().code(CommonConstants.FAIL).msg("获取公众号数据失败:" + e.getError().getErrorMsg()).build(); + } + + return R.builder().data(result).build(); + } } diff --git a/pom.xml b/pom.xml index 8fbf48b0a..0aaa086db 100644 --- a/pom.xml +++ b/pom.xml @@ -42,14 +42,14 @@ - 2.1.3.RELEASE + 2.1.4.RELEASE Greenwich.SR1 - Cairo-SR7 + Cairo-SR8 UTF-8 1.8 1.8 2.1.3 - 4.4.5 + 4.5.3 0.0.9 2.9.2 2.10.0 @@ -57,7 +57,7 @@ 4.1.0 2.1.1 2.10.2 - 6.0.2 + 6.0.4 2.1.5 2.3.5.RELEASE 2.1.2.RELEASE