From 6d48a6b5b05f0b4bf711dd8da7361f2095e81821 Mon Sep 17 00:00:00 2001 From: winnie Date: Tue, 10 Sep 2024 10:15:52 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E3=80=90=E8=A7=86=E9=A2=91=E5=8F=B7?= =?UTF-8?q?=E3=80=91=E6=96=B0=E5=A2=9E=E8=A7=86=E9=A2=91=E5=8F=B7=E5=8A=A9?= =?UTF-8?q?=E6=89=8B-=E7=9B=B4=E6=92=AD=E5=A4=A7=E5=B1=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E3=80=81=E7=BD=97=E7=9B=98=E8=BE=BE=E4=BA=BA=E7=89=88?= =?UTF-8?q?API=E6=8E=A5=E5=8F=A3=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/WxChannelCompassFinderService.java | 58 +++ .../api/WxChannelLiveDashboardService.java | 34 ++ .../weixin/channel/api/WxChannelService.java | 15 + .../api/impl/BaseWxChannelServiceImpl.java | 11 + .../WxChannelCompassFinderServiceImpl.java | 54 +++ .../WxChannelLiveDashboardServiceImpl.java | 81 ++++ .../finder/CompassFinderBaseParam.java | 30 ++ .../channel/bean/compass/finder/Field.java | 33 ++ .../bean/compass/finder/FieldData.java | 32 ++ .../channel/bean/compass/finder/Overall.java | 56 +++ .../bean/compass/finder/OverallResponse.java | 27 ++ .../compass/finder/ProductCompassData.java | 170 +++++++++ .../bean/compass/finder/ProductDataParam.java | 33 ++ .../compass/finder/ProductDataResponse.java | 27 ++ .../bean/compass/finder/ProductInfo.java | 68 ++++ .../compass/finder/ProductListResponse.java | 29 ++ .../bean/compass/finder/SaleProfileData.java | 27 ++ .../compass/finder/SaleProfileDataParam.java | 33 ++ .../finder/SaleProfileDataResponse.java | 27 ++ .../bean/live/dashboard/ConversionMetric.java | 61 +++ .../channel/bean/live/dashboard/DataNode.java | 26 ++ .../bean/live/dashboard/DataNodeList.java | 32 ++ .../live/dashboard/DataNodeSecondList.java | 33 ++ .../live/dashboard/DataNodeThirdList.java | 33 ++ .../bean/live/dashboard/Dimension.java | 38 ++ .../channel/bean/live/dashboard/Ended.java | 44 +++ .../bean/live/dashboard/EndedIndexItem.java | 38 ++ .../channel/bean/live/dashboard/Fields.java | 38 ++ .../live/dashboard/ItemConversionMetric.java | 44 +++ .../live/dashboard/LiveComparisonIndex.java | 38 ++ .../live/dashboard/LiveDashboardData.java | 38 ++ .../live/dashboard/LiveDashboardData2.java | 38 ++ .../dashboard/LiveDashboardData2Portrait.java | 33 ++ .../dashboard/LiveDashboardData2Source.java | 27 ++ .../dashboard/LiveDashboardData2Summary.java | 80 ++++ .../bean/live/dashboard/LiveDataParam.java | 30 ++ .../bean/live/dashboard/LiveDataResponse.java | 69 ++++ .../dashboard/LiveDistChannelSourceStats.java | 81 ++++ .../LiveDistributionByFlowTypeStat.java | 81 ++++ .../dashboard/LiveDistributionChannel.java | 51 +++ .../dashboard/LiveDistributionSceneStat.java | 75 ++++ .../dashboard/LiveEcConversionMetric.java | 32 ++ .../live/dashboard/LiveEcDataSummary.java | 212 +++++++++++ .../bean/live/dashboard/LiveEcProfile.java | 33 ++ .../channel/bean/live/dashboard/LiveItem.java | 32 ++ .../bean/live/dashboard/LiveListParam.java | 30 ++ .../bean/live/dashboard/LiveListResponse.java | 41 ++ .../channel/bean/live/dashboard/OnAir.java | 44 +++ .../bean/live/dashboard/OnAirIndexItem.java | 56 +++ .../channel/bean/live/dashboard/Point.java | 32 ++ .../live/dashboard/QuarterlyGrowthRate.java | 32 ++ .../channel/bean/live/dashboard/Series.java | 51 +++ .../dashboard/SingleLiveEcSpuDataPageV2.java | 39 ++ .../bean/live/dashboard/SpuBaseData.java | 68 ++++ .../channel/bean/live/dashboard/SpuData.java | 350 ++++++++++++++++++ .../SubLiveDistChannelSourceStats.java | 92 +++++ .../constant/WxChannelApiUrlConstants.java | 40 ++ .../weixin/channel/enums/DimensionType.java | 80 ++++ .../channel/enums/EcProfileDataNodeKey.java | 64 ++++ .../enums/LiveDistributionFlowType.java | 56 +++ .../enums/LiveDistributionSceneType.java | 52 +++ .../channel/enums/SaleProfileUserType.java | 56 +++ ...WxChannelCompassFinderServiceImplTest.java | 66 ++++ ...WxChannelLiveDashboardServiceImplTest.java | 44 +++ 64 files changed, 3475 insertions(+) create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelCompassFinderService.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelLiveDashboardService.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassFinderServiceImpl.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelLiveDashboardServiceImpl.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/CompassFinderBaseParam.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/Field.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/FieldData.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/Overall.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/OverallResponse.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductCompassData.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductDataParam.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductDataResponse.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductInfo.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductListResponse.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/SaleProfileData.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/SaleProfileDataParam.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/SaleProfileDataResponse.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/ConversionMetric.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNode.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNodeList.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNodeSecondList.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNodeThirdList.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Dimension.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Ended.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/EndedIndexItem.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Fields.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/ItemConversionMetric.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveComparisonIndex.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Portrait.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Source.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Summary.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDataParam.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDataResponse.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistChannelSourceStats.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistributionByFlowTypeStat.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistributionChannel.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistributionSceneStat.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveEcConversionMetric.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveEcDataSummary.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveEcProfile.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveItem.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveListParam.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveListResponse.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/OnAir.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/OnAirIndexItem.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Point.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/QuarterlyGrowthRate.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Series.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SingleLiveEcSpuDataPageV2.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SpuBaseData.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SpuData.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SubLiveDistChannelSourceStats.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/DimensionType.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/EcProfileDataNodeKey.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/LiveDistributionFlowType.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/LiveDistributionSceneType.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/SaleProfileUserType.java create mode 100644 weixin-java-channel/src/test/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassFinderServiceImplTest.java create mode 100644 weixin-java-channel/src/test/java/me/chanjar/weixin/channel/api/impl/WxChannelLiveDashboardServiceImplTest.java diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelCompassFinderService.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelCompassFinderService.java new file mode 100644 index 0000000000..db123f61a4 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelCompassFinderService.java @@ -0,0 +1,58 @@ +package me.chanjar.weixin.channel.api; + +import me.chanjar.weixin.channel.bean.compass.finder.OverallResponse; +import me.chanjar.weixin.channel.bean.compass.finder.ProductDataResponse; +import me.chanjar.weixin.channel.bean.compass.finder.ProductListResponse; +import me.chanjar.weixin.channel.bean.compass.finder.SaleProfileDataResponse; +import me.chanjar.weixin.common.error.WxErrorException; + +/** + * 视频号助手 罗盘达人版服务 + * + * @author Winnie + */ +public interface WxChannelCompassFinderService { + + /** + * 获取电商概览数据 + * + * @param ds 日期，格式 yyyyMMdd + * @return 电商概览数据 + * + * @throws WxErrorException 异常 + */ + OverallResponse getOverall(String ds) throws WxErrorException; + + /** + * 获取带货商品数据 + * + * @param ds 日期，格式 yyyyMMdd + * @param productId 商品id + * @return 带货商品数据 + * + * @throws WxErrorException 异常 + */ + ProductDataResponse getProductData(String ds, String productId) throws WxErrorException; + + /** + * 获取带货商品列表 + * + * @param ds 日期，格式 yyyyMMdd + * @return 带货商品列表 + * + * @throws WxErrorException 异常 + */ + ProductListResponse getProductList(String ds) throws WxErrorException; + + /** + * 获取带货人群数据 + * + * @param ds 日期，格式 yyyyMMdd + * @param type 用户类型，1=商品曝光用户, 2=商品点击用户, 3=购买用户, 4=首购用户, 5=复购用户, 6=直播观看用户 + * @return 带货人群数据 + * + * @throws WxErrorException 异常 + */ + SaleProfileDataResponse getSaleProfileData(String ds, Integer type) throws WxErrorException; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelLiveDashboardService.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelLiveDashboardService.java new file mode 100644 index 0000000000..be93b06a97 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelLiveDashboardService.java @@ -0,0 +1,34 @@ +package me.chanjar.weixin.channel.api; + +import me.chanjar.weixin.channel.bean.live.dashboard.LiveDataResponse; +import me.chanjar.weixin.channel.bean.live.dashboard.LiveListResponse; +import me.chanjar.weixin.common.error.WxErrorException; + +/** + * 视频号助手 直播大屏数据服务 + * + * @author Winnie + */ +public interface WxChannelLiveDashboardService { + + /** + * 获取直播大屏直播列表 + * + * @param ds 日期，格式 yyyyMMdd + * @return 播大屏直播列表 + * + * @throws WxErrorException 异常 + */ + LiveListResponse getLiveList(Long ds) throws WxErrorException; + + /** + * 获取直播大屏数据 + * + * @param exportId 直播唯一ID + * @return 播大屏数据 + * + * @throws WxErrorException 异常 + */ + LiveDataResponse getLiveData(String exportId) throws WxErrorException; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelService.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelService.java index 9d10f51c06..48d82206b3 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelService.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelService.java @@ -147,4 +147,19 @@ public interface WxChannelService extends BaseWxChannelService { * @return 会员服务 */ WxChannelVipService getVipService(); + + /** + * 视频号助手-罗盘达人版服务 + * + * @return 罗盘达人版服务 + */ + WxChannelCompassFinderService getCompassFinderService(); + + /** + * 视频号助手-直播大屏数据服务 + * + * @return 直播大屏数据服务 + */ + WxChannelLiveDashboardService getLiveDashboardService(); + } diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelServiceImpl.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelServiceImpl.java index 307a9e77d1..c9f874c99e 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelServiceImpl.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelServiceImpl.java @@ -55,6 +55,10 @@ public abstract class BaseWxChannelServiceImpl implements WxChannelService private WxFinderLiveService finderLiveService = null; private WxAssistantService assistantService = null; private WxChannelVipService vipService = new WxChannelVipServiceImpl(this); + private final WxChannelCompassFinderService compassFinderService = + new WxChannelCompassFinderServiceImpl(this); + private final WxChannelLiveDashboardService liveDashboardService = + new WxChannelLiveDashboardServiceImpl(this); protected WxChannelConfig config; private int retrySleepMillis = 1000; @@ -411,4 +415,11 @@ public WxAssistantService getAssistantService() { public WxChannelVipService getVipService() { return vipService; } + + @Override + public WxChannelCompassFinderService getCompassFinderService() { return compassFinderService; } + + @Override + public WxChannelLiveDashboardService getLiveDashboardService() { return liveDashboardService; } + } diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassFinderServiceImpl.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassFinderServiceImpl.java new file mode 100644 index 0000000000..34bead89d6 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassFinderServiceImpl.java @@ -0,0 +1,54 @@ +package me.chanjar.weixin.channel.api.impl; + +import lombok.extern.slf4j.Slf4j; +import me.chanjar.weixin.channel.api.WxChannelCompassFinderService; +import me.chanjar.weixin.channel.bean.compass.finder.*; +import me.chanjar.weixin.channel.util.ResponseUtils; +import me.chanjar.weixin.common.error.WxErrorException; + +import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.CompassFinder.*; + +/** + * 视频号助手 罗盘达人版服务实现 + * + * @author Winnie + */ +@Slf4j +public class WxChannelCompassFinderServiceImpl implements WxChannelCompassFinderService { + + /** + * 微信商店服务 + */ + private final BaseWxChannelServiceImpl shopService; + + public WxChannelCompassFinderServiceImpl(BaseWxChannelServiceImpl shopService) {this.shopService = shopService;} + + @Override + public OverallResponse getOverall(String ds) throws WxErrorException { + CompassFinderBaseParam param = new CompassFinderBaseParam(ds); + String resJson = shopService.post(GET_OVERALL_URL, param); + return ResponseUtils.decode(resJson, OverallResponse.class); + } + + @Override + public ProductDataResponse getProductData(String ds, String productId) throws WxErrorException { + ProductDataParam param = new ProductDataParam(ds, productId); + String resJson = shopService.post(GET_PRODUCT_DATA_URL, param); + return ResponseUtils.decode(resJson, ProductDataResponse.class); + } + + @Override + public ProductListResponse getProductList(String ds) throws WxErrorException { + CompassFinderBaseParam param = new CompassFinderBaseParam(ds); + String resJson = shopService.post(GET_PRODUCT_LIST_URL, param); + return ResponseUtils.decode(resJson, ProductListResponse.class); + } + + @Override + public SaleProfileDataResponse getSaleProfileData(String ds, Integer type) throws WxErrorException { + SaleProfileDataParam param = new SaleProfileDataParam(ds, type); + String resJson = shopService.post(GET_SALE_PROFILE_DATA_URL, param); + return ResponseUtils.decode(resJson, SaleProfileDataResponse.class); + } + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelLiveDashboardServiceImpl.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelLiveDashboardServiceImpl.java new file mode 100644 index 0000000000..7c9c876e9b --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelLiveDashboardServiceImpl.java @@ -0,0 +1,81 @@ +package me.chanjar.weixin.channel.api.impl; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import lombok.extern.slf4j.Slf4j; +import me.chanjar.weixin.channel.api.WxChannelLiveDashboardService; +import me.chanjar.weixin.channel.bean.live.dashboard.LiveDataParam; +import me.chanjar.weixin.channel.bean.live.dashboard.LiveDataResponse; +import me.chanjar.weixin.channel.bean.live.dashboard.LiveListParam; +import me.chanjar.weixin.channel.bean.live.dashboard.LiveListResponse; +import me.chanjar.weixin.channel.util.ResponseUtils; +import me.chanjar.weixin.common.error.WxErrorException; +import org.apache.commons.lang3.ObjectUtils; + +import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.LiveDashboard.*; + +/** + * 视频号助手 直播大屏数据服务实现 + * + * @author Winnie + */ +@Slf4j +public class WxChannelLiveDashboardServiceImpl implements WxChannelLiveDashboardService { + + /** + * 微信商店服务 + */ + private final BaseWxChannelServiceImpl shopService; + private final ObjectMapper objectMapper = new ObjectMapper(); + + public WxChannelLiveDashboardServiceImpl(BaseWxChannelServiceImpl shopService) {this.shopService = shopService;} + + @Override + public LiveListResponse getLiveList(Long ds) throws WxErrorException { + LiveListParam param = new LiveListParam(ds); + String resJson = shopService.post(GET_LIVE_LIST_URL, param); + return ResponseUtils.decode(resJson, LiveListResponse.class); + } + + @Override + public LiveDataResponse getLiveData(String exportId) throws WxErrorException { + LiveDataParam param = new LiveDataParam(exportId); + String resJson = shopService.post(GET_LIVE_DATA_URL, param); + return this.convertLiveDataResponse(resJson); + } + + /** + * 微信接口获取直播数据中存在非标准JSON，方便业务处理返回前做好解析 + * 处理参数： + * live_dashboard_data，live_comparison_index，live_ec_data_summary，live_ec_conversion_metric， + * live_ec_profile，live_distribution_channel，single_live_ec_spu_data_page_v2 + * + * @param resJson 直播数据返回JSON + * @return LiveDataResponse + * + * @throws WxErrorException 异常 + */ + private LiveDataResponse convertLiveDataResponse(String resJson) throws WxErrorException { + try { + ObjectNode rootNode = (ObjectNode) objectMapper.readTree(resJson); + String[] dataKeyArray = new String[] { + "live_dashboard_data", "live_comparison_index", "live_ec_data_summary", "live_ec_conversion_metric", + "live_ec_profile", "live_distribution_channel", "single_live_ec_spu_data_page_v2" + }; + for(String dataKey : dataKeyArray) { + JsonNode jsonNode = rootNode.get(dataKey); + if (ObjectUtils.isNotEmpty(jsonNode)) { + JsonNode dataJsonNode = objectMapper.readTree(jsonNode.asText()); + rootNode.set(dataKey, dataJsonNode); + } + } + String json = objectMapper.writeValueAsString(rootNode); + return ResponseUtils.decode(json, LiveDataResponse.class); + } catch (JsonProcessingException e) { + throw new WxErrorException(e); + } + } + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/CompassFinderBaseParam.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/CompassFinderBaseParam.java new file mode 100644 index 0000000000..78e088f9ec --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/CompassFinderBaseParam.java @@ -0,0 +1,30 @@ +package me.chanjar.weixin.channel.bean.compass.finder; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 获取达人罗盘数据通用请求参数 + * + * @author Winnie + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class CompassFinderBaseParam implements Serializable { + + private static final long serialVersionUID = - 4900361041041434435L; + + /** + * 日期，格式 yyyyMMdd + */ + @JsonProperty("ds") + private String ds; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/Field.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/Field.java new file mode 100644 index 0000000000..a23cde1878 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/Field.java @@ -0,0 +1,33 @@ +package me.chanjar.weixin.channel.bean.compass.finder; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 维度数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class Field implements Serializable { + + private static final long serialVersionUID = - 4243469984232948689L; + + /** + * 维度类别名 + */ + @JsonProperty("field_name") + private String fieldName; + + /** + * 维度指标数据列表 + */ + @JsonProperty("data_list") + private List dataList; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/FieldData.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/FieldData.java new file mode 100644 index 0000000000..a8b82c8326 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/FieldData.java @@ -0,0 +1,32 @@ +package me.chanjar.weixin.channel.bean.compass.finder; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 维度指标数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class FieldData implements Serializable { + + private static final long serialVersionUID = - 4022953139259283599L; + + /** + * 维度指标名 + */ + @JsonProperty("dim_key") + private String dimKey; + + /** + * 维度指标值 + */ + @JsonProperty("dim_value") + private String dimValue; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/Overall.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/Overall.java new file mode 100644 index 0000000000..ab77df0f97 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/Overall.java @@ -0,0 +1,56 @@ +package me.chanjar.weixin.channel.bean.compass.finder; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 电商概览数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class Overall implements Serializable { + + private static final long serialVersionUID = 2456038666608345011L; + + /** + * 成交金额，单位分 + */ + @JsonProperty("pay_gmv") + private String payGmv; + + /** + * 直播成交金额，单位分 + */ + @JsonProperty("live_pay_gmv") + private String livePayGmv; + + /** + * 短视频成交金额，单位分 + */ + @JsonProperty("feed_pay_gmv") + private String feedPayGmv; + + /** + * 橱窗成交金额，单位分 + */ + @JsonProperty("window_pay_gmv") + private String windowPayGmv; + + /** + * 商品分享支付金额，单位分 + */ + @JsonProperty("product_pay_gmv") + private String productPayGmv; + + /** + * 其他渠道成交金额，单位分 + */ + @JsonProperty("other_pay_gmv") + private String otherPayGmv; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/OverallResponse.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/OverallResponse.java new file mode 100644 index 0000000000..8331726c13 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/OverallResponse.java @@ -0,0 +1,27 @@ +package me.chanjar.weixin.channel.bean.compass.finder; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse; + +/** + * 获取电商概览数据响应 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class OverallResponse extends WxChannelBaseResponse { + + private static final long serialVersionUID = 6350218415876820956L; + + /** + * 电商概览数据 + */ + @JsonProperty("data") + private Overall data; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductCompassData.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductCompassData.java new file mode 100644 index 0000000000..d84c8d367b --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductCompassData.java @@ -0,0 +1,170 @@ +package me.chanjar.weixin.channel.bean.compass.finder; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 商品罗盘数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class ProductCompassData implements Serializable { + + private static final long serialVersionUID = - 1009289493985863096L; + + /** + * 成交金额 + */ + @JsonProperty("pay_gmv") + private String payGmv; + + /** + * 下单金额（单位：分） + */ + @JsonProperty("create_gmv") + private String createGmv; + + /** + * 下单订单数 + */ + @JsonProperty("create_cnt") + private String createCnt; + + /** + * 下单人数 + */ + @JsonProperty("create_uv") + private String createUv; + + /** + * 下单件数 + */ + @JsonProperty("create_product_cnt") + private String createProductCnt; + + /** + * 成交订单数 + */ + @JsonProperty("pay_cnt") + private String payCnt; + + /** + * 成交人数 + */ + @JsonProperty("pay_uv") + private String payUv; + + /** + * 成交件数 + */ + @JsonProperty("pay_product_cnt") + private String payProductCnt; + + /** + * 成交金额（剔除退款）（单位：分） + */ + @JsonProperty("pure_pay_gmv") + private String purePayGmv; + + /** + * 成交客单价（单位：分) + */ + @JsonProperty("pay_gmv_per_uv") + private String payGmvPerUv; + + /** + * 实际结算金额（单位：分） + */ + @JsonProperty("actual_commission") + private String actualCommission; + + /** + * 预估佣金金额（单位：分） + */ + @JsonProperty("predict_commission") + private String predictCommission; + + /** + * 商品点击人数 + */ + @JsonProperty("product_click_uv") + private String productClickUv; + + /** + * 商品点击次数 + */ + @JsonProperty("product_click_cnt") + private String productClickCnt; + + /** + * 成交退款金额 + */ + @JsonProperty("pay_refund_gmv") + private String payRefundGmv; + + /** + * 成交退款人数 + */ + @JsonProperty("pay_refund_uv") + private String payRefundUv; + + /** + * 成交退款率 + */ + @JsonProperty("pay_refund_ratio") + private Double payRefundRatio; + + /** + * 发货后成交退款率 + */ + @JsonProperty("pay_refund_after_send_ratio") + private Double payRefundAfterSendRatio; + + /** + * 成交退款订单数 + */ + @JsonProperty("pay_refund_cnt") + private String payRefundCnt; + + /** + * 成交退款件数 + */ + @JsonProperty("pay_refund_product_cnt") + private String payRefundProductCnt; + + /** + * 发货前成交退款率 + */ + @JsonProperty("pay_refund_before_send_ratio") + private Double payRefundBeforeSendRatio; + + /** + * 退款金额（单位：分） + */ + @JsonProperty("refund_gmv") + private String refundGmv; + + /** + * 退款件数 + */ + @JsonProperty("refund_product_cnt") + private String refundProductCnt; + + /** + * 退款订单数 + */ + @JsonProperty("refund_cnt") + private String refundCnt; + + /** + * 退款人数 + */ + @JsonProperty("refund_uv") + private String refundUv; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductDataParam.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductDataParam.java new file mode 100644 index 0000000000..bddb9f3356 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductDataParam.java @@ -0,0 +1,33 @@ +package me.chanjar.weixin.channel.bean.compass.finder; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * 获取带货商品数据请求参数 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonInclude(JsonInclude.Include.NON_NULL) +public class ProductDataParam extends CompassFinderBaseParam { + + private static final long serialVersionUID = - 5016298274452168329L; + + /** + * 商品id + */ + @JsonProperty("product_id") + private String productId; + + public ProductDataParam(String ds, String productId) { + super(ds); + this.productId = productId; + } + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductDataResponse.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductDataResponse.java new file mode 100644 index 0000000000..628e0cc221 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductDataResponse.java @@ -0,0 +1,27 @@ +package me.chanjar.weixin.channel.bean.compass.finder; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse; + +/** + * 获取带货商品数据响应 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class ProductDataResponse extends WxChannelBaseResponse { + + private static final long serialVersionUID = 7264776818163943719L; + + /** + * 带货商品数据 + */ + @JsonProperty("product_info") + private ProductInfo productInfo; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductInfo.java new file mode 100644 index 0000000000..3d1071b261 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductInfo.java @@ -0,0 +1,68 @@ +package me.chanjar.weixin.channel.bean.compass.finder; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 带货商品数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class ProductInfo implements Serializable { + + private static final long serialVersionUID = - 3347940276601700091L; + + /** + * 商品id + */ + @JsonProperty("product_id") + private String productId; + + /** + * 商品头图 + */ + @JsonProperty("head_img_url") + private String headImgUrl; + + /** + * 商品标题 + */ + @JsonProperty("title") + private String title; + + /** + * 商品价格 + */ + @JsonProperty("price") + private String price; + + /** + * 1级类目 + */ + @JsonProperty("first_category_id") + private String firstCategoryId; + + /** + * 2级类目 + */ + @JsonProperty("second_category_id") + private String secondCategoryId; + + /** + * 3级类目 + */ + @JsonProperty("third_category_id") + private String thirdCategoryId; + + /** + * 商品罗盘数据 + */ + @JsonProperty("data") + private ProductCompassData data; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductListResponse.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductListResponse.java new file mode 100644 index 0000000000..e327531305 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/ProductListResponse.java @@ -0,0 +1,29 @@ +package me.chanjar.weixin.channel.bean.compass.finder; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse; + +import java.util.List; + +/** + * 获取带货商品列表响应 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class ProductListResponse extends WxChannelBaseResponse { + + private static final long serialVersionUID = 7903039293558611066L; + + /** + * 带货商品列表 + */ + @JsonProperty("product_list") + private List productList; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/SaleProfileData.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/SaleProfileData.java new file mode 100644 index 0000000000..379943903e --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/SaleProfileData.java @@ -0,0 +1,27 @@ +package me.chanjar.weixin.channel.bean.compass.finder; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 带货人群数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class SaleProfileData implements Serializable { + + private static final long serialVersionUID = - 5542602540358792014L; + + /** + * 维度数据列表 + */ + @JsonProperty("field_list") + private List fieldList; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/SaleProfileDataParam.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/SaleProfileDataParam.java new file mode 100644 index 0000000000..57a5854e71 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/SaleProfileDataParam.java @@ -0,0 +1,33 @@ +package me.chanjar.weixin.channel.bean.compass.finder; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * 获取带货人群数据请求参数 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JsonInclude(JsonInclude.Include.NON_NULL) +public class SaleProfileDataParam extends CompassFinderBaseParam { + + private static final long serialVersionUID = 4037843292285732855L; + + /** + * 用户类型 {@link me.chanjar.weixin.channel.enums.SaleProfileUserType} + */ + @JsonProperty("type") + private Integer type; + + public SaleProfileDataParam(String ds, Integer type) { + super(ds); + this.type = type; + } + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/SaleProfileDataResponse.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/SaleProfileDataResponse.java new file mode 100644 index 0000000000..a976671ba0 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/compass/finder/SaleProfileDataResponse.java @@ -0,0 +1,27 @@ +package me.chanjar.weixin.channel.bean.compass.finder; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse; + +/** + * 获取带货人群数据响应 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SaleProfileDataResponse extends WxChannelBaseResponse { + + private static final long serialVersionUID = - 6409722880191468272L; + + /** + * 带货人群数据 + */ + @JsonProperty("data") + private SaleProfileData data; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/ConversionMetric.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/ConversionMetric.java new file mode 100644 index 0000000000..96a708be89 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/ConversionMetric.java @@ -0,0 +1,61 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 转化率 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class ConversionMetric implements Serializable { + + private static final long serialVersionUID = - 3411290344181494863L; + + /** + * 商品曝光-点击转化率 + */ + @JsonProperty("product_view_click_conversion_ratio") + private ItemConversionMetric productViewClickConversionRatio; + + /** + * 气泡曝光-点击转化率 + */ + @JsonProperty("bubble_view_click_conversion_ratio") + private ItemConversionMetric bubbleViewClickConversionRatio; + + /** + * 成交转化率 + */ + @JsonProperty("pay_conversion_ratio") + private ItemConversionMetric payConversionRatio; + + /** + * 千次观看成交金额（单位：分） + */ + @JsonProperty("k_view_pay_conversion_ratio") + private ItemConversionMetric kViewPayConversionRatio; + + /** + * 更新时间 + */ + @JsonProperty("update_time") + private Long updateTime; + + /** + * 购物袋商品点击率 + */ + @JsonProperty("product_list_click_conversion_ratio") + private ItemConversionMetric productListClickConversionRatio; + + /** + * 挂车时间（>0 则为挂车） + */ + @JsonProperty("shelftime") + private Long shelftime; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNode.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNode.java new file mode 100644 index 0000000000..ab749e0f82 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNode.java @@ -0,0 +1,26 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 统计数值 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class DataNode implements Serializable { + + private static final long serialVersionUID = 3192158546911682577L; + + /** + * 统计数值维度指标 + */ + @JsonProperty("fields") + private Fields fields; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNodeList.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNodeList.java new file mode 100644 index 0000000000..6469e48e6e --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNodeList.java @@ -0,0 +1,32 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 分类下的数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class DataNodeList implements Serializable { + + private static final long serialVersionUID = - 497502210938812386L; + + /** + * 细分类别的名称，如 "女"、"30-39岁"、"天津市" + */ + @JsonProperty("key") + private String key; + + /** + * 包含具体的统计数值 + */ + @JsonProperty("row") + private DataNode row; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNodeSecondList.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNodeSecondList.java new file mode 100644 index 0000000000..7a033378c0 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNodeSecondList.java @@ -0,0 +1,33 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 用户群体下不同分类的统计数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class DataNodeSecondList implements Serializable { + + private static final long serialVersionUID = 42973481125049275L; + + /** + * 每个分类对象都有一个 key，表示分类的名称，例如 "sex_distribution"、"age_distribution" {@link me.chanjar.weixin.channel.enums.EcProfileDataNodeKey} + */ + @JsonProperty("key") + private String key; + + /** + * 进一步细分该分类下的数据 + */ + @JsonProperty("row") + private List row; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNodeThirdList.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNodeThirdList.java new file mode 100644 index 0000000000..7c6424b63f --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/DataNodeThirdList.java @@ -0,0 +1,33 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 不同用户群体的统计数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class DataNodeThirdList implements Serializable { + + private static final long serialVersionUID = - 7534433586440870881L; + + /** + * 每个对象包含一个 key，表示用户群体的名称，例如 "已成交用户"、"首次购买用户"、"复购用户" + */ + @JsonProperty("key") + private String key; + + /** + * 包含该用户群体下不同分类的统计数据 + */ + @JsonProperty("row") + private List row; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Dimension.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Dimension.java new file mode 100644 index 0000000000..a07e6670b4 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Dimension.java @@ -0,0 +1,38 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 描述时间序列的维度标签 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class Dimension implements Serializable { + + private static final long serialVersionUID = - 1879006149576217182L; + + /** + * 维度的类型 {@link me.chanjar.weixin.channel.enums.DimensionType} + */ + @JsonProperty("type") + private Integer type; + + /** + * 维度标签 + */ + @JsonProperty("ux_label") + private String uxLabel; + + /** + * 维度值 + */ + @JsonProperty("dimension_value") + private Long dimensionValue; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Ended.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Ended.java new file mode 100644 index 0000000000..361a52663b --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Ended.java @@ -0,0 +1,44 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 关播内容力数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class Ended implements Serializable { + + private static final long serialVersionUID = 576815272236922652L; + + /** + * 曝光有效CTR（万分比） + */ + @JsonProperty("recommend_effective_new_watch_2_uv_over_impression_uv") + private EndedIndexItem recommendEffectiveNewWatch2UvOverImpressionUv; + + /** + * 人均看播时长 + */ + @JsonProperty("average_watch_seconds") + private EndedIndexItem averageWatchSeconds; + + /** + * 评论率（万分比） + */ + @JsonProperty("comment_uv_over_new_watch_uv") + private EndedIndexItem commentUvOverNewWatchUv; + + /** + * 点赞率（万分比） + */ + @JsonProperty("like_uv_over_new_watch_uv") + private EndedIndexItem likeUvOverNewWatchUv; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/EndedIndexItem.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/EndedIndexItem.java new file mode 100644 index 0000000000..0823819491 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/EndedIndexItem.java @@ -0,0 +1,38 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 关播内容力指标数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class EndedIndexItem implements Serializable { + + private static final long serialVersionUID = 7529336638744298238L; + + /** + * 整场直播的指标值 + */ + @JsonProperty("value") + private Long value; + + /** + * 整场直播该指标值打败了 xx% 的主播 + */ + @JsonProperty("percentile") + private Integer percentile; + + /** + * 该指标 7 天中位数 + */ + @JsonProperty("median_7_days") + private Long median7Days; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Fields.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Fields.java new file mode 100644 index 0000000000..b199f255a5 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Fields.java @@ -0,0 +1,38 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 统计数值维度指标数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class Fields implements Serializable { + + private static final long serialVersionUID = 228387216076265877L; + + /** + * 维度值 + */ + @JsonProperty("dim_key") + private String dimKey; + + /** + * 指标值 + */ + @JsonProperty("dim_val") + private String dimVal; + + /** + * 指标值比例 + */ + @JsonProperty("dim_val_ratio") + private String dimValRatio; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/ItemConversionMetric.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/ItemConversionMetric.java new file mode 100644 index 0000000000..6d5142b52f --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/ItemConversionMetric.java @@ -0,0 +1,44 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 转化率数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class ItemConversionMetric implements Serializable { + + private static final long serialVersionUID = - 8317027740221390754L; + + /** + * 指标值 + */ + @JsonProperty("metric_value") + private Double metricValue; + + /** + * 较近7天中位数 + */ + @JsonProperty("median_to_recent_7_days") + private Double medianToRecent7Days; + + /** + * 同行对比 + */ + @JsonProperty("within_industry_percentage") + private Double withinIndustryPercentage; + + /** + * 环比数据 + */ + @JsonProperty("quarterly_growth_rate") + private QuarterlyGrowthRate quarterlyGrowthRate; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveComparisonIndex.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveComparisonIndex.java new file mode 100644 index 0000000000..84bfd6c226 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveComparisonIndex.java @@ -0,0 +1,38 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 内容力数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class LiveComparisonIndex implements Serializable { + + private static final long serialVersionUID = 525214144965479881L; + + /** + * 是否正在直播 + */ + @JsonProperty("is_living") + private Boolean isLiving; + + /** + * 在播数据 + */ + @JsonProperty("on_air") + private OnAir onAir; + + /** + * 关播数据 + */ + @JsonProperty("ended") + private Ended ended; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData.java new file mode 100644 index 0000000000..63209afb73 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData.java @@ -0,0 +1,38 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 直播大屏数据 + * + * @author @author Winnie + */ +@Data +@NoArgsConstructor +public class LiveDashboardData implements Serializable { + + private static final long serialVersionUID = 7917049411269553153L; + + /** + * 直播大屏数据实体 + */ + @JsonProperty("live_dashboard_data") + private LiveDashboardData2 liveDashboardData; + + /** + * 直播时长 + */ + @JsonProperty("live_duration") + private Long liveDuration; + + /** + * 直播开始时间 + */ + @JsonProperty("start_time") + private Long startTime; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2.java new file mode 100644 index 0000000000..4f61b1c41d --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2.java @@ -0,0 +1,38 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 直播大屏实体 + * + * @author @author Winnie + */ +@Data +@NoArgsConstructor +public class LiveDashboardData2 implements Serializable { + + private static final long serialVersionUID = 3657714024563123097L; + + /** + * 直播基础数据 + */ + @JsonProperty("summary") + private LiveDashboardData2Summary summary; + + /** + * 直播流量渠道 + */ + @JsonProperty("source") + private LiveDashboardData2Source source; + + /** + * 直播观众画像 + */ + @JsonProperty("portrait") + private LiveDashboardData2Portrait portrait; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Portrait.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Portrait.java new file mode 100644 index 0000000000..d75e364aba --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Portrait.java @@ -0,0 +1,33 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 直播观众画像 + * + * @author @author Winnie + */ +@Data +@NoArgsConstructor +public class LiveDashboardData2Portrait implements Serializable { + + private static final long serialVersionUID = - 5603781471063785276L; + + /** + * 在线人数的画像 + */ + @JsonProperty("online_watch_uv") + private List onlineWatchUv; + + /** + * 观看人数的画像 + */ + @JsonProperty("new_watch_uv") + private List newWatchUv; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Source.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Source.java new file mode 100644 index 0000000000..915dedce94 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Source.java @@ -0,0 +1,27 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 直播流量渠道 + * + * @author @author Winnie + */ +@Data +@NoArgsConstructor +public class LiveDashboardData2Source implements Serializable { + + private static final long serialVersionUID = 7347276250944913612L; + + /** + * 观看人数的渠道分布 + */ + @JsonProperty("new_watch_uv") + private List newWatchUv; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Summary.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Summary.java new file mode 100644 index 0000000000..06b57c21e1 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Summary.java @@ -0,0 +1,80 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 直播基础数据 + * + * @author @author Winnie + */ +@Data +@NoArgsConstructor +public class LiveDashboardData2Summary implements Serializable { + + private static final long serialVersionUID = - 9029702302333930066L; + + /** + * 观看人数 + */ + @JsonProperty("new_watch_uv") + private Long newWatchUv; + + /** + * 最大在线人数 + */ + @JsonProperty("max_online_watch_uv") + private Long maxOnlineWatchUv; + + /** + * 曝光人数 + */ + @JsonProperty("impression_uv") + private Long impressionUv; + + /** + * 平均观看时长（秒） + */ + @JsonProperty("average_watch_seconds_per_audience") + private Long averageWatchSecondsPerAudience; + + /** + * 新增关注人数 + */ + @JsonProperty("new_follow_uv") + private Long newFollowUv; + + /** + * 新增粉丝团人数 + */ + @JsonProperty("new_fans_club_uv") + private Long newFansClubUv; + + /** + * 评论人数 + */ + @JsonProperty("comment_uv") + private Long commentUv; + + /** + * 打赏人数 + */ + @JsonProperty("reward_uv") + private Long rewardUv; + + /** + * 分享直播间人数 + */ + @JsonProperty("sharing_uv") + private Long sharingUv; + + /** + * 热度 + */ + @JsonProperty("hot_quota") + private Long hotQuota; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDataParam.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDataParam.java new file mode 100644 index 0000000000..965ed6c8c3 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDataParam.java @@ -0,0 +1,30 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 获取直播大屏数据请求参数 + * + * @author Winnie + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class LiveDataParam implements Serializable { + + private static final long serialVersionUID = 6346941931704153857L; + + /** + * 直播唯一ID + */ + @JsonProperty("export_id") + private String exportId; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDataResponse.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDataResponse.java new file mode 100644 index 0000000000..4a5f4673bd --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDataResponse.java @@ -0,0 +1,69 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse; + +/** + * 获取直播大屏数据响应 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class LiveDataResponse extends WxChannelBaseResponse { + + private static final long serialVersionUID = - 8416743234527598719L; + + /** + * 追踪ID，报bug带 + */ + @JsonProperty("trace_id") + private String traceId; + + /** + * 直播大屏基础数据 + */ + @JsonProperty("live_dashboard_data") + private LiveDashboardData liveDashboardData; + + /** + * 内容力数据 + */ + @JsonProperty("live_comparison_index") + private LiveComparisonIndex liveComparisonIndex; + + /** + * 电商数据概要数据 + */ + @JsonProperty("live_ec_data_summary") + private LiveEcDataSummary liveEcDataSummary; + + /** + * 电商转化力数据 + */ + @JsonProperty("live_ec_conversion_metric") + private LiveEcConversionMetric liveEcConversionMetric; + + /** + * 电商画像数据 + */ + @JsonProperty("live_ec_profile") + private LiveEcProfile liveEcProfile; + + /** + * 电商渠道分布 + */ + @JsonProperty("live_distribution_channel") + private LiveDistributionChannel liveDistributionChannel; + + /** + * 电商商品数据 + */ + @JsonProperty("single_live_ec_spu_data_page_v2") + private SingleLiveEcSpuDataPageV2 singleLiveEcSpuDataPageV2; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistChannelSourceStats.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistChannelSourceStats.java new file mode 100644 index 0000000000..9f4d876992 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistChannelSourceStats.java @@ -0,0 +1,81 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 流量来源渠道指标数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class LiveDistChannelSourceStats implements Serializable { + + private static final long serialVersionUID = - 6802106934852140579L; + + /** + * 渠道层级 + */ + @JsonProperty("level") + private Integer level; + + /** + * 来源渠道ID + */ + @JsonProperty("source_channel_id") + private Long sourceChannelId; + + /** + * 流量来源子渠道指标数据统计值 + */ + @JsonProperty("sub_channel_source_stats") + private List subChannelSourceStats; + + /** + * GMV总值（单位：分） + */ + @JsonProperty("gmv") + private Long gmv; + + /** + * UV总值 + */ + @JsonProperty("uv") + private Long uv; + + /** + * 千次看播成交（单位： 分）(GPV) + */ + @JsonProperty("gmv_per_uv") + private Long gmvPerUv; + + /** + * gmv占比 + */ + @JsonProperty("gmv_ratio") + private Double gmvRatio; + + /** + * uv占比 + */ + @JsonProperty("uv_ratio") + private Double uvRatio; + + /** + * 渠道名称 + */ + @JsonProperty("source_channel_name") + private String sourceChannelName; + + /** + * 当前层级pv占总pv的比例 + */ + @JsonProperty("pv_ratio") + private Double pvRatio; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistributionByFlowTypeStat.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistributionByFlowTypeStat.java new file mode 100644 index 0000000000..7b9765f955 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistributionByFlowTypeStat.java @@ -0,0 +1,81 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 流量类型、渠道层级的渠道分析统计数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class LiveDistributionByFlowTypeStat implements Serializable { + + private static final long serialVersionUID = 5885014384803438677L; + + /** + * 渠道流量类型 {@link me.chanjar.weixin.channel.enums.LiveDistributionFlowType} + */ + @JsonProperty("live_dst_channel_type") + private Integer liveDstChannelType; + + /** + * 一级类目渠道来源指标划分 + */ + @JsonProperty("channel_source_stats") + private List channelSourceStats; + + /** + * 在该渠道下的统计值 + */ + @JsonProperty("metric_value") + private Long metricValue; + + /** + * GMV总值（单位：分） + */ + @JsonProperty("gmv") + private Long gmv; + + /** + * UV总值 + */ + @JsonProperty("uv") + private Long uv; + + /** + * 千次看播成交（单位： 分）(GPV) + */ + @JsonProperty("gmv_per_uv") + private Long gmvPerUv; + + /** + * PV总值 + */ + @JsonProperty("pv") + private Long pv; + + /** + * 当前层级pv占总pv的比例 + */ + @JsonProperty("pv_ratio") + private Double pvRatio; + + /** + * uv占比 + */ + @JsonProperty("uv_ratio") + private Double uvRatio; + + /** + * 在该渠道下的统计值比率 + */ + @JsonProperty("metric_value_ratio") + private Double metricValueRatio; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistributionChannel.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistributionChannel.java new file mode 100644 index 0000000000..24eb64d4a2 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistributionChannel.java @@ -0,0 +1,51 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 电商渠道分布 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class LiveDistributionChannel implements Serializable { + + private static final long serialVersionUID = - 5898886208775573377L; + + /** + * 客户数 + */ + @JsonProperty("audience_count") + private Long audienceCount; + + /** + * 总进入直播数 + */ + @JsonProperty("total_joinlive_count") + private Long totalJoinliveCount; + + /** + * 按场景划分的渠道分析统计值 + */ + @JsonProperty("live_dist_channel_source_by_scene_stats") + private List liveDistChannelSourceBySceneStats; + + /** + * 按照流量类型、渠道层级划分的渠道分析统计数据 + */ + @JsonProperty("live_dist_channel_source_stats") + private List liveDistChannelSourceStats; + + /** + * 数据版本（无实际意义） + */ + @JsonProperty("data_key") + private List dataKey; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistributionSceneStat.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistributionSceneStat.java new file mode 100644 index 0000000000..425d69cca0 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDistributionSceneStat.java @@ -0,0 +1,75 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 场景的渠道分析统计值 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class LiveDistributionSceneStat implements Serializable { + + private static final long serialVersionUID = 4261140121141859416L; + + /** + * 场景类型 {@link me.chanjar.weixin.channel.enums.LiveDistributionSceneType} + */ + @JsonProperty("scene_type") + private Integer sceneType; + + /** + * 该场景下的渠道分析统计值 + */ + @JsonProperty("dist_flow_type_stats") + private List distFlowTypeStats; + + /** + * 指标值总数 + */ + @JsonProperty("metric_value_total") + private Long metricValueTotal; + + /** + * GMV总值（单位：分） + */ + @JsonProperty("gmv") + private Long gmv; + + /** + * UV总值 + */ + @JsonProperty("uv") + private Long uv; + + /** + * 千次看播成交（单位： 分） + */ + @JsonProperty("gmv_per_uv") + private Long gmvPerUv; + + /** + * 指标值 + */ + @JsonProperty("metric_value") + private Long metricValue; + + /** + * 在该渠道下的统计值比率 + */ + @JsonProperty("metric_value_ratio") + private Double metricValueRatio; + + /** + * pv + */ + @JsonProperty("pv") + private Long pv; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveEcConversionMetric.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveEcConversionMetric.java new file mode 100644 index 0000000000..e9b92821fe --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveEcConversionMetric.java @@ -0,0 +1,32 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 电商转化力数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class LiveEcConversionMetric implements Serializable { + + private static final long serialVersionUID = - 7332281175637902883L; + + /** + * 近10分钟转化率数据 + */ + @JsonProperty("recent_10_min_conversion") + private ConversionMetric recent10MinConversion; + + /** + * 整场直播 + */ + @JsonProperty("whole_live_conversion") + private ConversionMetric wholeLiveConversion; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveEcDataSummary.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveEcDataSummary.java new file mode 100644 index 0000000000..d77209da56 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveEcDataSummary.java @@ -0,0 +1,212 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 电商数据概要数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class LiveEcDataSummary implements Serializable { + + private static final long serialVersionUID = - 6634047980552575196L; + + /** + * 成交金额（单位：分） + */ + @JsonProperty("total_gmv") + private Long totalGmv; + + /** + * 成交次数 + */ + @JsonProperty("total_pay_pv") + private Long totalPayPv; + + /** + * 成交人数 + */ + @JsonProperty("total_pay_uv") + private Long totalPayUv; + + /** + * 订单创建次数 + */ + @JsonProperty("total_create_pv") + private Long totalCreatePv; + + /** + * 订单创建人数 + */ + @JsonProperty("total_create_uv") + private Long totalCreateUv; + + /** + * 总点击次数 + */ + @JsonProperty("total_clk_pv") + private Long totalClkPv; + + /** + * 总点击人数 + */ + @JsonProperty("total_clk_uv") + private Long totalClkUv; + + /** + * 总曝光次数 + */ + @JsonProperty("total_exp_pv") + private Long totalExpPv; + + /** + * 总曝光人数 + */ + @JsonProperty("total_exp_uv") + private Long totalExpUv; + + /** + * 在线观众数 + */ + @JsonProperty("online_audience_count") + private Long onlineAudienceCount; + + /** + * 累计观众数 + */ + @JsonProperty("cumulative_audience_count") + private Long cumulativeAudienceCount; + + /** + * 新增观众数 + */ + @JsonProperty("new_audience_count") + private Long newAudienceCount; + + /** + * 剩余观众数 + */ + @JsonProperty("leaved_audience_count") + private Long leavedAudienceCount; + + /** + * 观众平均观看秒数 + */ + @JsonProperty("average_watch_seconds_per_audience") + private Long averageWatchSecondsPerAudience; + + /** + * 新增关注数 + */ + @JsonProperty("new_follow_count") + private Long newFollowCount; + + /** + * 新增评论数 + */ + @JsonProperty("new_comment_count") + private Long newCommentCount; + + /** + * 分享直播观众数 + */ + @JsonProperty("share_live_audience_count") + private Long shareLiveAudienceCount; + + /** + * 新粉丝俱乐部数 + */ + @JsonProperty("new_fans_club_count") + private Long newFansClubCount; + + /** + * 退费次数 + */ + @JsonProperty("refund_pv") + private Long refundPv; + + /** + * 退费人数 + */ + @JsonProperty("refund_uv") + private Long refundUv; + + /** + * 退费率 + */ + @JsonProperty("refund_rate") + private Double refundRate; + + /** + * 退款金额（单位：分） + */ + @JsonProperty("refund_amount") + private Long refundAmount; + + /** + * 退费商品件数 + */ + @JsonProperty("refund_product_cnt") + private Long refundProductCnt; + + /** + * 广告累计观众数 + */ + @JsonProperty("ads_cumulative_audience_count") + private Long adsCumulativeAudienceCount; + + /** + * 广告累计观看数 + */ + @JsonProperty("ads_cumulative_watch_count") + private Long adsCumulativeWatchCount; + + /** + * 促销累计观看数 + */ + @JsonProperty("promotion_cumulative_watch_count") + private Long promotionCumulativeWatchCount; + + /** + * 千次看播成交总额 + */ + @JsonProperty("gmv_per_thousand_cumulative_watch_pv") + private Double gmvPerThousandCumulativeWatchPv; + + /** + * 观众成交率 + */ + @JsonProperty("audience_pay_ratio") + private Double audiencePayRatio; + + /** + * 点击成交率 + */ + @JsonProperty("clk_pay_ratio") + private Double clkPayRatio; + + /** + * 新买家人数 + */ + @JsonProperty("new_buyer_uv") + private Long newBuyerUv; + + /** + * 老买家人数 + */ + @JsonProperty("old_buyer_uv") + private Long oldBuyerUv; + + /** + * 客户价格 + */ + @JsonProperty("customer_price") + private Long customerPrice; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveEcProfile.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveEcProfile.java new file mode 100644 index 0000000000..76f90c9942 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveEcProfile.java @@ -0,0 +1,33 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 电商画像数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class LiveEcProfile implements Serializable { + + private static final long serialVersionUID = 1996741772652344438L; + + /** + * 包含不同用户群体的统计数据 + */ + @JsonProperty("profiles") + private List profiles; + + /** + * 总体数据统计信息 + */ + @JsonProperty("totals") + private List totals; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveItem.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveItem.java new file mode 100644 index 0000000000..acea012018 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveItem.java @@ -0,0 +1,32 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 直播列表数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class LiveItem implements Serializable { + + private static final long serialVersionUID = 6693176992531666035L; + + /** + * 直播唯一ID + */ + @JsonProperty("export_id") + private String exportId; + + /** + * 直播创建时间 + */ + @JsonProperty("create_time") + private Long createTime; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveListParam.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveListParam.java new file mode 100644 index 0000000000..3072e990ef --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveListParam.java @@ -0,0 +1,30 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 获取直播大屏直播列表请求参数 + * + * @author Winnie + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class LiveListParam implements Serializable { + + private static final long serialVersionUID = - 8451283214646387030L; + + /** + * 日期，格式 yyyyMMdd + */ + @JsonProperty("ds") + private Long ds; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveListResponse.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveListResponse.java new file mode 100644 index 0000000000..f9b1981dfa --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveListResponse.java @@ -0,0 +1,41 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse; + +import java.util.List; + +/** + * 获取直播大屏直播列表响应 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class LiveListResponse extends WxChannelBaseResponse { + + private static final long serialVersionUID = - 5062337147636715367L; + + /** + * 追踪ID，报bug带 + */ + @JsonProperty("trace_id") + private String traceId; + + /** + * 直播列表 + */ + @JsonProperty("live_items") + private List liveItems; + + /** + * 是否还有更多的直播 + */ + @JsonProperty("has_more") + private Boolean hasMore; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/OnAir.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/OnAir.java new file mode 100644 index 0000000000..29aef35236 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/OnAir.java @@ -0,0 +1,44 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 在播内容力数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class OnAir implements Serializable { + + private static final long serialVersionUID = 6354207471314033499L; + + /** + * 曝光有效CTR（万分比） + */ + @JsonProperty("recommend_effective_new_watch_2_uv_over_impression_uv") + private OnAirIndexItem recommendEffectiveNewWatch2UvOverImpressionUv; + + /** + * 人均看播时长 + */ + @JsonProperty("average_watch_seconds") + private OnAirIndexItem averageWatchSeconds; + + /** + * 评论率（万分比） + */ + @JsonProperty("comment_uv_over_new_watch_uv") + private OnAirIndexItem commentUvOverNewWatchUv; + + /** + * 点赞率（万分比） + */ + @JsonProperty("like_uv_over_new_watch_uv") + private OnAirIndexItem likeUvOverNewWatchUv; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/OnAirIndexItem.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/OnAirIndexItem.java new file mode 100644 index 0000000000..ebad794338 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/OnAirIndexItem.java @@ -0,0 +1,56 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 在播内容力指标数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class OnAirIndexItem implements Serializable { + + private static final long serialVersionUID = - 2988342521964183666L; + + /** + * 描述最近多少分钟的指标值 + */ + @JsonProperty("n") + private Integer n; + + /** + * 最近 n 分钟该指标的值 + */ + @JsonProperty("last_n_mins_value") + private Integer lastNMinsValue; + + /** + * 最近 2n 到 n 分钟该指标的值（用于环比） + */ + @JsonProperty("last_2n_to_n_mins_value") + private Integer last2nToNMinsValue; + + /** + * 最近 n 分钟该指标值打败了 xx% 的在播主播 + */ + @JsonProperty("last_n_mins_percentile") + private Integer lastNMinsPercentile; + + /** + * 整场直播的指标值 + */ + @JsonProperty("value") + private Long value; + + /** + * 整场直播该指标值打败了 xx% 的主播 + */ + @JsonProperty("percentile") + private Integer percentile; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Point.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Point.java new file mode 100644 index 0000000000..7f11086442 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Point.java @@ -0,0 +1,32 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 数据点 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class Point implements Serializable { + + private static final long serialVersionUID = 3332256418933163389L; + + /** + * 时间戳 + */ + @JsonProperty("ts") + private Long ts; + + /** + * 指标值 + */ + @JsonProperty("value") + private Long value; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/QuarterlyGrowthRate.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/QuarterlyGrowthRate.java new file mode 100644 index 0000000000..0acfdd7d18 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/QuarterlyGrowthRate.java @@ -0,0 +1,32 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 转化率环比数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class QuarterlyGrowthRate implements Serializable { + + private static final long serialVersionUID = 1683118806978367016L; + + /** + * 环比（近10分钟转化率数据才有） + */ + @JsonProperty("value") + private Long value; + + /** + * 环比是否是有效值（如果是false说明分母是0） + */ + @JsonProperty("is_valid") + private Boolean isValid; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Series.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Series.java new file mode 100644 index 0000000000..570c1b1b0d --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/Series.java @@ -0,0 +1,51 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 维度标签的时间序列（与指标的类型无关） + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class Series implements Serializable { + + private static final long serialVersionUID = 507937573085880287L; + + /** + * 数据点 + */ + @JsonProperty("points") + private List points; + + /** + * 描述时间序列的维度标签 + */ + @JsonProperty("dimensions") + private List dimensions; + + /** + * 每个数据点描述的时间长度（秒） + */ + @JsonProperty("step") + private Long step; + + /** + * 该时间序列的起始时间戳 + */ + @JsonProperty("begin_ts") + private Long beginTs; + + /** + * 该时间序列的结束时间戳 + */ + @JsonProperty("end_ts") + private Long endTs; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SingleLiveEcSpuDataPageV2.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SingleLiveEcSpuDataPageV2.java new file mode 100644 index 0000000000..5cdb3a97d0 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SingleLiveEcSpuDataPageV2.java @@ -0,0 +1,39 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 电商商品数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class SingleLiveEcSpuDataPageV2 implements Serializable { + + private static final long serialVersionUID = - 761977668198342583L; + + /** + * 商品明细数据列表 + */ + @JsonProperty("spu_data_list") + private List spuDataList; + + /** + * spu_data_list 的总长度 + */ + @JsonProperty("total_cnt") + private Integer totalCnt; + + /** + * 数据版本（无实际意义） + */ + @JsonProperty("data_key") + private List dataKey; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SpuBaseData.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SpuBaseData.java new file mode 100644 index 0000000000..b86279bdab --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SpuBaseData.java @@ -0,0 +1,68 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 商品基础数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class SpuBaseData implements Serializable { + + private static final long serialVersionUID = 3170611962212344198L; + + /** + * 店铺商品id + */ + @JsonProperty("src_spu_id") + private String srcSpuId; + + /** + * 店铺id + */ + @JsonProperty("src") + private Long src; + + /** + * 商品名称 + */ + @JsonProperty("spu_name") + private String spuName; + + /** + * 商品id + */ + @JsonProperty("spu_id") + private Long spuId; + + /** + * 商品小图 + */ + @JsonProperty("thumb_url") + private String thumbUrl; + + /** + * 商品价格 + */ + @JsonProperty("price") + private Long price; + + /** + * 店铺名称 + */ + @JsonProperty("src_name") + private String srcName; + + /** + * 库存 + */ + @JsonProperty("stock") + private Long stock; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SpuData.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SpuData.java new file mode 100644 index 0000000000..41a44a926d --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SpuData.java @@ -0,0 +1,350 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 商品明细数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class SpuData implements Serializable { + + private static final long serialVersionUID = 7409791549917863816L; + + /** + * 商品基础数据 + */ + @JsonProperty("base_data") + private SpuBaseData baseData; + + /** + * 商品曝光人数 + */ + @JsonProperty("exp_uv") + private Long expUv; + + /** + * 商品曝光次数 + */ + @JsonProperty("exp_pv") + private Long expPv; + + /** + * 商品粉丝曝光人数 + */ + @JsonProperty("fans_exp_uv") + private Long fansExpUv; + + /** + * 商品粉丝曝光次数 + */ + @JsonProperty("fans_exp_pv") + private Long fansExpPv; + + /** + * 商品非粉丝曝光人数 + */ + @JsonProperty("non_fans_exp_uv") + private Long nonFansExpUv; + + /** + * 商品非粉丝曝光次数 + */ + @JsonProperty("non_fans_exp_pv") + private Long nonFansExpPv; + + /** + * 商品新客户曝光人数 + */ + @JsonProperty("new_customer_exp_uv") + private Long newCustomerExpUv; + + /** + * 商品新客户曝光次数 + */ + @JsonProperty("new_customer_exp_pv") + private Long newCustomerExpPv; + + /** + * 商品老客户曝光人数 + */ + @JsonProperty("repeated_customer_exp_uv") + private Long repeatedCustomerExpUv; + + /** + * 商品老客户曝光次数 + */ + @JsonProperty("repeated_customer_exp_pv") + private Long repeatedCustomerExpPv; + + /** + * 商品点击人数 + */ + @JsonProperty("clk_uv") + private Long clkUv; + + /** + * 商品点击次数 + */ + @JsonProperty("clk_pv") + private Long clkPv; + + /** + * 商品新客户点击人数 + */ + @JsonProperty("new_customer_clk_uv") + private Long newCustomerClkUv; + + /** + * 商品新客户点击次数 + */ + @JsonProperty("new_customer_clk_pv") + private Long newCustomerClkPv; + + /** + * 商品老客户点击人数 + */ + @JsonProperty("repeated_customer_clk_uv") + private Long repeatedCustomerClkUv; + + /** + * 商品老客户点击次数 + */ + @JsonProperty("repeated_customer_clk_pv") + private Long repeatedCustomerClkPv; + + /** + * 商品粉丝点击人数 + */ + @JsonProperty("fans_clk_uv") + private Long fansClkUv; + + /** + * 商品粉丝点击次数 + */ + @JsonProperty("fans_clk_pv") + private Long fansClkPv; + + /** + * 商品非粉丝点击人数 + */ + @JsonProperty("non_fans_clk_uv") + private Long nonFansClkUv; + + /** + * 商品非粉丝点击次数 + */ + @JsonProperty("non_fans_clk_pv") + private Long nonFansClkPv; + + /** + * 商品分享人数 + */ + @JsonProperty("share_uv") + private Long shareUv; + + /** + * 商品分享次数 + */ + @JsonProperty("share_pv") + private Long sharePv; + + /** + * 商品曝光点击率 + */ + @JsonProperty("exp_clk_ratio") + private Double expClkRatio; + + /** + * 商品点击成交率 + */ + @JsonProperty("clk_pay_ratio") + private Double clkPayRatio; + + /** + * 商品成交金额（单位：分） + */ + @JsonProperty("gmv") + private Long gmv; + + /** + * 商品成交订单数 + */ + @JsonProperty("pay_pv") + private Long payPv; + + /** + * 商品成交人数 + */ + @JsonProperty("pay_uv") + private Long payUv; + + /** + * 商品粉丝成交订单数 + */ + @JsonProperty("fans_pay_pv") + private Long fansPayPv; + + /** + * 商品粉丝成交人数 + */ + @JsonProperty("fans_pay_uv") + private Long fansPayUv; + + /** + * 商品非粉丝成交订单数 + */ + @JsonProperty("non_fans_pay_pv") + private Long nonFansPayPv; + + /** + * 商品非粉丝成交人数 + */ + @JsonProperty("non_fans_pay_uv") + private Long nonFansPayUv; + + /** + * 商品新客户成交次数 + */ + @JsonProperty("new_customer_pay_pv") + private Long newCustomerPayPv; + + /** + * 商品新客户成交人数 + */ + @JsonProperty("new_customer_pay_uv") + private Long newCustomerPayUv; + + /** + * 商品老客户成交次数 + */ + @JsonProperty("repeated_customer_pay_pv") + private Long repeatedCustomerPayPv; + + /** + * 商品老客户成交人数 + */ + @JsonProperty("repeated_customer_pay_uv") + private Long repeatedCustomerPayUv; + + /** + * 商品退款人数 + */ + @JsonProperty("refund_uv") + private Long refundUv; + + /** + * 商品退款订单数 + */ + @JsonProperty("refund_pv") + private Long refundPv; + + /** + * 商品退款金额（单位：分） + */ + @JsonProperty("refund_amount") + private Long refundAmount; + + /** + * 商品订单创建人数 + */ + @JsonProperty("create_uv") + private Long createUv; + + /** + * 商品订单创建次数 + */ + @JsonProperty("create_pv") + private Long createPv; + + /** + * 商品粉丝订单创建人数 + */ + @JsonProperty("fans_create_uv") + private Long fansCreateUv; + + /** + * 商品粉丝订单创建次数 + */ + @JsonProperty("fans_create_pv") + private Long fansCreatePv; + + /** + * 商品非粉丝订单创建人数 + */ + @JsonProperty("non_fans_create_uv") + private Long nonFansCreateUv; + + /** + * 商品非粉丝订单创建次数 + */ + @JsonProperty("non_fans_create_pv") + private Long nonFansCreatePv; + + /** + * 商品新客户订单创建人数 + */ + @JsonProperty("new_customer_create_uv") + private Long newCustomerCreateUv; + + /** + * 商品新客户订单创建次数 + */ + @JsonProperty("new_customer_create_pv") + private Long newCustomerCreatePv; + + /** + * 商品老客户订单创建人数 + */ + @JsonProperty("repeated_customer_create_uv") + private Long repeatedCustomerCreateUv; + + /** + * 商品老客户订单创建次数 + */ + @JsonProperty("repeated_customer_create_pv") + private Long repeatedCustomerCreatePv; + + /** + * 商品库存 + */ + @JsonProperty("stock") + private Long stock; + + /** + * 商品退费率 + */ + @JsonProperty("refund_rate") + private Double refundRate; + + /** + * 商品完成订单数 + */ + @JsonProperty("finish_pv") + private Long finishPv; + + /** + * 商品未完成订单数 + */ + @JsonProperty("no_finish_pv") + private Long noFinishPv; + + /** + * 商品新客户转换率 + */ + @JsonProperty("new_customer_conversion_rate") + private Double newCustomerConversionRate; + + /** + * 商品讲解数 + */ + @JsonProperty("explanation_count") + private Long explanationCount; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SubLiveDistChannelSourceStats.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SubLiveDistChannelSourceStats.java new file mode 100644 index 0000000000..7d183b738b --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/SubLiveDistChannelSourceStats.java @@ -0,0 +1,92 @@ +package me.chanjar.weixin.channel.bean.live.dashboard; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 流量来源子渠道指标数据 + * + * @author Winnie + */ +@Data +@NoArgsConstructor +public class SubLiveDistChannelSourceStats implements Serializable { + + private static final long serialVersionUID = - 5279814435684116105L; + + /** + * 渠道层级 + */ + @JsonProperty("level") + private Integer level; + + /** + * 来源渠道ID + */ + @JsonProperty("source_channel_id") + private Long sourceChannelId; + + /** + * 在该渠道下的统计值 + */ + @JsonProperty("metric_value") + private Long metricValue; + + /** + * GMV总值（单位：分） + */ + @JsonProperty("gmv") + private Long gmv; + + /** + * UV总值 + */ + @JsonProperty("uv") + private Long uv; + + /** + * 千次看播成交（单位： 分） + */ + @JsonProperty("gmv_per_uv") + private Long gmvPerUv; + + /** + * gmv占比 + */ + @JsonProperty("gmv_ratio") + private Double gmvRatio; + + /** + * uv占比 + */ + @JsonProperty("uv_ratio") + private Double uvRatio; + + /** + * 在该渠道下的统计值比率 + */ + @JsonProperty("metric_value_ratio") + private Double metricValueRatio; + + /** + * 渠道名称 + */ + @JsonProperty("source_channel_name") + private String sourceChannelName; + + /** + * pv + */ + @JsonProperty("pv") + private Long pv; + + /** + * 当前层级pv占总pv的比例 + */ + @JsonProperty("pv_ratio") + private Double pvRatio; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/constant/WxChannelApiUrlConstants.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/constant/WxChannelApiUrlConstants.java index 79ff5f8f8d..1fddd1de84 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/constant/WxChannelApiUrlConstants.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/constant/WxChannelApiUrlConstants.java @@ -428,4 +428,44 @@ public interface Vip { /** 更新用户等级 */ String GRADE_UPDATE_URL = "https://api.weixin.qq.com/channels/ec/vip/user/grade/update"; } + + /** + * 直播大屏数据 + */ + public interface LiveDashboard { + /** + * 获取直播大屏直播列表 + */ + String GET_LIVE_LIST_URL = "https://api.weixin.qq.com/channels/livedashboard/getlivelist"; + + /** + * 获取直播大屏数据 + */ + String GET_LIVE_DATA_URL = "https://api.weixin.qq.com/channels/livedashboard/getlivedata"; + } + + /** + * 罗盘达人版API + */ + public interface CompassFinder { + /** + * 获取电商概览数据 + */ + String GET_OVERALL_URL = "https://api.weixin.qq.com/channels/ec/compass/finder/overall/get"; + + /** + * 获取带货商品数据 + */ + String GET_PRODUCT_DATA_URL = "https://api.weixin.qq.com/channels/ec/compass/finder/product/data/get"; + + /** + * 获取带货商品列表 + */ + String GET_PRODUCT_LIST_URL = "https://api.weixin.qq.com/channels/ec/compass/finder/product/list/get"; + + /** + * 获取带货人群数据 + */ + String GET_SALE_PROFILE_DATA_URL = "https://api.weixin.qq.com/channels/ec/compass/finder/sale/profile/data/get"; + } } diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/DimensionType.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/DimensionType.java new file mode 100644 index 0000000000..b713f518ab --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/DimensionType.java @@ -0,0 +1,80 @@ +package me.chanjar.weixin.channel.enums; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 视频号助手 直播数据维度类型 + * + * @author Winnie + */ +@JsonFormat(shape = JsonFormat.Shape.OBJECT) +public enum DimensionType { + + /** + * 一级渠道 + */ + PRIMARY_CHANNEL(1, "一级渠道"), + /** + * 年龄段 + */ + AGE(2, "年龄段"), + /** + * 性别 + */ + SEX(3, "性别"), + /** + * 关注关系 + */ + FOLLOW(5, "关注关系"), + /** + * 二级渠道 + */ + SECONDARY_CHANNEL(7, "二级渠道"), + /** + * 策略人群 + */ + CATE(9, "策略人群"), + /** + * 省级行政区 + */ + PROVINCE(10, "省级行政区"), + /** + * 地级行政区 + */ + CITY(11, "地级行政区"), + /** + * 消费者商品类目偏好 + */ + ECOM_USER_LEVEL(12, "消费者商品类目偏好"), + /** + * 客单价区间 + */ + GMV_PER_CNT(13, "客单价区间"), +// /** +// * 关注关系 +// */ +// FOLLOW(15, "关注关系"), + /** + * 流量类型（自然流量、直播加热、广告投流） + */ + FLOW(16, "流量类型（自然流量、直播加热、广告投流）"), + + ; + + private final Integer key; + private final String value; + + DimensionType(Integer key, String value) { + this.key = key; + this.value = value; + } + + public Integer getKey() { + return key; + } + + public String getValue() { + return value; + } + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/EcProfileDataNodeKey.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/EcProfileDataNodeKey.java new file mode 100644 index 0000000000..2374576557 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/EcProfileDataNodeKey.java @@ -0,0 +1,64 @@ +package me.chanjar.weixin.channel.enums; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 视频号助手 用户群体数据节点键 + * + * @author Winnie + */ +@JsonFormat(shape = JsonFormat.Shape.OBJECT) +public enum EcProfileDataNodeKey { + + /** + * 性别分布 + */ + SEX("sex_distribution", "性别分布"), + /** + * 年龄分布 + */ + AGE("age_distribution", "年龄分布"), + /** + * 省份分布 + */ + PROVINCE("province_distribution", "省份分布"), + /** + * 城市分布 + */ + CITY("city_distribution", "城市分布"), + /** + * 关注关系分布 + */ + FOLLOW("follow_distribution", "关注关系分布"), + /** + * 策略人群分布 + */ + CATE("cate_distribution", "策略人群分布"), + /** + * 商品类目偏好分布 + */ + ECOM_USER_LEVEL("ecom_user_level_distribution", "商品类目偏好分布"), + /** + * 平均客单价分布 + */ + GMV_PER_CNT("gmv_per_cnt_distribution", "平均客单价分布"), + + ; + + private final String key; + private final String value; + + EcProfileDataNodeKey(String key, String value) { + this.key = key; + this.value = value; + } + + public String getKey() { + return key; + } + + public String getValue() { + return value; + } + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/LiveDistributionFlowType.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/LiveDistributionFlowType.java new file mode 100644 index 0000000000..b086d02c34 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/LiveDistributionFlowType.java @@ -0,0 +1,56 @@ +package me.chanjar.weixin.channel.enums; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 视频号助手 直播分布流量类型 + * + * @author Winnie + */ +@JsonFormat(shape = JsonFormat.Shape.OBJECT) +public enum LiveDistributionFlowType { + + /** + * 无效值 + */ + INVALID(0, "无效值"), + /** + * 自然流量 + */ + NATURAL(1, "自然流量"), + /** + * 加热流量 + */ + PROMOTE(2, "加热流量"), + /** + * 广告流量 + */ + ADS(3, "广告流量"), + /** + * 公域流量 + */ + COMMON_DOMAIN(4, "公域流量"), + /** + * 私域流量 + */ + PRIVATE_DOMAIN(5, "私域流量"), + + ; + + private final Integer key; + private final String value; + + LiveDistributionFlowType(Integer key, String value) { + this.key = key; + this.value = value; + } + + public Integer getKey() { + return key; + } + + public String getValue() { + return value; + } + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/LiveDistributionSceneType.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/LiveDistributionSceneType.java new file mode 100644 index 0000000000..46a65f02b4 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/LiveDistributionSceneType.java @@ -0,0 +1,52 @@ +package me.chanjar.weixin.channel.enums; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 视频号助手 直播分布场景类型 + * + * @author Winnie + */ +@JsonFormat(shape = JsonFormat.Shape.OBJECT) +public enum LiveDistributionSceneType { + + /** + * 商品曝光 + */ + PRODUCT_IMPRESSION(6, "商品曝光"), + /** + * 直播间曝光次数 + */ + LIVE_ROOM_IMPRESSION_PV(7, "直播间曝光次数"), + /** + * 商品点击次数 + */ + PRODUCT_CLICK_PV(8, "商品点击次数"), + /** + * 创建订单数按渠道统计 + */ + CHANNEL_TOTAL_CREATE_PV(9, "创建订单数按渠道统计"), + /** + * 成交订单数按渠道统计 + */ + CHANNEL_TOTAL_PAY_PV(10, "成交订单数按渠道统计"), + + ; + + private final Integer key; + private final String value; + + LiveDistributionSceneType(Integer key, String value) { + this.key = key; + this.value = value; + } + + public Integer getKey() { + return key; + } + + public String getValue() { + return value; + } + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/SaleProfileUserType.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/SaleProfileUserType.java new file mode 100644 index 0000000000..4bef97641e --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/enums/SaleProfileUserType.java @@ -0,0 +1,56 @@ +package me.chanjar.weixin.channel.enums; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 带货人群用户类型 + * + * @author Winnie + */ +@JsonFormat(shape = JsonFormat.Shape.OBJECT) +public enum SaleProfileUserType { + + /** + * 商品曝光用户 + */ + PRODUCT_IMPRESSION_USER(1, "商品曝光用户"), + /** + * 商品点击用户 + */ + PRODUCT_CLICK_USER(2, "商品点击用户"), + /** + * 购买用户 + */ + PURCHASING_USER(3, "购买用户"), + /** + * 首购用户 + */ + FIRST_PURCHASE_USER(4, "首购用户"), + /** + * 复购用户 + */ + REPURCHASE_USER(5, "复购用户"), + /** + * 直播观看用户 + */ + LIVE_WATCHER_USER(6, "直播观看用户"), + + ; + + private final Integer key; + private final String value; + + SaleProfileUserType(Integer key, String value) { + this.key = key; + this.value = value; + } + + public Integer getKey() { + return key; + } + + public String getValue() { + return value; + } + +} diff --git a/weixin-java-channel/src/test/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassFinderServiceImplTest.java b/weixin-java-channel/src/test/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassFinderServiceImplTest.java new file mode 100644 index 0000000000..be178ba947 --- /dev/null +++ b/weixin-java-channel/src/test/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassFinderServiceImplTest.java @@ -0,0 +1,66 @@ +package me.chanjar.weixin.channel.api.impl; + +import com.google.inject.Inject; +import me.chanjar.weixin.channel.api.WxChannelCompassFinderService; +import me.chanjar.weixin.channel.api.WxChannelService; +import me.chanjar.weixin.channel.bean.compass.finder.OverallResponse; +import me.chanjar.weixin.channel.bean.compass.finder.ProductDataResponse; +import me.chanjar.weixin.channel.bean.compass.finder.ProductListResponse; +import me.chanjar.weixin.channel.bean.compass.finder.SaleProfileDataResponse; +import me.chanjar.weixin.channel.enums.SaleProfileUserType; +import me.chanjar.weixin.channel.test.ApiTestModule; +import me.chanjar.weixin.common.error.WxErrorException; +import org.testng.annotations.Guice; +import org.testng.annotations.Test; + +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + +/** + * @author Winnie + */ +@Guice(modules = ApiTestModule.class) +public class WxChannelCompassFinderServiceImplTest { + + @Inject + private WxChannelService channelService; + + @Test + public void testGetOverAll() throws WxErrorException { + WxChannelCompassFinderService compassFinderService = channelService.getCompassFinderService(); + String ds = "20240630"; + OverallResponse response = compassFinderService.getOverall(ds); + assertNotNull(response); + assertTrue(response.isSuccess()); + } + + @Test + public void testGetProductData() throws WxErrorException { + WxChannelCompassFinderService compassFinderService = channelService.getCompassFinderService(); + String ds = "20240630"; + String productId = "10000017457793"; + ProductDataResponse response = compassFinderService.getProductData(ds, productId); + assertNotNull(response); + assertTrue(response.isSuccess()); + } + + @Test + public void testGetProductList() throws WxErrorException { + WxChannelCompassFinderService compassFinderService = channelService.getCompassFinderService(); + String ds = "20240630"; + ProductListResponse response = compassFinderService.getProductList(ds); + assertNotNull(response); + assertTrue(response.isSuccess()); + } + + @Test + public void testGetSaleProfileData() throws WxErrorException { + WxChannelCompassFinderService compassFinderService = channelService.getCompassFinderService(); + String ds = "20240630"; + Integer type = SaleProfileUserType.PRODUCT_IMPRESSION_USER.getKey(); + SaleProfileDataResponse response = compassFinderService.getSaleProfileData(ds, type); + assertNotNull(response); + assertTrue(response.isSuccess()); + } + +} diff --git a/weixin-java-channel/src/test/java/me/chanjar/weixin/channel/api/impl/WxChannelLiveDashboardServiceImplTest.java b/weixin-java-channel/src/test/java/me/chanjar/weixin/channel/api/impl/WxChannelLiveDashboardServiceImplTest.java new file mode 100644 index 0000000000..ec2e161da1 --- /dev/null +++ b/weixin-java-channel/src/test/java/me/chanjar/weixin/channel/api/impl/WxChannelLiveDashboardServiceImplTest.java @@ -0,0 +1,44 @@ +package me.chanjar.weixin.channel.api.impl; + +import com.google.inject.Inject; +import me.chanjar.weixin.channel.api.WxChannelLiveDashboardService; +import me.chanjar.weixin.channel.api.WxChannelService; +import me.chanjar.weixin.channel.bean.live.dashboard.LiveDataResponse; +import me.chanjar.weixin.channel.bean.live.dashboard.LiveListResponse; +import me.chanjar.weixin.channel.test.ApiTestModule; +import me.chanjar.weixin.common.error.WxErrorException; +import org.testng.annotations.Guice; +import org.testng.annotations.Test; + +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + +/** + * @author Winnie + */ +@Guice(modules = ApiTestModule.class) +public class WxChannelLiveDashboardServiceImplTest { + + @Inject + private WxChannelService channelService; + + @Test + public void testGetLiveList() throws WxErrorException { + WxChannelLiveDashboardService liveDashboardService = channelService.getLiveDashboardService(); + // yyyyMMdd + Long ds = 20240630L; + LiveListResponse response = liveDashboardService.getLiveList(ds); + assertNotNull(response); + assertTrue(response.isSuccess()); + } + + @Test + public void testGetLiveData() throws WxErrorException { + WxChannelLiveDashboardService liveDashboardService = channelService.getLiveDashboardService(); + String exportId = "export/UzFf*****************************************************************************************64V"; + LiveDataResponse response = liveDashboardService.getLiveData(exportId); + assertNotNull(response); + assertTrue(response.isSuccess()); + } + +} From 7ece023ce448290217e1df16a0c0359ef7482c78 Mon Sep 17 00:00:00 2001 From: Winnie Date: Tue, 10 Sep 2024 11:37:16 +0800 Subject: [PATCH 2/8] Update LiveDashboardData.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改javadoc中 author标签错误信息 --- .../weixin/channel/bean/live/dashboard/LiveDashboardData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData.java index 63209afb73..2568593f6b 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData.java @@ -9,7 +9,7 @@ /** * 直播大屏数据 * - * @author @author Winnie + * @author Winnie */ @Data @NoArgsConstructor From 72b358bd68e11b3a7398698fbfba7b3cbe8d6857 Mon Sep 17 00:00:00 2001 From: Winnie Date: Tue, 10 Sep 2024 11:39:47 +0800 Subject: [PATCH 3/8] Update LiveDashboardData2Summary.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改javadoc中 author标签错误信息 --- .../channel/bean/live/dashboard/LiveDashboardData2Summary.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Summary.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Summary.java index 06b57c21e1..a9c46ea6e3 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Summary.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Summary.java @@ -9,7 +9,7 @@ /** * 直播基础数据 * - * @author @author Winnie + * @author Winnie */ @Data @NoArgsConstructor From 12b6f69c21bc23972f7587ecd69736332b5f39a6 Mon Sep 17 00:00:00 2001 From: Winnie Date: Tue, 10 Sep 2024 11:40:21 +0800 Subject: [PATCH 4/8] Update LiveDashboardData2.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改javadoc中 author标签错误信息 --- .../weixin/channel/bean/live/dashboard/LiveDashboardData2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2.java index 4f61b1c41d..7a66f9ed1f 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2.java @@ -9,7 +9,7 @@ /** * 直播大屏实体 * - * @author @author Winnie + * @author Winnie */ @Data @NoArgsConstructor From e60d98ea4b81f15ae71d397a318d68be383903f7 Mon Sep 17 00:00:00 2001 From: Winnie Date: Tue, 10 Sep 2024 11:42:19 +0800 Subject: [PATCH 5/8] Update LiveDashboardData2Source.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改javadoc中 author标签错误信息 --- .../channel/bean/live/dashboard/LiveDashboardData2Source.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Source.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Source.java index 915dedce94..12c6121bc7 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Source.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Source.java @@ -10,7 +10,7 @@ /** * 直播流量渠道 * - * @author @author Winnie + * @author Winnie */ @Data @NoArgsConstructor From 3531d1bfd7adae626f3765318c3a400ca5bf134b Mon Sep 17 00:00:00 2001 From: Winnie Date: Tue, 10 Sep 2024 11:42:45 +0800 Subject: [PATCH 6/8] Update LiveDashboardData2Portrait.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改javadoc中 author标签错误信息 --- .../channel/bean/live/dashboard/LiveDashboardData2Portrait.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Portrait.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Portrait.java index d75e364aba..964a6936fc 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Portrait.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/live/dashboard/LiveDashboardData2Portrait.java @@ -10,7 +10,7 @@ /** * 直播观众画像 * - * @author @author Winnie + * @author Winnie */ @Data @NoArgsConstructor From ed74ef47ab87a3c8b15165e79aaa855d31e0b36d Mon Sep 17 00:00:00 2001 From: winnie Date: Sun, 15 Sep 2024 22:23:04 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E3=80=90=E8=A7=86=E9=A2=91=E5=8F=B7?= =?UTF-8?q?=E3=80=91=E5=A2=9E=E5=8A=A0=E6=94=AF=E6=8C=81=E5=A4=9A=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E5=8F=B7=E8=B4=A6=E5=8F=B7=E7=9A=84spring-boot-starte?= =?UTF-8?q?r=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spring-boot-starters/pom.xml | 1 + .../README.md | 123 +++++++++++++++ .../pom.xml | 71 +++++++++ .../WxChannelMultiAutoConfiguration.java | 15 ++ .../WxChannelMultiServiceConfiguration.java | 21 +++ .../AbstractWxChannelConfiguration.java | 140 ++++++++++++++++++ .../WxChannelInJedisConfiguration.java | 74 +++++++++ .../WxChannelInMemoryConfiguration.java | 36 +++++ ...WxChannelInRedisTemplateConfiguration.java | 42 ++++++ .../WxChannelInRedissonConfiguration.java | 62 ++++++++ .../wxjava/channel/enums/HttpClientType.java | 19 +++ .../wxjava/channel/enums/StorageType.java | 26 ++++ .../properties/WxChannelMultiProperties.java | 96 ++++++++++++ .../WxChannelMultiRedisProperties.java | 63 ++++++++ .../properties/WxChannelSingleProperties.java | 43 ++++++ .../service/WxChannelMultiServices.java | 26 ++++ .../service/WxChannelMultiServicesImpl.java | 36 +++++ .../main/resources/META-INF/spring.factories | 2 + ...ot.autoconfigure.AutoConfiguration.imports | 1 + 19 files changed, 897 insertions(+) create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/README.md create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/pom.xml create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/autoconfigure/WxChannelMultiAutoConfiguration.java create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/WxChannelMultiServiceConfiguration.java create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/AbstractWxChannelConfiguration.java create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInJedisConfiguration.java create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInMemoryConfiguration.java create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInRedisTemplateConfiguration.java create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInRedissonConfiguration.java create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/enums/HttpClientType.java create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/enums/StorageType.java create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/properties/WxChannelMultiProperties.java create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/properties/WxChannelMultiRedisProperties.java create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/properties/WxChannelSingleProperties.java create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/service/WxChannelMultiServices.java create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/service/WxChannelMultiServicesImpl.java create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/resources/META-INF/spring.factories create mode 100644 spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml index 9c5f270dc6..fa24d4edab 100644 --- a/spring-boot-starters/pom.xml +++ b/spring-boot-starters/pom.xml @@ -28,6 +28,7 @@ wx-java-cp-multi-spring-boot-starter wx-java-cp-spring-boot-starter wx-java-channel-spring-boot-starter + wx-java-channel-multi-spring-boot-starter diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/README.md b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/README.md new file mode 100644 index 0000000000..c2f082bec8 --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/README.md @@ -0,0 +1,123 @@ +# wx-java-channel-multi-spring-boot-starter + +## 快速开始 + +1. 引入依赖 + ```xml + + + com.github.binarywang + wx-java-channel-multi-spring-boot-starter + ${version} + + + + + redis.clients + jedis + ${jedis.version} + + + + + org.redisson + redisson + ${redisson.version} + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + ``` +2. 添加配置(application.properties) + ```properties + # 视频号配置 + ## 应用 1 配置(必填) + wx.channel.apps.tenantId1.app-id=@appId + wx.channel.apps.tenantId1.secret=@secret + ## 选填 + wx.channel.apps.tenantId1.use-stable-access-token=false + wx.channel.apps.tenantId1.token= + wx.channel.apps.tenantId1.aes-key= + ## 应用 2 配置(必填) + wx.channel.apps.tenantId2.app-id=@appId + wx.channel.apps.tenantId2.secret=@secret + ## 选填 + wx.channel.apps.tenantId2.use-stable-access-token=false + wx.channel.apps.tenantId2.token= + wx.channel.apps.tenantId2.aes-key= + + # ConfigStorage 配置（选填） + ## 配置类型: memory(默认), jedis, redisson, redis_template + wx.channel.config-storage.type=memory + ## 相关redis前缀配置: wx:channel:multi(默认) + wx.channel.config-storage.key-prefix=wx:channel:multi + wx.channel.config-storage.redis.host=127.0.0.1 + wx.channel.config-storage.redis.port=6379 + wx.channel.config-storage.redis.password=123456 + + # redis_template 方式使用spring data redis配置 + spring.data.redis.database=0 + spring.data.redis.host=127.0.0.1 + spring.data.redis.password=123456 + spring.data.redis.port=6379 + + # http 客户端配置（选填） + ## # http客户端类型: http_client(默认) + wx.channel.config-storage.http-client-type=http_client + wx.channel.config-storage.http-proxy-host= + wx.channel.config-storage.http-proxy-port= + wx.channel.config-storage.http-proxy-username= + wx.channel.config-storage.http-proxy-password= + ## 最大重试次数，默认：5 次，如果小于 0，则为 0 + wx.channel.config-storage.max-retry-times=5 + ## 重试时间间隔步进，默认：1000 毫秒，如果小于 0，则为 1000 + wx.channel.config-storage.retry-sleep-millis=1000 + ``` +3. 自动注入的类型：`WxChannelMultiServices` + +4. 使用样例 + + ```java + import com.binarywang.spring.starter.wxjava.channel.service.WxChannelMultiServices; + import me.chanjar.weixin.channel.api.WxChannelService; + import me.chanjar.weixin.channel.api.WxFinderLiveService; + import me.chanjar.weixin.channel.bean.lead.component.response.FinderAttrResponse; + import me.chanjar.weixin.common.error.WxErrorException; + import org.springframework.beans.factory.annotation.Autowired; + import org.springframework.stereotype.Service; + + @Service + public class DemoService { + @Autowired + private WxChannelMultiServices wxChannelMultiServices; + + public void test() throws WxErrorException { + // 应用 1 的 WxChannelService + WxChannelService wxChannelService1 = wxChannelMultiServices.getWxChannelService("tenantId1"); + WxFinderLiveService finderLiveService = wxChannelService1.getFinderLiveService(); + FinderAttrResponse response1 = finderLiveService.getFinderAttrByAppid(); + // todo ... + + // 应用 2 的 WxChannelService + WxChannelService wxChannelService2 = wxChannelMultiServices.getWxChannelService("tenantId2"); + WxFinderLiveService finderLiveService2 = wxChannelService2.getFinderLiveService(); + FinderAttrResponse response2 = finderLiveService2.getFinderAttrByAppid(); + // todo ... + + // 应用 3 的 WxChannelService + WxChannelService wxChannelService3 = wxChannelMultiServices.getWxChannelService("tenantId3"); + // 判断是否为空 + if (wxChannelService3 == null) { + // todo wxChannelService3 为空，请先配置 tenantId3 微信视频号应用参数 + return; + } + WxFinderLiveService finderLiveService3 = wxChannelService3.getFinderLiveService(); + FinderAttrResponse response3 = finderLiveService3.getFinderAttrByAppid(); + // todo ... + } + } + ``` diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/pom.xml new file mode 100644 index 0000000000..563465e3b3 --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/pom.xml @@ -0,0 +1,71 @@ + + + + wx-java-spring-boot-starters + com.github.binarywang + 4.6.5.B + + 4.0.0 + + wx-java-channel-multi-spring-boot-starter + WxJava - Spring Boot Starter for Channel::支持多账号配置 + 微信视频号开发的 Spring Boot Starter::支持多账号配置 + + + + com.github.binarywang + weixin-java-channel + ${project.version} + + + redis.clients + jedis + provided + + + org.redisson + redisson + provided + + + org.springframework.data + spring-data-redis + provided + + + org.jodd + jodd-http + provided + + + com.squareup.okhttp3 + okhttp + provided + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + + diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/autoconfigure/WxChannelMultiAutoConfiguration.java b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/autoconfigure/WxChannelMultiAutoConfiguration.java new file mode 100644 index 0000000000..e6ef922b43 --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/autoconfigure/WxChannelMultiAutoConfiguration.java @@ -0,0 +1,15 @@ +package com.binarywang.spring.starter.wxjava.channel.autoconfigure; + +import com.binarywang.spring.starter.wxjava.channel.configuration.WxChannelMultiServiceConfiguration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + +/** + * 微信视频号自动注册 + * + * @author Winnie + * @date 2024/9/13 + */ +@Configuration +@Import(WxChannelMultiServiceConfiguration.class) +public class WxChannelMultiAutoConfiguration {} diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/WxChannelMultiServiceConfiguration.java b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/WxChannelMultiServiceConfiguration.java new file mode 100644 index 0000000000..17cd0da723 --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/WxChannelMultiServiceConfiguration.java @@ -0,0 +1,21 @@ +package com.binarywang.spring.starter.wxjava.channel.configuration; + +import com.binarywang.spring.starter.wxjava.channel.configuration.services.WxChannelInJedisConfiguration; +import com.binarywang.spring.starter.wxjava.channel.configuration.services.WxChannelInMemoryConfiguration; +import com.binarywang.spring.starter.wxjava.channel.configuration.services.WxChannelInRedisTemplateConfiguration; +import com.binarywang.spring.starter.wxjava.channel.configuration.services.WxChannelInRedissonConfiguration; +import com.binarywang.spring.starter.wxjava.channel.properties.WxChannelMultiProperties; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + +/** + * 微信视频号相关服务自动注册 + * + * @author Winnie + * @date 2024/9/13 + */ +@Configuration +@EnableConfigurationProperties(WxChannelMultiProperties.class) +@Import({WxChannelInJedisConfiguration.class, WxChannelInMemoryConfiguration.class, WxChannelInRedissonConfiguration.class, WxChannelInRedisTemplateConfiguration.class}) +public class WxChannelMultiServiceConfiguration {} diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/AbstractWxChannelConfiguration.java b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/AbstractWxChannelConfiguration.java new file mode 100644 index 0000000000..2e3f92a5f4 --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/AbstractWxChannelConfiguration.java @@ -0,0 +1,140 @@ +package com.binarywang.spring.starter.wxjava.channel.configuration.services; + +import com.binarywang.spring.starter.wxjava.channel.enums.HttpClientType; +import com.binarywang.spring.starter.wxjava.channel.properties.WxChannelMultiProperties; +import com.binarywang.spring.starter.wxjava.channel.properties.WxChannelSingleProperties; +import com.binarywang.spring.starter.wxjava.channel.service.WxChannelMultiServices; +import com.binarywang.spring.starter.wxjava.channel.service.WxChannelMultiServicesImpl; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import me.chanjar.weixin.channel.api.WxChannelService; +import me.chanjar.weixin.channel.api.impl.WxChannelServiceHttpClientImpl; +import me.chanjar.weixin.channel.api.impl.WxChannelServiceImpl; +import me.chanjar.weixin.channel.config.WxChannelConfig; +import me.chanjar.weixin.channel.config.impl.WxChannelDefaultConfigImpl; +import org.apache.commons.lang3.StringUtils; + +import java.util.Collection; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * WxChannelConfigStorage 抽象配置类 + * + * @author Winnie + * @date 2024/9/13 + */ +@RequiredArgsConstructor +@Slf4j +public abstract class AbstractWxChannelConfiguration { + protected WxChannelMultiServices wxChannelMultiServices(WxChannelMultiProperties wxChannelMultiProperties) { + Map appsMap = wxChannelMultiProperties.getApps(); + if (appsMap == null || appsMap.isEmpty()) { + log.warn("微信视频号应用参数未配置，通过 WxChannelMultiServices#getWxChannelService(\"tenantId\")获取实例将返回空"); + return new WxChannelMultiServicesImpl(); + } + /** + * 校验 appId 是否唯一，避免使用 redis 缓存 token、ticket 时错乱。 + * + * 查看 {@link me.chanjar.weixin.channel.config.impl.WxChannelRedisConfigImpl#setAppid(String)} + */ + Collection apps = appsMap.values(); + if (apps.size() > 1) { + // 校验 appId 是否唯一 + boolean multi = apps.stream() + // 没有 appId，如果不判断是否为空，这里会报 NPE 异常 + .collect(Collectors.groupingBy(c -> c.getAppId() == null ? 0 : c.getAppId(), Collectors.counting())) + .entrySet().stream().anyMatch(e -> e.getValue() > 1); + if (multi) { + throw new RuntimeException("请确保微信视频号配置 appId 的唯一性"); + } + } + WxChannelMultiServicesImpl services = new WxChannelMultiServicesImpl(); + + Set> entries = appsMap.entrySet(); + for (Map.Entry entry : entries) { + String tenantId = entry.getKey(); + WxChannelSingleProperties wxChannelSingleProperties = entry.getValue(); + WxChannelDefaultConfigImpl storage = this.wxChannelConfigStorage(wxChannelMultiProperties); + this.configApp(storage, wxChannelSingleProperties); + this.configHttp(storage, wxChannelMultiProperties.getConfigStorage()); + WxChannelService wxChannelService = this.wxChannelService(storage, wxChannelMultiProperties, wxChannelSingleProperties.isUseStableAccessToken()); + services.addWxChannelService(tenantId, wxChannelService); + } + return services; + } + + /** + * 配置 WxChannelDefaultConfigImpl + * + * @param wxChannelMultiProperties 参数 + * @return WxChannelDefaultConfigImpl + */ + protected abstract WxChannelDefaultConfigImpl wxChannelConfigStorage(WxChannelMultiProperties wxChannelMultiProperties); + + public WxChannelService wxChannelService(WxChannelConfig wxChannelConfig, WxChannelMultiProperties wxChannelMultiProperties, boolean useStableAccessToken) { + WxChannelMultiProperties.ConfigStorage storage = wxChannelMultiProperties.getConfigStorage(); + HttpClientType httpClientType = storage.getHttpClientType(); + WxChannelService wxChannelService; + switch (httpClientType) { +// case OK_HTTP: +// wxChannelService = new WxChannelServiceOkHttpImpl(false, false); +// break; + case HTTP_CLIENT: + wxChannelService = new WxChannelServiceHttpClientImpl(useStableAccessToken, false); + break; + default: + wxChannelService = new WxChannelServiceImpl(); + break; + } + + wxChannelService.setConfig(wxChannelConfig); + int maxRetryTimes = storage.getMaxRetryTimes(); + if (maxRetryTimes < 0) { + maxRetryTimes = 0; + } + int retrySleepMillis = storage.getRetrySleepMillis(); + if (retrySleepMillis < 0) { + retrySleepMillis = 1000; + } + wxChannelService.setRetrySleepMillis(retrySleepMillis); + wxChannelService.setMaxRetryTimes(maxRetryTimes); + return wxChannelService; + } + + private void configApp(WxChannelDefaultConfigImpl config, WxChannelSingleProperties wxChannelSingleProperties) { + String appId = wxChannelSingleProperties.getAppId(); + String appSecret = wxChannelSingleProperties.getSecret(); + String token = wxChannelSingleProperties.getToken(); + String aesKey = wxChannelSingleProperties.getAesKey(); + + config.setAppid(appId); + config.setSecret(appSecret); + if (StringUtils.isNotBlank(token)) { + config.setToken(token); + } + if (StringUtils.isNotBlank(aesKey)) { + config.setAesKey(aesKey); + } + } + + private void configHttp(WxChannelDefaultConfigImpl config, WxChannelMultiProperties.ConfigStorage storage) { + String httpProxyHost = storage.getHttpProxyHost(); + Integer httpProxyPort = storage.getHttpProxyPort(); + String httpProxyUsername = storage.getHttpProxyUsername(); + String httpProxyPassword = storage.getHttpProxyPassword(); + if (StringUtils.isNotBlank(httpProxyHost)) { + config.setHttpProxyHost(httpProxyHost); + if (httpProxyPort != null) { + config.setHttpProxyPort(httpProxyPort); + } + if (StringUtils.isNotBlank(httpProxyUsername)) { + config.setHttpProxyUsername(httpProxyUsername); + } + if (StringUtils.isNotBlank(httpProxyPassword)) { + config.setHttpProxyPassword(httpProxyPassword); + } + } + } +} diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInJedisConfiguration.java b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInJedisConfiguration.java new file mode 100644 index 0000000000..d19b0fc4b5 --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInJedisConfiguration.java @@ -0,0 +1,74 @@ +package com.binarywang.spring.starter.wxjava.channel.configuration.services; + +import com.binarywang.spring.starter.wxjava.channel.properties.WxChannelMultiProperties; +import com.binarywang.spring.starter.wxjava.channel.properties.WxChannelMultiRedisProperties; +import com.binarywang.spring.starter.wxjava.channel.service.WxChannelMultiServices; +import lombok.RequiredArgsConstructor; +import me.chanjar.weixin.channel.config.impl.WxChannelDefaultConfigImpl; +import me.chanjar.weixin.channel.config.impl.WxChannelRedisConfigImpl; +import me.chanjar.weixin.common.redis.JedisWxRedisOps; +import org.apache.commons.lang3.StringUtils; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import redis.clients.jedis.JedisPool; +import redis.clients.jedis.JedisPoolConfig; + +/** + * 自动装配基于 jedis 策略配置 + * + * @author Winnie + * @date 2024/9/13 + */ +@Configuration +@ConditionalOnProperty(prefix = WxChannelMultiProperties.PREFIX + ".config-storage", name = "type", havingValue = "jedis") +@RequiredArgsConstructor +public class WxChannelInJedisConfiguration extends AbstractWxChannelConfiguration { + private final WxChannelMultiProperties wxChannelMultiProperties; + private final ApplicationContext applicationContext; + + @Bean + public WxChannelMultiServices wxChannelMultiServices() { + return this.wxChannelMultiServices(wxChannelMultiProperties); + } + + @Override + protected WxChannelDefaultConfigImpl wxChannelConfigStorage(WxChannelMultiProperties wxChannelMultiProperties) { + return this.configRedis(wxChannelMultiProperties); + } + + private WxChannelDefaultConfigImpl configRedis(WxChannelMultiProperties wxChannelMultiProperties) { + WxChannelMultiRedisProperties wxChannelMultiRedisProperties = wxChannelMultiProperties.getConfigStorage().getRedis(); + JedisPool jedisPool; + if (wxChannelMultiRedisProperties != null && StringUtils.isNotEmpty(wxChannelMultiRedisProperties.getHost())) { + jedisPool = getJedisPool(wxChannelMultiProperties); + } else { + jedisPool = applicationContext.getBean(JedisPool.class); + } + return new WxChannelRedisConfigImpl(new JedisWxRedisOps(jedisPool), wxChannelMultiProperties.getConfigStorage().getKeyPrefix()); + } + + private JedisPool getJedisPool(WxChannelMultiProperties wxChannelMultiProperties) { + WxChannelMultiProperties.ConfigStorage storage = wxChannelMultiProperties.getConfigStorage(); + WxChannelMultiRedisProperties redis = storage.getRedis(); + + JedisPoolConfig config = new JedisPoolConfig(); + if (redis.getMaxActive() != null) { + config.setMaxTotal(redis.getMaxActive()); + } + if (redis.getMaxIdle() != null) { + config.setMaxIdle(redis.getMaxIdle()); + } + if (redis.getMaxWaitMillis() != null) { + config.setMaxWaitMillis(redis.getMaxWaitMillis()); + } + if (redis.getMinIdle() != null) { + config.setMinIdle(redis.getMinIdle()); + } + config.setTestOnBorrow(true); + config.setTestWhileIdle(true); + + return new JedisPool(config, redis.getHost(), redis.getPort(), redis.getTimeout(), redis.getPassword(), redis.getDatabase()); + } +} diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInMemoryConfiguration.java b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInMemoryConfiguration.java new file mode 100644 index 0000000000..77bb221f25 --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInMemoryConfiguration.java @@ -0,0 +1,36 @@ +package com.binarywang.spring.starter.wxjava.channel.configuration.services; + +import com.binarywang.spring.starter.wxjava.channel.properties.WxChannelMultiProperties; +import com.binarywang.spring.starter.wxjava.channel.service.WxChannelMultiServices; +import lombok.RequiredArgsConstructor; +import me.chanjar.weixin.channel.config.impl.WxChannelDefaultConfigImpl; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 自动装配基于内存策略配置 + * + * @author Winnie + * @date 2024/9/13 + */ +@Configuration +@ConditionalOnProperty(prefix = WxChannelMultiProperties.PREFIX + ".config-storage", name = "type", havingValue = "memory", matchIfMissing = true) +@RequiredArgsConstructor +public class WxChannelInMemoryConfiguration extends AbstractWxChannelConfiguration { + private final WxChannelMultiProperties wxChannelMultiProperties; + + @Bean + public WxChannelMultiServices wxChannelMultiServices() { + return this.wxChannelMultiServices(wxChannelMultiProperties); + } + + @Override + protected WxChannelDefaultConfigImpl wxChannelConfigStorage(WxChannelMultiProperties wxChannelMultiProperties) { + return this.configInMemory(); + } + + private WxChannelDefaultConfigImpl configInMemory() { + return new WxChannelDefaultConfigImpl(); + } +} diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInRedisTemplateConfiguration.java b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInRedisTemplateConfiguration.java new file mode 100644 index 0000000000..f9defdb94a --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInRedisTemplateConfiguration.java @@ -0,0 +1,42 @@ +package com.binarywang.spring.starter.wxjava.channel.configuration.services; + +import com.binarywang.spring.starter.wxjava.channel.properties.WxChannelMultiProperties; +import com.binarywang.spring.starter.wxjava.channel.service.WxChannelMultiServices; +import lombok.RequiredArgsConstructor; +import me.chanjar.weixin.channel.config.impl.WxChannelDefaultConfigImpl; +import me.chanjar.weixin.channel.config.impl.WxChannelRedisConfigImpl; +import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.core.StringRedisTemplate; + +/** + * 自动装配基于 redisTemplate 策略配置 + * + * @author Winnie + * @date 2024/9/13 + */ +@Configuration +@ConditionalOnProperty(prefix = WxChannelMultiProperties.PREFIX + ".config-storage", name = "type", havingValue = "redis_template") +@RequiredArgsConstructor +public class WxChannelInRedisTemplateConfiguration extends AbstractWxChannelConfiguration { + private final WxChannelMultiProperties wxChannelMultiProperties; + private final ApplicationContext applicationContext; + + @Bean + public WxChannelMultiServices wxChannelMultiServices() { + return this.wxChannelMultiServices(wxChannelMultiProperties); + } + + @Override + protected WxChannelDefaultConfigImpl wxChannelConfigStorage(WxChannelMultiProperties wxChannelMultiProperties) { + return this.configRedisTemplate(wxChannelMultiProperties); + } + + private WxChannelDefaultConfigImpl configRedisTemplate(WxChannelMultiProperties wxChannelMultiProperties) { + StringRedisTemplate redisTemplate = applicationContext.getBean(StringRedisTemplate.class); + return new WxChannelRedisConfigImpl(new RedisTemplateWxRedisOps(redisTemplate), wxChannelMultiProperties.getConfigStorage().getKeyPrefix()); + } +} diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInRedissonConfiguration.java b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInRedissonConfiguration.java new file mode 100644 index 0000000000..fa4798a18b --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/WxChannelInRedissonConfiguration.java @@ -0,0 +1,62 @@ +package com.binarywang.spring.starter.wxjava.channel.configuration.services; + +import com.binarywang.spring.starter.wxjava.channel.properties.WxChannelMultiProperties; +import com.binarywang.spring.starter.wxjava.channel.properties.WxChannelMultiRedisProperties; +import com.binarywang.spring.starter.wxjava.channel.service.WxChannelMultiServices; +import lombok.RequiredArgsConstructor; +import me.chanjar.weixin.channel.config.impl.WxChannelDefaultConfigImpl; +import me.chanjar.weixin.channel.config.impl.WxChannelRedissonConfigImpl; +import org.apache.commons.lang3.StringUtils; +import org.redisson.Redisson; +import org.redisson.api.RedissonClient; +import org.redisson.config.Config; +import org.redisson.config.TransportMode; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 自动装配基于 redisson 策略配置 + * + * @author Winnie + * @date 2024/9/13 + */ +@Configuration +@ConditionalOnProperty(prefix = WxChannelMultiProperties.PREFIX + ".config-storage", name = "type", havingValue = "redisson") +@RequiredArgsConstructor +public class WxChannelInRedissonConfiguration extends AbstractWxChannelConfiguration { + private final WxChannelMultiProperties wxChannelMultiProperties; + private final ApplicationContext applicationContext; + + @Bean + public WxChannelMultiServices wxChannelMultiServices() { + return this.wxChannelMultiServices(wxChannelMultiProperties); + } + + @Override + protected WxChannelDefaultConfigImpl wxChannelConfigStorage(WxChannelMultiProperties wxChannelMultiProperties) { + return this.configRedisson(wxChannelMultiProperties); + } + + private WxChannelDefaultConfigImpl configRedisson(WxChannelMultiProperties wxChannelMultiProperties) { + WxChannelMultiRedisProperties redisProperties = wxChannelMultiProperties.getConfigStorage().getRedis(); + RedissonClient redissonClient; + if (redisProperties != null && StringUtils.isNotEmpty(redisProperties.getHost())) { + redissonClient = getRedissonClient(wxChannelMultiProperties); + } else { + redissonClient = applicationContext.getBean(RedissonClient.class); + } + return new WxChannelRedissonConfigImpl(redissonClient, wxChannelMultiProperties.getConfigStorage().getKeyPrefix()); + } + + private RedissonClient getRedissonClient(WxChannelMultiProperties wxChannelMultiProperties) { + WxChannelMultiProperties.ConfigStorage storage = wxChannelMultiProperties.getConfigStorage(); + WxChannelMultiRedisProperties redis = storage.getRedis(); + + Config config = new Config(); + config.useSingleServer().setAddress("redis://" + redis.getHost() + ":" + redis.getPort()).setDatabase(redis.getDatabase()).setPassword(redis.getPassword()); + config.setTransportMode(TransportMode.NIO); + return Redisson.create(config); + } +} diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/enums/HttpClientType.java b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/enums/HttpClientType.java new file mode 100644 index 0000000000..6ca09354a3 --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/enums/HttpClientType.java @@ -0,0 +1,19 @@ +package com.binarywang.spring.starter.wxjava.channel.enums; + +/** + * httpclient类型 + * + * @author Winnie + * @date 2024/9/13 + */ +public enum HttpClientType { + /** + * HttpClient + */ + HTTP_CLIENT, + // WxChannelServiceOkHttpImpl 实现经测试无法正常完成业务固暂不支持OK_HTTP方式 +// /** +// * OkHttp. +// */ +// OK_HTTP, +} diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/enums/StorageType.java b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/enums/StorageType.java new file mode 100644 index 0000000000..0ee69eca73 --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/enums/StorageType.java @@ -0,0 +1,26 @@ +package com.binarywang.spring.starter.wxjava.channel.enums; + +/** + * storage类型 + * + * @author Winnie + * @date 2024/9/13 + */ +public enum StorageType { + /** + * 内存 + */ + MEMORY, + /** + * redis(JedisClient) + */ + JEDIS, + /** + * redis(Redisson) + */ + REDISSON, + /** + * redis(RedisTemplate) + */ + REDIS_TEMPLATE +} diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/properties/WxChannelMultiProperties.java b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/properties/WxChannelMultiProperties.java new file mode 100644 index 0000000000..d22f560282 --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/properties/WxChannelMultiProperties.java @@ -0,0 +1,96 @@ +package com.binarywang.spring.starter.wxjava.channel.properties; + +import com.binarywang.spring.starter.wxjava.channel.enums.HttpClientType; +import com.binarywang.spring.starter.wxjava.channel.enums.StorageType; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.NestedConfigurationProperty; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +/** + * 微信多视频号接入相关配置属性 + * + * @author Winnie + * @date 2024/9/13 + */ +@Data +@NoArgsConstructor +@ConfigurationProperties(WxChannelMultiProperties.PREFIX) +public class WxChannelMultiProperties implements Serializable { + private static final long serialVersionUID = - 8361973118805546037L; + public static final String PREFIX = "wx.channel"; + + private Map apps = new HashMap<>(); + + /** + * 存储策略 + */ + private final ConfigStorage configStorage = new ConfigStorage(); + + @Data + @NoArgsConstructor + public static class ConfigStorage implements Serializable { + private static final long serialVersionUID = - 5152619132544179942L; + + /** + * 存储类型. + */ + private StorageType type = StorageType.MEMORY; + + /** + * 指定key前缀. + */ + private String keyPrefix = "wx:channel:multi"; + + /** + * redis连接配置. + */ + @NestedConfigurationProperty + private final WxChannelMultiRedisProperties redis = new WxChannelMultiRedisProperties(); + + /** + * http客户端类型. + */ + private HttpClientType httpClientType = HttpClientType.HTTP_CLIENT; + + /** + * http代理主机. + */ + private String httpProxyHost; + + /** + * http代理端口. + */ + private Integer httpProxyPort; + + /** + * http代理用户名. + */ + private String httpProxyUsername; + + /** + * http代理密码. + */ + private String httpProxyPassword; + + /** + * http 请求最大重试次数 + * + *

{@link me.chanjar.weixin.channel.api.WxChannelService#setMaxRetryTimes(int)}

+ *

{@link me.chanjar.weixin.channel.api.impl.BaseWxChannelServiceImpl#setMaxRetryTimes(int)}

+ */ + private int maxRetryTimes = 5; + + /** + * http 请求重试间隔 + * + *

{@link me.chanjar.weixin.channel.api.WxChannelService#setRetrySleepMillis(int)}

+ *

{@link me.chanjar.weixin.channel.api.impl.BaseWxChannelServiceImpl#setRetrySleepMillis(int)}

+ */ + private int retrySleepMillis = 1000; + } +} diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/properties/WxChannelMultiRedisProperties.java b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/properties/WxChannelMultiRedisProperties.java new file mode 100644 index 0000000000..99c426765c --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/properties/WxChannelMultiRedisProperties.java @@ -0,0 +1,63 @@ +package com.binarywang.spring.starter.wxjava.channel.properties; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * Redis配置 + * + * @author Winnie + * @date 2024/9/13 + */ +@Data +@NoArgsConstructor +public class WxChannelMultiRedisProperties implements Serializable { + private static final long serialVersionUID = 9061055444734277357L; + + /** + * 主机地址. + */ + private String host = "127.0.0.1"; + + /** + * 端口号. + */ + private int port = 6379; + + /** + * 密码. + */ + private String password; + + /** + * 超时. + */ + private int timeout = 2000; + + /** + * 数据库. + */ + private int database = 0; + + /** + * 最大活动连接数 + */ + private Integer maxActive; + + /** + * 最大空闲连接数 + */ + private Integer maxIdle; + + /** + * 最小空闲连接数 + */ + private Integer minIdle; + + /** + * 最大等待时间 + */ + private Integer maxWaitMillis; +} diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/properties/WxChannelSingleProperties.java b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/properties/WxChannelSingleProperties.java new file mode 100644 index 0000000000..3e8e2f52bf --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/properties/WxChannelSingleProperties.java @@ -0,0 +1,43 @@ +package com.binarywang.spring.starter.wxjava.channel.properties; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 微信视频号相关配置属性 + * + * @author Winnie + * @date 2024/9/13 + */ +@Data +@NoArgsConstructor +public class WxChannelSingleProperties implements Serializable { + private static final long serialVersionUID = 5306630351265124825L; + + /** + * 设置微信视频号的 appid. + */ + private String appId; + + /** + * 设置微信视频号的 secret. + */ + private String secret; + + /** + * 设置微信视频号的 token. + */ + private String token; + + /** + * 设置微信视频号的 EncodingAESKey. + */ + private String aesKey; + + /** + * 是否使用稳定版 Access Token + */ + private boolean useStableAccessToken = false; +} diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/service/WxChannelMultiServices.java b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/service/WxChannelMultiServices.java new file mode 100644 index 0000000000..acd4ebf20b --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/service/WxChannelMultiServices.java @@ -0,0 +1,26 @@ +package com.binarywang.spring.starter.wxjava.channel.service; + +import me.chanjar.weixin.channel.api.WxChannelService; + +/** + * 视频号 {@link WxChannelService} 所有实例存放类. + * + * @author Winnie + * @date 2024/9/13 + */ +public interface WxChannelMultiServices { + /** + * 通过租户 Id 获取 WxChannelService + * + * @param tenantId 租户 Id + * @return WxChannelService + */ + WxChannelService getWxChannelService(String tenantId); + + /** + * 根据租户 Id，从列表中移除一个 WxChannelService 实例 + * + * @param tenantId 租户 Id + */ + void removeWxChannelService(String tenantId); +} diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/service/WxChannelMultiServicesImpl.java b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/service/WxChannelMultiServicesImpl.java new file mode 100644 index 0000000000..1673289cb5 --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/service/WxChannelMultiServicesImpl.java @@ -0,0 +1,36 @@ +package com.binarywang.spring.starter.wxjava.channel.service; + +import me.chanjar.weixin.channel.api.WxChannelService; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * 视频号 {@link WxChannelMultiServices} 实现 + * + * @author Winnie + * @date 2024/9/13 + */ +public class WxChannelMultiServicesImpl implements WxChannelMultiServices { + private final Map services = new ConcurrentHashMap<>(); + + @Override + public WxChannelService getWxChannelService(String tenantId) { + return this.services.get(tenantId); + } + + /** + * 根据租户 Id，添加一个 WxChannelService 到列表 + * + * @param tenantId 租户 Id + * @param wxChannelService WxChannelService 实例 + */ + public void addWxChannelService(String tenantId, WxChannelService wxChannelService) { + this.services.put(tenantId, wxChannelService); + } + + @Override + public void removeWxChannelService(String tenantId) { + this.services.remove(tenantId); + } +} diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/resources/META-INF/spring.factories b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000000..2c5a939c32 --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.binarywang.spring.starter.wxjava.channel.autoconfigure.WxChannelMultiAutoConfiguration diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000000..d21a2cdc8d --- /dev/null +++ b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.binarywang.spring.starter.wxjava.channel.autoconfigure.WxChannelMultiAutoConfiguration From 31b1d06b6a59226974d7a741f0178b2a334ec3d7 Mon Sep 17 00:00:00 2001 From: winnie Date: Thu, 24 Jul 2025 16:33:41 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E3=80=90=E4=BC=81=E4=B8=9A=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E3=80=91=E8=A1=A5=E5=85=85[=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E8=AF=A6=E6=83=85]=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AF=B9=E8=B1=A1=E4=B8=AD=E5=AD=97=E6=AE=B5?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cp/bean/oa/meeting/WxCpMeeting.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/meeting/WxCpMeeting.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/meeting/WxCpMeeting.java index 0efbc5a772..0ad79538e4 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/meeting/WxCpMeeting.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/meeting/WxCpMeeting.java @@ -65,6 +65,35 @@ public class WxCpMeeting implements Serializable, ToJson { @SerializedName("agentid") private Integer agentId; + /** + * 发起人所在部门 + */ + @SerializedName("main_department") + private Integer mainDepartment; + + /** + * 会议的状态。 + * 1：待开始 + * 2：会议中 + * 3：已结束 + * 4：已取消 + * 5：已过期 + */ + @SerializedName("status") + public Integer status; + + /** + * 会议类型。 + * 0：一次性会议 + * 1：周期性会议 + * 2：微信专属会议 + * 3：Rooms 投屏会议 + * 5：个人会议号会议 + * 6：网络研讨会 + */ + @SerializedName("meeting_type") + private Integer meetingType; + /** * 参与会议的成员。会议人数上限，以指定的「管理员」可预约的人数上限来校验，普通企业与会人员最多100；