new: 新增、活跃全部应用查询

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

@@ -59,13 +59,13 @@ public class MarketingAppsController {
 	@GetMapping("/list")
 	@Operation(summary = "查询应用列表")
 	public R<List<MarketingAppsVO>> MarketingApps(@Valid @ParameterObject Boolean isAll) {
-//		if (isAll) {
+		if (isAll) {
 			List<MarketingAppsVO> marketingAppsVOS = marketingAppsService.marketingApps();
 			return R.ok(marketingAppsVOS);
-//		}else {
-//			List<MarketingAppsVO> marketingAppsVOS = marketingAppsService.getMarketingApps();
-//			return R.ok(marketingAppsVOS);
-//		}
+		}else {
+			List<MarketingAppsVO> marketingAppsVOS = marketingAppsService.getMarketingApps();
+			return R.ok(marketingAppsVOS);
+		}
 	}
 
 	@GetMapping("/detail")

pig-marketing/pig-marketing-biz/src/main/java/com/pig4cloud/pig/marketing/mapper/MarketingAppsMapper.java

@@ -65,4 +65,10 @@ public interface MarketingAppsMapper extends BaseMapper<MarketingApps> {
 	 * @return int
 	 */
 	int saveMktStatNewUser(MktStatNewUser mktStatNewUser);
+
+	/**
+	 * 获取有数据的应用列表
+	 * @return List<MarketingApps>
+	 */
+	List<MarketingApps> getAppsWithData();
 }

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

@@ -153,8 +153,18 @@ public class MarketingAppsServiceImpl implements MarketingAppsService {
 	 */
 	@Override
 	public List<MarketingAppsVO> getMarketingApps() {
+		// 查询有数据的应用列表
+		List<MarketingApps> apps = appsMapper.getAppsWithData();
 
-		return List.of();
+		// 转换为VO对象
+		List<MarketingAppsVO> marketingAppsVOList = new ArrayList<>();
+		for (MarketingApps app : apps) {
+			MarketingAppsVO appsVO = new MarketingAppsVO();
+			BeanUtils.copyProperties(app, appsVO);
+			marketingAppsVOList.add(appsVO);
+		}
+
+		return marketingAppsVOList;
 	}
 
 	/**

pig-marketing/pig-marketing-biz/src/main/resources/mapper/MarketingAppsMapper.xml

@@ -195,4 +195,21 @@
 		GROUP BY md.fingerprint
 		ORDER BY lastTime DESC
 	</select>
+
+	<select id="getAppsWithData" resultType="com.pig4cloud.pig.marketing.api.entity.MarketingApps">
+		SELECT DISTINCT ma.*
+		FROM mkt_mgmt_apps ma
+		WHERE ma.status = 1
+		  AND ma.del_flag = '0'
+		  AND ma.app_id IN (
+			SELECT DISTINCT app_id
+			FROM mkt_stat_new_user
+			WHERE del_flag = '0'
+			UNION
+			SELECT DISTINCT app_id
+			FROM mkt_stat_active_user
+			WHERE del_flag = '0'
+		)
+		ORDER BY ma.create_time DESC
+	</select>
 </mapper>

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

@@ -1218,7 +1218,7 @@ public class UserAnalyseServiceImpl implements UserAnalyseService {
 	private List<String> getActiveUserIdList(LocalDateTime startTime, LocalDateTime endTime, String appId, String version, List<String> channels){
 		// 1. 组装查询条件
 		LambdaQueryWrapper<MktStatActiveUser> queryWrapper = Wrappers.<MktStatActiveUser>lambdaQuery()
-				.eq(MktStatActiveUser::getAppId, appId)
+				.eq(appId != null && !"-1".equals(appId), MktStatActiveUser::getAppId, appId)
 				.ge(startTime != null, MktStatActiveUser::getStatDate, startTime)
 				.lt(endTime != null, MktStatActiveUser::getStatDate, endTime)
 				.select(MktStatActiveUser::getUserId)
@@ -1244,7 +1244,7 @@ public class UserAnalyseServiceImpl implements UserAnalyseService {
 
 		// 1. 组装查询条件
 		LambdaQueryWrapper<MktStatNewUser> queryWrapper = Wrappers.<MktStatNewUser>lambdaQuery()
-				.eq(MktStatNewUser::getAppId, appId)
+				.eq(appId != null && !"-1".equals(appId), MktStatNewUser::getAppId, appId)
 				.ge(startTime != null ,MktStatNewUser::getStatDate, startTime)
 				.lt(endTime != null ,MktStatNewUser::getStatDate, endTime)
 				.select(MktStatNewUser::getUserId)
@@ -1294,7 +1294,7 @@ public class UserAnalyseServiceImpl implements UserAnalyseService {
 	private Long statLaunchCount(LocalDateTime startTime, LocalDateTime endTime, String appId, String version, List<String> channels){
 		// 1. 组装查询条件
 		LambdaQueryWrapper<MktStatUserAnalysis> queryWrapper = Wrappers.<MktStatUserAnalysis>lambdaQuery()
-				.eq(MktStatUserAnalysis::getAppId, appId)
+				.eq(appId != null && !"-1".equals(appId), MktStatUserAnalysis::getAppId, appId)
 				.ge(startTime != null ,MktStatUserAnalysis::getStatDate, startTime)
 				.lt(endTime != null ,MktStatUserAnalysis::getStatDate, endTime)
 				.select(MktStatUserAnalysis::getLaunch);
@@ -1323,7 +1323,7 @@ public class UserAnalyseServiceImpl implements UserAnalyseService {
 
 		// 1. 组装查询条件
 		LambdaQueryWrapper<MktStatNewUser> queryWrapper = Wrappers.<MktStatNewUser>lambdaQuery()
-				.eq(MktStatNewUser::getAppId, appId)
+				.eq(appId != null && !"-1".equals(appId), MktStatNewUser::getAppId, appId)
 				.eq(oldVersion != null && !oldVersion.isEmpty(), MktStatNewUser::getOldVersion, oldVersion)
 				.isNotNull(MktStatNewUser::getOldVersion)
 				.ne(MktStatNewUser::getOldVersion, "")