update: 明确接口出参

pig-marketing/pig-marketing-biz/src/main/java/com/pig4cloud/pig/marketing/controller/MarketingAppsController.java

@@ -6,6 +6,8 @@ import com.pig4cloud.pig.common.core.exception.BusinessException;
 import com.pig4cloud.pig.common.core.util.R;
 import com.pig4cloud.pig.marketing.api.dto.app.*;
 import com.pig4cloud.pig.marketing.api.vo.app.PageMarketingAppsVO;
+import com.pig4cloud.pig.marketing.api.vo.app.PageStatAppFirstMktDataVO;
+import com.pig4cloud.pig.marketing.api.vo.app.PageStatAppSecondMktDataVO;
 import com.pig4cloud.pig.marketing.service.MarketingAppsService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -50,7 +52,7 @@ public class MarketingAppsController {
 
 	@GetMapping("/detail")
 	@Operation(summary = "查询应用详情")
-	public R getMarketingAppById(@ParameterObject Long id) {
+	public R<PageMarketingAppsVO> getMarketingAppById(@ParameterObject Long id) {
 		if (id == null){
 			throw new BusinessException("应用ID不能为空");
 		}
@@ -141,7 +143,7 @@ public class MarketingAppsController {
 	 */
 	@GetMapping("/stat/page")
 	@Operation(summary = "分页统计应用一级营销数据")
-	public R pageStatAppFirstMktData(@Valid @ParameterObject PageStatAppMktDataDTO reqDto) {
+	public R<Page<PageStatAppFirstMktDataVO>> pageStatAppFirstMktData(@Valid @ParameterObject PageStatAppMktDataDTO reqDto) {
 		return R.ok(marketingAppsService.pageStatAppFirstMktData(reqDto));
 	}
 
@@ -152,8 +154,8 @@ public class MarketingAppsController {
 	 */
 	@GetMapping("/stat/second/page")
 	@Operation(summary = "分页统计应用二级营销数据")
-	public R pageStatAppSecondMktData(@Valid @ParameterObject PageStatAppMktDataDTO reqDto,
-									  @Valid
+	public R<Page<PageStatAppSecondMktDataVO>> pageStatAppSecondMktData(@Valid @ParameterObject PageStatAppMktDataDTO reqDto,
+																		@Valid
 									  @ParameterObject
 									  @NotBlank(message = "ip不能为空")
 									  @Schema(description = "ip") String ip) {

pig-marketing/pig-marketing-biz/src/main/java/com/pig4cloud/pig/marketing/controller/MarketingConfigController.java

@@ -48,7 +48,7 @@ public class MarketingConfigController {
 	 */
 	@PostMapping("/delGroup")
 	@Operation(summary = "删除分组")
-	public R delMarketingConfigGroup(@Valid @RequestBody DelMarketingGroupDTO reqDto) {
+	public R<Boolean> delMarketingConfigGroup(@Valid @RequestBody DelMarketingGroupDTO reqDto) {
 		return R.ok(marketingConfigService.delMarketingConfigGroup(reqDto));
 	}
 
@@ -81,7 +81,7 @@ public class MarketingConfigController {
 	 */
 	@GetMapping("/getDomainGroup")
 	@Operation(summary = "获取域名分组列表")
-	public R getMarketingDomainGroupList() {
+	public R<List<GetMarketingDomainGroupVO>> getMarketingDomainGroupList() {
 		List<GetMarketingDomainGroupVO> res = marketingConfigService.getMarketingDomainGroupList();
 		return R.ok(res);
 	}
@@ -102,7 +102,7 @@ public class MarketingConfigController {
 	 */
 	@GetMapping("/getIpGroup")
 	@Operation(summary = "获取IP分组列表")
-	public R getMarketingIpGroupList() {
+	public R<List<GetMarketingIpGroupVO>> getMarketingIpGroupList() {
 		List<GetMarketingIpGroupVO> res = marketingConfigService.getMarketingIpGroupList();
 		return R.ok(res);
 	}
@@ -113,7 +113,7 @@ public class MarketingConfigController {
 	 */
 	@GetMapping("/ipList")
 	@Operation(summary = "获取IP集合")
-	public R getMarketingConfigIpList() {
+	public R<List<GetMarketingConfigIpListVO>> getMarketingConfigIpList() {
 		List<GetMarketingConfigIpListVO> res = marketingConfigService.getMarketingConfigIpList();
 		return R.ok(res);
 	}
@@ -124,7 +124,7 @@ public class MarketingConfigController {
 	 */
 	@PostMapping("/addIp")
 	@Operation(summary = "IP集合添加IP")
-	public R addMarketingConfigIpList(@Valid @RequestBody AddMarketingConfigIpListDTO reqDto) {
+	public R<Boolean> addMarketingConfigIpList(@Valid @RequestBody AddMarketingConfigIpListDTO reqDto) {
 		return R.ok(marketingConfigService.addMarketingConfigIpList(reqDto));
 	}
 
@@ -134,7 +134,7 @@ public class MarketingConfigController {
 	 */
 	@GetMapping("/delIp/{id}")
 	@Operation(summary = "IP集合删除IP")
-	public R delMarketingConfigIpList(@PathVariable Long id) {
+	public R<Boolean> delMarketingConfigIpList(@PathVariable Long id) {
 		if (id == null) {
 			throw new BusinessException("id不能为空");
 		}
@@ -147,7 +147,7 @@ public class MarketingConfigController {
 	 */
 	@GetMapping("/domainList")
 	@Operation(summary = "获取域名集合")
-	public R getMarketingConfigDomainList() {
+	public R<List<GetMarketingConfigDomainListVO>> getMarketingConfigDomainList() {
 		List<GetMarketingConfigDomainListVO> res = marketingConfigService.getMarketingConfigDomainList();
 		return R.ok(res);
 	}
@@ -158,7 +158,7 @@ public class MarketingConfigController {
 	 */
 	@PostMapping("/addDomain")
 	@Operation(summary = "域名集合添加域名")
-	public R addMarketingConfigDomainList(@Valid @RequestBody AddMarketingConfigDomainListDTO reqDto) {
+	public R<Boolean> addMarketingConfigDomainList(@Valid @RequestBody AddMarketingConfigDomainListDTO reqDto) {
 		return R.ok(marketingConfigService.addMarketingConfigDomainList(reqDto));
 	}
 
@@ -168,7 +168,7 @@ public class MarketingConfigController {
 	 */
 	@GetMapping("/delDomain/{id}")
 	@Operation(summary = "域名集合删除域名")
-	public R delMarketingConfigDomainList(@PathVariable Long id) {
+	public R<Boolean> delMarketingConfigDomainList(@PathVariable Long id) {
 		if (id == null){
 			throw new BusinessException("id不能为空");
 		}
@@ -181,7 +181,7 @@ public class MarketingConfigController {
 	 */
 	@GetMapping("/getConfig")
 	@Operation(summary = "查询全局配置信息")
-	public R getMarketingGlobalConfig() {
+	public R<GetMarketingGlobalConfigVO> getMarketingGlobalConfig() {
 		return R.ok(marketingConfigService.getMarketingGlobalConfig());
 	}
 
@@ -191,7 +191,7 @@ public class MarketingConfigController {
 	 */
 	@PostMapping("/setConfig")
 	@Operation(summary = "设置全局配置信息")
-	public R setMarketingGlobalConfig(@Valid @RequestBody GetMarketingGlobalConfigVO reDto) {
+	public R<Boolean> setMarketingGlobalConfig(@Valid @RequestBody GetMarketingGlobalConfigVO reDto) {
 		return R.ok(marketingConfigService.setMarketingGlobalConfig(reDto));
 	}
 

pig-marketing/pig-marketing-biz/src/main/java/com/pig4cloud/pig/marketing/controller/MarketingDataController.java

@@ -1,12 +1,15 @@
 package com.pig4cloud.pig.marketing.controller;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pig.common.core.util.R;
 import com.pig4cloud.pig.common.security.annotation.Inner;
 import com.pig4cloud.pig.marketing.api.dto.data.MarketingDataReportDTO;
 import com.pig4cloud.pig.marketing.api.dto.data.PageSecondLevelDataDTO;
 import com.pig4cloud.pig.marketing.api.vo.data.MarketingDataReportVO;
 import com.pig4cloud.pig.marketing.api.dto.data.PageFirstLevelDataDTO;
+import com.pig4cloud.pig.marketing.api.vo.data.PageFirstLevelDataVO;
+import com.pig4cloud.pig.marketing.api.vo.data.PageSecondLevelDataVO;
 import com.pig4cloud.pig.marketing.service.MarketingDataService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -35,20 +38,20 @@ public class MarketingDataController {
 	@Inner(value = false)
 	@PostMapping("/report")
 	@Operation(summary = "上报营销数据")
-	public R reportMarketingData(@RequestBody MarketingDataReportDTO reqDto, HttpServletRequest request) {
+	public R<MarketingDataReportVO> reportMarketingData(@RequestBody MarketingDataReportDTO reqDto, HttpServletRequest request) {
 		MarketingDataReportVO result= dataService.reportMarketingData(reqDto, request);
 		return R.ok(result);
 	}
 
 	@GetMapping("/page")
 	@Operation(summary = "分页统计一级营销数据")
-	public R pageFirstLevelData(@ParameterObject PageFirstLevelDataDTO reqDto) {
+	public R<Page<PageFirstLevelDataVO>> pageFirstLevelData(@ParameterObject PageFirstLevelDataDTO reqDto) {
 		return R.ok(dataService.pageFirstLevelData(reqDto));
 	}
 
 	@GetMapping("/detail")
 	@Operation(summary = "分页统计二级营销数据")
-	public R pageSecondLevelData(@ParameterObject PageSecondLevelDataDTO reqDto) {
+	public R<Page<PageSecondLevelDataVO>> pageSecondLevelData(@ParameterObject PageSecondLevelDataDTO reqDto) {
 		return R.ok(dataService.pageSecondLevelData(reqDto));
 	}
 

pig-marketing/pig-marketing-biz/src/main/java/com/pig4cloud/pig/marketing/service/MarketingAppsService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pig.common.core.util.R;
 import com.pig4cloud.pig.marketing.api.dto.app.*;
 import com.pig4cloud.pig.marketing.api.vo.app.PageMarketingAppsVO;
+import com.pig4cloud.pig.marketing.api.vo.app.PageStatAppFirstMktDataVO;
+import com.pig4cloud.pig.marketing.api.vo.app.PageStatAppSecondMktDataVO;
 import jakarta.validation.Valid;
 
 import java.util.List;
@@ -78,7 +80,7 @@ public interface MarketingAppsService {
 	 * @param reqDto 查询参数
 	 * @return 一级营销数据
 	 */
-	Page pageStatAppFirstMktData(PageStatAppMktDataDTO reqDto);
+	Page<PageStatAppFirstMktDataVO> pageStatAppFirstMktData(PageStatAppMktDataDTO reqDto);
 
 	/**
 	 * 分页统计应用二级营销数据
@@ -86,7 +88,7 @@ public interface MarketingAppsService {
 	 * @param ip ip
 	 * @return 二级营销数据
 	 */
-	Page pageStatAppSecondMktData(PageStatAppMktDataDTO reqDto, String ip);
+	Page<PageStatAppSecondMktDataVO> pageStatAppSecondMktData(PageStatAppMktDataDTO reqDto, String ip);
 
 	/**
 	 * 校验IP冲突

pig-marketing/pig-marketing-biz/src/main/java/com/pig4cloud/pig/marketing/service/MarketingDataService.java

@@ -6,6 +6,8 @@ import com.pig4cloud.pig.marketing.api.dto.data.MarketingDataReportDTO;
 import com.pig4cloud.pig.marketing.api.dto.data.PageFirstLevelDataDTO;
 import com.pig4cloud.pig.marketing.api.dto.data.PageSecondLevelDataDTO;
 import com.pig4cloud.pig.marketing.api.vo.data.MarketingDataReportVO;
+import com.pig4cloud.pig.marketing.api.vo.data.PageFirstLevelDataVO;
+import com.pig4cloud.pig.marketing.api.vo.data.PageSecondLevelDataVO;
 import jakarta.servlet.http.HttpServletRequest;
 
 /**
@@ -28,12 +30,12 @@ public interface MarketingDataService {
 	 * @param reqDto 分页参数
 	 * @return Page
 	 */
-	Page pageFirstLevelData(PageFirstLevelDataDTO reqDto);
+	Page<PageFirstLevelDataVO> pageFirstLevelData(PageFirstLevelDataDTO reqDto);
 
 	/**
 	 * 分页统计二级营销数据
 	 * @param reqDto 分页参数
 	 * @return Page
 	 */
-	Page pageSecondLevelData(PageSecondLevelDataDTO reqDto);
+	Page<PageSecondLevelDataVO> pageSecondLevelData(PageSecondLevelDataDTO reqDto);
 }

pig-marketing/pig-marketing-biz/src/main/java/com/pig4cloud/pig/marketing/service/impl/MarketingAppsServiceImpl.java

@@ -392,7 +392,7 @@ public class MarketingAppsServiceImpl implements MarketingAppsService {
 	 * @return 一级营销数据
 	 */
 	@Override
-	public Page pageStatAppFirstMktData(PageStatAppMktDataDTO reqDto) {
+	public Page<PageStatAppFirstMktDataVO> pageStatAppFirstMktData(PageStatAppMktDataDTO reqDto) {
 		Page<PageStatAppFirstMktDataVO> page = new Page<>(reqDto.getCurrent(), reqDto.getSize());
 
 		LocalDateTime[] timeRange = reqDto.getTimeRange();
@@ -416,7 +416,7 @@ public class MarketingAppsServiceImpl implements MarketingAppsService {
 	 * @return 二级营销数据
 	 */
 	@Override
-	public Page pageStatAppSecondMktData(PageStatAppMktDataDTO reqDto, String ip) {
+	public Page<PageStatAppSecondMktDataVO> pageStatAppSecondMktData(PageStatAppMktDataDTO reqDto, String ip) {
 		Page<PageStatAppSecondMktDataVO> page = new Page<>(reqDto.getCurrent(), reqDto.getSize());
 
 		LocalDateTime[] timeRange = reqDto.getTimeRange();

pig-marketing/pig-marketing-biz/src/main/java/com/pig4cloud/pig/marketing/service/impl/MarketingDataServiceImpl.java

@@ -214,7 +214,7 @@ public class MarketingDataServiceImpl implements MarketingDataService {
 	 * @return Page
 	 */
 	@Override
-	public Page pageFirstLevelData(PageFirstLevelDataDTO reqDto) {
+	public Page<PageFirstLevelDataVO> pageFirstLevelData(PageFirstLevelDataDTO reqDto) {
 		String ip = reqDto.getIp();
 		// 计算时间条件
 		LocalDateTime now = LocalDateTime.now();
@@ -245,7 +245,7 @@ public class MarketingDataServiceImpl implements MarketingDataService {
 	 * @return Page
 	 */
 	@Override
-	public Page pageSecondLevelData(PageSecondLevelDataDTO reqDto) {
+	public Page<PageSecondLevelDataVO> pageSecondLevelData(PageSecondLevelDataDTO reqDto) {
 		String ip = reqDto.getIp();
 
 		// 计算时间条件

pig-statistics/pig-statistics-biz/src/main/java/com/pig4cloud/pig/statistics/controller/UserAnalyseController.java

@@ -35,15 +35,15 @@ public class UserAnalyseController {
 
 	@PostMapping("/new/trend")
 	@Operation(summary = "查询新增趋势")
-	public R getNewUserTrend(@Valid @RequestBody UserAnalyseQueryBaseDTO reqDto) {
+	public R<GetNewUserTrendVO> getNewUserTrend(@Valid @RequestBody UserAnalyseQueryBaseDTO reqDto) {
 		GetNewUserTrendVO result = userAnalyseService.getNewUserTrend(reqDto);
 		return R.ok(result);
 	}
 
 	@PostMapping("/new/detail")
 	@Operation(summary = "分页查询新增趋势详情")
-	public R pageNewUserTrendDetail(@Valid @RequestBody PageNewUserTrendDetailDTO reqDto) {
-		Page result = userAnalyseService.pageNewUserTrendDetail(reqDto);
+	public R<Page<PageNewUserTrendDetailVO>> pageNewUserTrendDetail(@Valid @RequestBody PageNewUserTrendDetailDTO reqDto) {
+		Page<PageNewUserTrendDetailVO> result = userAnalyseService.pageNewUserTrendDetail(reqDto);
 		return R.ok(result);
 	}
 
@@ -55,14 +55,14 @@ public class UserAnalyseController {
 
 	@PostMapping("/new/retention")
 	@Operation(summary = "查询次日留存率")
-	public R getNewUserRetention(@Valid @RequestBody GetNewUserRetentionDTO reqDto) {
+	public R<GetNewUserRetentionVO> getNewUserRetention(@Valid @RequestBody GetNewUserRetentionDTO reqDto) {
 		GetNewUserRetentionVO result = userAnalyseService.getNewUserRetention(reqDto);
 		return R.ok(result);
 	}
 	@PostMapping("/retention/detail")
 	@Operation(summary = "分页查询次日留存率详情")
-	public R pageNewUserRetentionDetail(@Valid @RequestBody PageRetentionDetailDTO reqDto) {
-		Page result = userAnalyseService.pageNewUserRetentionDetail(reqDto);
+	public R<Page<PageRetentionDetailVO>> pageNewUserRetentionDetail(@Valid @RequestBody PageRetentionDetailDTO reqDto) {
+		Page<PageRetentionDetailVO> result = userAnalyseService.pageNewUserRetentionDetail(reqDto);
 		return R.ok(result);
 	}
 
@@ -76,43 +76,43 @@ public class UserAnalyseController {
 
 	@PostMapping("/active/trend")
 	@Operation(summary = "查询活跃趋势")
-	public R getActiveTrend(@Valid @RequestBody UserAnalyseQueryBaseDTO reqDto) {
+	public R<GetNewUserTrendVO> getActiveTrend(@Valid @RequestBody UserAnalyseQueryBaseDTO reqDto) {
 		GetNewUserTrendVO result = userAnalyseService.getActiveTrend(reqDto);
 		return R.ok(result);
 	}
 
 	@PostMapping("/active/compose")
 	@Operation(summary = "查询活跃构成")
-	public R getActiveCompose(@Valid @RequestBody UserAnalyseQueryBaseDTO reqDto) {
+	public R<GetActiveUserBaseVO> getActiveCompose(@Valid @RequestBody UserAnalyseQueryBaseDTO reqDto) {
 		GetActiveUserBaseVO result = userAnalyseService.getActiveCompose(reqDto);
 		return R.ok(result);
 	}
 
 	@PostMapping("/active/viscosity")
 	@Operation(summary = "查询活跃粘度")
-	public R getActiveViscosity(@Valid @RequestBody UserAnalyseQueryBaseDTO reqDto) {
+	public R<GetActiveUserBaseVO> getActiveViscosity(@Valid @RequestBody UserAnalyseQueryBaseDTO reqDto) {
 		GetActiveUserBaseVO result = userAnalyseService.getActiveViscosity(reqDto);
 		return R.ok(result);
 	}
 
 	@PostMapping("/active/weekrate")
 	@Operation(summary = "查询周活跃率")
-	public R getActiveWeekrate(@Valid @RequestBody UserAnalyseQueryBaseDTO reqDto) {
+	public R<GetActiveUserBaseVO> getActiveWeekrate(@Valid @RequestBody UserAnalyseQueryBaseDTO reqDto) {
 		GetActiveUserBaseVO result = userAnalyseService.getActiveWeekrate(reqDto);
 		return R.ok(result);
 	}
 
 	@PostMapping("/active/monthrate")
 	@Operation(summary = "查询月活跃率")
-	public R getActiveMonthrate(@Valid @RequestBody UserAnalyseQueryBaseDTO reqDto) {
+	public R<GetActiveUserBaseVO> getActiveMonthrate(@Valid @RequestBody UserAnalyseQueryBaseDTO reqDto) {
 		GetActiveUserBaseVO result = userAnalyseService.getActiveMonthrate(reqDto);
 		return R.ok(result);
 	}
 
 	@PostMapping("/active/detail")
 	@Operation(summary = "分页查询活跃详情")
-	public R pageActiveDetail(@Valid @RequestBody PageActiveDetailDTO reqDto) {
-		Page result = userAnalyseService.pageActiveDetail(reqDto);
+	public R<Page<PageActiveDetailVO>> pageActiveDetail(@Valid @RequestBody PageActiveDetailDTO reqDto) {
+		Page<PageActiveDetailVO> result = userAnalyseService.pageActiveDetail(reqDto);
 		return R.ok(result);
 	}
 
@@ -125,15 +125,15 @@ public class UserAnalyseController {
 /***************************************** 启动次数 *****************************************/
 	@PostMapping("/launch/trend")
 	@Operation(summary = "查询启动次数趋势")
-	public R getLaunchTrend(@Valid @RequestBody UserAnalyseQueryBaseDTO reqDto) {
+	public R<GetNewUserTrendVO> getLaunchTrend(@Valid @RequestBody UserAnalyseQueryBaseDTO reqDto) {
 		GetNewUserTrendVO result = userAnalyseService.getLaunchTrend(reqDto);
 		return R.ok(result);
 	}
 
 	@PostMapping("/launch/detail")
 	@Operation(summary = "分页查询启动次数详情")
-	public R pageLaunchDetail(@Valid @RequestBody PageActiveDetailDTO reqDto) {
-		Page result = userAnalyseService.pageLaunchDetail(reqDto);
+	public R<Page<PageLaunchDetailVO>> pageLaunchDetail(@Valid @RequestBody PageActiveDetailDTO reqDto) {
+		Page<PageLaunchDetailVO> result = userAnalyseService.pageLaunchDetail(reqDto);
 		return R.ok(result);
 	}
 
@@ -147,8 +147,8 @@ public class UserAnalyseController {
 
 	@PostMapping("/version/detail")
 	@Operation(summary = "分页查询全部版本详情")
-	public R pageAllVersionDetail(@Valid @RequestBody PageAllVersionDetailDTO reqDto) {
-		Page result = userAnalyseService.pageAllVersionDetail(reqDto);
+	public R<Page<PageAllVersionDetailVO>> pageAllVersionDetail(@Valid @RequestBody PageAllVersionDetailDTO reqDto) {
+		Page<PageAllVersionDetailVO> result = userAnalyseService.pageAllVersionDetail(reqDto);
 		return R.ok(result);
 	}
 
@@ -160,8 +160,8 @@ public class UserAnalyseController {
 
 	@PostMapping("/version/single/detail")
 	@Operation(summary = "分页查询单版本详情")
-	public R pageSingleVersionDetail(@Valid @RequestBody PageSingleVersionDetailDTO reqDto) {
-		Page result = userAnalyseService.pageSingleVersionDetail(reqDto);
+	public R<Page<PageSingleVersionDetailVO>> pageSingleVersionDetail(@Valid @RequestBody PageSingleVersionDetailDTO reqDto) {
+		Page<PageSingleVersionDetailVO> result = userAnalyseService.pageSingleVersionDetail(reqDto);
 		return R.ok(result);
 	}
 
@@ -173,15 +173,15 @@ public class UserAnalyseController {
 
 	@PostMapping("/version/distribution")
 	@Operation(summary = "查询版本用户来源")
-	public R getVersionDistribution(@Valid @RequestBody GetVersionDistributionDTO reqDto) {
+	public R<List<GetVersionDistributionVO>> getVersionDistribution(@Valid @RequestBody GetVersionDistributionDTO reqDto) {
 		List<GetVersionDistributionVO> result = userAnalyseService.getVersionDistribution(reqDto);
 		return R.ok(result);
 	}
 
 	@PostMapping("/version/distribution/detail")
 	@Operation(summary = "分页查询版本用户来源详情")
-	public R pageVersionDistributionDetail(@Valid @RequestBody PageVersionDistributionDetailDTO reqDto) {
-		Page result = userAnalyseService.pageVersionDistributionDetail(reqDto);
+	public R<Page<PageVersionDistributionDetailVO>> pageVersionDistributionDetail(@Valid @RequestBody PageVersionDistributionDetailDTO reqDto) {
+		Page<PageVersionDistributionDetailVO> result = userAnalyseService.pageVersionDistributionDetail(reqDto);
 		return R.ok(result);
 	}
 

pig-statistics/pig-statistics-biz/src/main/java/com/pig4cloud/pig/statistics/service/UserAnalyseService.java

@@ -28,7 +28,7 @@ public interface UserAnalyseService {
 	 * @param reqDto 请求参数
 	 * @return Page
 	 */
-	Page pageNewUserTrendDetail(@Valid PageNewUserTrendDetailDTO reqDto);
+	Page<PageNewUserTrendDetailVO> pageNewUserTrendDetail(@Valid PageNewUserTrendDetailDTO reqDto);
 
 	/**
 	 * 查询次日留存率
@@ -42,7 +42,7 @@ public interface UserAnalyseService {
 	 * @param reqDto 分页查询次日留存率详情入参
 	 * @return Page
 	 */
-	Page pageNewUserRetentionDetail(@Valid PageRetentionDetailDTO reqDto);
+	Page<PageRetentionDetailVO> pageNewUserRetentionDetail(@Valid PageRetentionDetailDTO reqDto);
 
 
 	/************************************** 活跃用户 *****************************************
@@ -86,7 +86,7 @@ public interface UserAnalyseService {
 	 * @param reqDto 入参
 	 * @return Page
 	 */
-	Page pageActiveDetail(@Valid PageActiveDetailDTO reqDto);
+	Page<PageActiveDetailVO> pageActiveDetail(@Valid PageActiveDetailDTO reqDto);
 
 	/************************************** 启动次数 *****************************************
 	 * 查询启动次数趋势
@@ -100,21 +100,21 @@ public interface UserAnalyseService {
 	 * @param reqDto 入参
 	 * @return Page
 	 */
-	Page pageLaunchDetail(@Valid PageActiveDetailDTO reqDto);
+	Page<PageLaunchDetailVO> pageLaunchDetail(@Valid PageActiveDetailDTO reqDto);
 
 	/************************************** 版本分布 *****************************************
 	 * 分页查询全部版本详情
 	 * @param reqDto 入参
 	 * @return Page
 	 */
-	Page pageAllVersionDetail(@Valid PageAllVersionDetailDTO reqDto);
+	Page<PageAllVersionDetailVO> pageAllVersionDetail(@Valid PageAllVersionDetailDTO reqDto);
 
 	/**
 	 * 分页查询单版本详情
 	 * @param reqDto 入参
 	 * @return Page
 	 */
-	Page pageSingleVersionDetail(@Valid PageSingleVersionDetailDTO reqDto);
+	Page<PageSingleVersionDetailVO> pageSingleVersionDetail(@Valid PageSingleVersionDetailDTO reqDto);
 
 	/**
 	 * 查询版本用户来源
@@ -128,5 +128,5 @@ public interface UserAnalyseService {
 	 * @param reqDto 入参
 	 * @return Page
 	 */
-	Page pageVersionDistributionDetail(@Valid PageVersionDistributionDetailDTO reqDto);
+	Page<PageVersionDistributionDetailVO> pageVersionDistributionDetail(@Valid PageVersionDistributionDetailDTO reqDto);
 }

pig-statistics/pig-statistics-biz/src/main/java/com/pig4cloud/pig/statistics/service/impl/UserAnalyseServiceImpl.java

@@ -629,7 +629,7 @@ public class UserAnalyseServiceImpl implements UserAnalyseService {
 	 * @return Page
 	 */
 	@Override
-	public Page pageActiveDetail(PageActiveDetailDTO reqDto) {
+	public Page<PageActiveDetailVO> pageActiveDetail(PageActiveDetailDTO reqDto) {
 		Page<PageActiveDetailVO> page = new Page<>(reqDto.getCurrent(), reqDto.getSize());
 		List<PageActiveDetailVO> result = new ArrayList<>();
 		String timeUnit = reqDto.getTimeUnit();