update: 分页版本详情、版本用户来源、新增用户去重

pig-statistics/pig-statistics-api/src/main/java/com/pig4cloud/pig/statistics/api/dto/user/GetVersionDistributionDTO.java

@@ -2,6 +2,7 @@ package com.pig4cloud.pig.statistics.api.dto.user;
 
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 import java.io.Serial;
@@ -20,21 +21,23 @@ public class GetVersionDistributionDTO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 查询条件名称
+	 * 应用ID
 	 */
-	@Schema(description = "查询条件名称")
-	private String conditionName;
+	@NotBlank(message = "应用ID不能为空")
+	@Schema(description = "应用ID", example = "Fqs2CL9CUn7U1AqilSFXgb")
+	private String appId;
 
 	/**
-	 * 查询条件值
+	 * 版本
 	 */
-	@Schema(description = "查询条件值")
-	private String conditionValue;
+	@NotBlank(message = "版本不能为空")
+	@Schema(description = "版本", example = "1.0.0")
+	private String version;
 
 	/**
 	 * 时间单位
 	 */
-	@Schema(description = "时间单位")
+	@Schema(description = "时间单位,昨天-day,过去7天-week,过去30天-month", example = "day")
 	private String timeUnit;
 
 	/**

pig-statistics/pig-statistics-api/src/main/java/com/pig4cloud/pig/statistics/api/dto/user/PageVersionDistributionDetailDTO.java

@@ -2,6 +2,7 @@ package com.pig4cloud.pig.statistics.api.dto.user;
 
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 import java.io.Serial;
@@ -20,21 +21,23 @@ public class PageVersionDistributionDetailDTO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 查询条件名称
+	 * 应用ID
 	 */
-	@Schema(description = "查询条件名称")
-	private String conditionName;
+	@NotBlank(message = "应用ID不能为空")
+	@Schema(description = "应用ID", example = "Fqs2CL9CUn7U1AqilSFXgb")
+	private String appId;
 
 	/**
-	 * 查询条件值
+	 * 版本
 	 */
-	@Schema(description = "查询条件值")
-	private String conditionValue;
+	@NotBlank(message = "版本不能为空")
+	@Schema(description = "版本", example = "1.0.0")
+	private String version;
 
 	/**
 	 * 时间单位
 	 */
-	@Schema(description = "时间单位")
+	@Schema(description = "时间单位,昨天-day,过去7天-week,过去30天-month", example = "day")
 	private String timeUnit;
 
 	/**
@@ -46,12 +49,12 @@ public class PageVersionDistributionDetailDTO implements Serializable {
 	/**
 	 * 每页显示条数，默认 10
 	 */
-	@Schema(description = "每页显示条数")
+	@Schema(description = "每页显示条数", example = "10")
 	private long size = 10;
 
 	/**
 	 * 当前页
 	 */
-	@Schema(description = "当前页")
+	@Schema(description = "当前页", example = "1")
 	private long current = 1;
 }

pig-statistics/pig-statistics-api/src/main/java/com/pig4cloud/pig/statistics/api/vo/user/PageVersionDistributionDetailVO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @author: lwh
@@ -23,7 +24,7 @@ public class PageVersionDistributionDetailVO implements Serializable {
 	 * 占比率
 	 */
 	@Schema(description = "占比率")
-	private Double rate;
+	private BigDecimal rate;
 
 	/**
 	 * 名称

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

@@ -160,7 +160,7 @@ public class UserAnalyseController {
 
 	@PostMapping("/version/single/detail")
 	@Operation(summary = "分页查询单版本详情")
-	public R<Page<PageSingleVersionDetailVO>> pageSingleVersionDetail(@Valid @RequestBody PageSingleVersionDetailDTO reqDto) {
+	public R<Page<PageSingleVersionDetailVO>> pageSingleVersionDetail(@Valid @RequestBody PageUserAnalyseDTO reqDto) {
 		Page<PageSingleVersionDetailVO> result = userAnalyseService.pageSingleVersionDetail(reqDto);
 		return R.ok(result);
 	}

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

@@ -114,7 +114,7 @@ public interface UserAnalyseService {
 	 * @param reqDto 入参
 	 * @return Page
 	 */
-	Page<PageSingleVersionDetailVO> pageSingleVersionDetail(@Valid PageSingleVersionDetailDTO reqDto);
+	Page<PageSingleVersionDetailVO> pageSingleVersionDetail(@Valid PageUserAnalyseDTO reqDto);
 
 	/**
 	 * 查询版本用户来源