Преглед на файлове

流失卸载接口定义请求参数修改

wangcl преди 1 месец
родител
ревизия
61768a081f

+ 1 - 1
pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerConfiguration.java

@@ -79,7 +79,7 @@ public class PigResourceServerConfiguration {
 			.toArray(new PathPatternRequestMatcher[] {});
 
 		http.authorizeHttpRequests(authorizeRequests -> authorizeRequests.requestMatchers(permitMatchers)
-			.permitAll()
+			.permitAll().requestMatchers("/uninstall/*").permitAll()
 			.anyRequest()
 			.authenticated())
 			.oauth2ResourceServer(

+ 4 - 4
pig-statistics/pig-statistics-api/src/main/java/com/pig4cloud/pig/statistics/api/dto/uninstall/GetUninstallInsightDTO.java

@@ -1,8 +1,7 @@
 package com.pig4cloud.pig.statistics.api.dto.uninstall;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 
 /**
  * @author: wcl
@@ -10,8 +9,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
  * @description: 获取卸载用户洞察DTO
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Schema(description = "获取卸载用户洞察参数")
-public class GetUninstallInsightDTO extends UninstallAnalyseQueryDTO {
+public class GetUninstallInsightDTO {
 
+	@Schema(description = "周期(周/月)")
+	private String cycle;
 }

+ 3 - 0
pig-statistics/pig-statistics-api/src/main/java/com/pig4cloud/pig/statistics/api/dto/uninstall/InstallUninstallRatioDTO.java

@@ -12,4 +12,7 @@ import lombok.Data;
 @Data
 @Schema(description = "安装卸载比DTO")
 public class InstallUninstallRatioDTO {
+
+	@Schema(description = "周期(周/月)")
+	private String cycle;
 }

+ 1 - 1
pig-statistics/pig-statistics-api/src/main/java/com/pig4cloud/pig/statistics/api/dto/uninstall/UninstallAnalyseQueryDTO.java

@@ -9,7 +9,7 @@ import lombok.Data;
  * @description: 流失卸载分析查询基础DTO
  */
 @Data
-@Schema(name = "UninstallAnalyseQueryDTO", description = "流失卸载分析查询参数")
+@Schema(description = "流失卸载分析查询参数")
 public class UninstallAnalyseQueryDTO {
 
     @Schema(description = "开始时间(yyyy-MM-dd)")

+ 3 - 0
pig-statistics/pig-statistics-api/src/main/java/com/pig4cloud/pig/statistics/api/dto/uninstall/UninstallPredictDTO.java

@@ -12,4 +12,7 @@ import lombok.Data;
 @Data
 @Schema(description = "卸载预测DTO")
 public class UninstallPredictDTO {
+
+	@Schema(description = "周期(周/月)")
+	private String cycle;
 }

+ 1 - 1
pig-statistics/pig-statistics-api/src/main/java/com/pig4cloud/pig/statistics/api/vo/uninstall/UninstallInsightVO.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @description: 卸载用户洞察VO
  */
 @Data
-@Schema(name = "UninstallInsightVO", description = "卸载用户洞察返回数据")
+@Schema(description = "卸载用户洞察返回数据")
 public class UninstallInsightVO {
 
     @Schema(description = "安装存量时长分布")

+ 24 - 0
pig-statistics/pig-statistics-api/src/main/java/com/pig4cloud/pig/statistics/api/vo/uninstall/UninstallOfterAPPOV.java

@@ -0,0 +1,24 @@
+package com.pig4cloud.pig.statistics.api.vo.uninstall;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author wcl
+ * @date 2025/8/15 15:19
+ * @description: 卸载后流向APP
+ */
+@Data
+@Schema(description = "卸载后流向AppVO")
+public class UninstallOfterAPPOV {
+
+	@Schema(description = "卸载后流向APP")
+	private String appName;
+
+	@Schema(description = "卸载后流向APP数量")
+	private Integer count;
+
+	@Schema(description = "卸载后流向APP占比")
+	private String proportion;
+}

+ 24 - 0
pig-statistics/pig-statistics-api/src/main/java/com/pig4cloud/pig/statistics/api/vo/uninstall/UninstallSYSOV.java

@@ -0,0 +1,24 @@
+package com.pig4cloud.pig.statistics.api.vo.uninstall;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wcl
+ * @date 2025/8/15 15:35
+ * @description: 卸载后系统设备分布
+ */
+@Data
+@Schema(description = "卸载后系统设备分布VO")
+public class UninstallSYSOV {
+
+	@Schema(description = "维度名称")
+	private String dimensionName;
+
+	@Schema(description = "分布")
+	private List<Map<String, Integer>> distribution;
+}

+ 3 - 3
pig-statistics/pig-statistics-biz/src/main/java/com/pig4cloud/pig/statistics/controller/UninstallAnalyseController.java

@@ -41,7 +41,7 @@ public class UninstallAnalyseController {
 
 	@PostMapping("/active")
 	@Operation(summary = "卸载设备活跃情况")
-	public R<UninstallInsightVO> getActive(@RequestBody GetUninstallInsightDTO dto) {
+	public R<UninstallInsightVO> getActive(@RequestBody GetUninstallInsightDTO dto)  {
 		return R.ok();
 	}
 
@@ -53,13 +53,13 @@ public class UninstallAnalyseController {
 
 	@PostMapping("/uninstallAfter")
 	@Operation(summary = "卸载后流失")
-	public R uninstallAfter(@RequestBody GetUninstallInsightDTO dto) {
+	public R<List<UninstallOfterAPPOV>> uninstallAfter(@RequestBody GetUninstallInsightDTO dto) {
 		return R.ok();
 	}
 
 	@PostMapping("/uninstallSys")
 	@Operation(summary = "设备系统分布")
-	public R uninstallSys(@RequestBody uninstallSysDTO dto) {
+	public R<List<UninstallSYSOV>> uninstallSys(@RequestBody GetUninstallInsightDTO dto) {
 		return R.ok();
 	}