From 79ffb83481f181ba648b4c84d9c8feb11d0fc9cf Mon Sep 17 00:00:00 2001 From: khalil <842328916@qq.com> Date: Tue, 26 Aug 2025 17:17:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0-sud=E5=B0=8F=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E6=97=B6=E9=95=BF=E7=BB=9F=E8=AE=A1-gameId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../miniGame/MiniGameForSudAdminStatsVo.java | 2 +- .../miniGame/MiniGameForSudAdminMapper.java | 4 +- .../miniGame/MiniGameForSudAdminService.java | 44 +++++++------------ .../mapper/MiniGameForSudAdminMapper.xml | 4 +- .../MiniGameForSudAdminController.java | 16 +++---- .../miniGame/impl/MiniGameServiceImpl.java | 3 -- 6 files changed, 29 insertions(+), 44 deletions(-) diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/miniGame/MiniGameForSudAdminStatsVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/miniGame/MiniGameForSudAdminStatsVo.java index 9324c2b88..c37b44d13 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/miniGame/MiniGameForSudAdminStatsVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/miniGame/MiniGameForSudAdminStatsVo.java @@ -11,7 +11,7 @@ public class MiniGameForSudAdminStatsVo { * 游戏ID */ @ApiModelProperty("游戏ID") - private Long gameId; + private String gameId; /** * 游戏名称 diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/miniGame/MiniGameForSudAdminMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/miniGame/MiniGameForSudAdminMapper.java index 98924f4c7..d8b647380 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/miniGame/MiniGameForSudAdminMapper.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/miniGame/MiniGameForSudAdminMapper.java @@ -20,7 +20,7 @@ public interface MiniGameForSudAdminMapper extends BaseMapper { * @param endTime 结束时间戳 * @return 统计结果 */ - List statGameDurationByMonth(@Param("gameId") Long gameId, + List statGameDurationByMonth(@Param("gameId") String gameId, @Param("startTime") Long startTime, @Param("endTime") Long endTime); @@ -33,7 +33,7 @@ public interface MiniGameForSudAdminMapper extends BaseMapper { * @return 统计结果 */ List pageGameRoundDetail(Page page, - @Param("gameId") Long gameId, + @Param("gameId") String gameId, @Param("startTime") Long startTime, @Param("endTime") Long endTime); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/miniGame/MiniGameForSudAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/miniGame/MiniGameForSudAdminService.java index 59fc2652d..3e25a8a8d 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/miniGame/MiniGameForSudAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/miniGame/MiniGameForSudAdminService.java @@ -6,9 +6,8 @@ import com.accompany.business.model.miniGame.MiniGame; import com.accompany.business.model.miniGame.MiniGameRound; import com.accompany.admin.mapper.miniGame.MiniGameForSudAdminMapper; import com.accompany.business.service.miniGame.MiniGameService; -import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.AdminServiceException; +import com.accompany.core.util.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; @@ -16,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import javax.servlet.http.HttpServletResponse; import java.util.Collections; import java.util.Date; import java.util.List; @@ -39,10 +37,17 @@ public class MiniGameForSudAdminService extends ServiceImpl listStat(Long gameId, String month) { + public List listStat(String gameId, String month) { // 获取所有游戏信息 - List miniGameList = null == gameId? miniGameService.miniGameAllList(null): - Collections.singletonList(miniGameService.queryMiniGameByMgId(gameId)); + List miniGameList = miniGameService.miniGameAllList(null); + if (CollectionUtils.isEmpty(miniGameList)){ + return Collections.emptyList(); + } + + if (!StringUtils.isBlank(gameId)){ + miniGameList = miniGameList.stream().filter(game -> game.getMgIdStr().equals(gameId)).toList(); + } + if (CollectionUtils.isEmpty(miniGameList)){ return Collections.emptyList(); } @@ -58,13 +63,13 @@ public class MiniGameForSudAdminService extends ServiceImpl statMap = statList.stream().collect(Collectors.toMap(MiniGameForSudAdminStatsVo::getGameId, vo -> vo)); + Map statMap = statList.stream().collect(Collectors.toMap(MiniGameForSudAdminStatsVo::getGameId, vo -> vo)); return miniGameList.stream().map(game -> { - MiniGameForSudAdminStatsVo vo = statMap.get(game.getMgId()); + MiniGameForSudAdminStatsVo vo = statMap.get(game.getMgIdStr()); if (vo == null){ vo = new MiniGameForSudAdminStatsVo(); - vo.setGameId(game.getMgId()); + vo.setGameId(game.getMgIdStr()); vo.setGameName(game.getName()); vo.setTotalDuration(0L); vo.setEnDuration(0L); @@ -87,12 +92,7 @@ public class MiniGameForSudAdminService extends ServiceImpl pageDetail(Long gameId, String month, Integer page, Integer size) { - // 获取所有游戏信息 - MiniGame miniGame = miniGameService.queryMiniGameByMgId(gameId); - if (null == miniGame) { - throw new AdminServiceException(BusiStatus.PARAMERROR); - } + public Page pageDetail(String gameId, String month, Integer page, Integer size) { Page voPage = new Page<>(page, size); @@ -105,17 +105,5 @@ public class MiniGameForSudAdminService extends ServiceImpl + AND mgr.mg_id = #{gameId} and mgr.state = 2 @@ -31,7 +31,7 @@ left join partition_info pi on u.partition_id = pi.partition_id where battle_start_at between #{startTime} and #{endTime} - + and mgr.mg_id = #{gameId} and mgr.state = 2 diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameForSudAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameForSudAdminController.java index a8c90f688..a25c9ca36 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameForSudAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameForSudAdminController.java @@ -33,12 +33,12 @@ public class MiniGameForSudAdminController { @ApiOperation("获取休闲游戏时长统计列表") @ApiImplicitParams({ - @ApiImplicitParam(name = "gameId", value = "游戏ID", required = false, dataType = "Long", paramType = "query"), + @ApiImplicitParam(name = "gameId", value = "游戏ID", required = false, dataType = "String", paramType = "query"), @ApiImplicitParam(name = "month", value = "月份(格式: yyyy-MM)", required = true, dataType = "String", paramType = "query") }) @GetMapping("/listStat") public BusiResult> listStat( - Long gameId, + String gameId, String month) { if (!StringUtils.hasText(month)){ throw new AdminServiceException(BusiStatus.PARAMERROR); @@ -50,12 +50,12 @@ public class MiniGameForSudAdminController { @SneakyThrows @ApiOperation("导出休闲游戏时长统计") @ApiImplicitParams({ - @ApiImplicitParam(name = "gameId", value = "游戏ID", required = false, dataType = "Long", paramType = "query"), + @ApiImplicitParam(name = "gameId", value = "游戏ID", required = false, dataType = "String", paramType = "query"), @ApiImplicitParam(name = "month", value = "月份(格式: yyyy-MM)", required = true, dataType = "String", paramType = "query") }) @GetMapping("/exportStat") public void exportStat( - Long gameId, + String gameId, String month, HttpServletResponse response) { if (!StringUtils.hasText(month)){ @@ -72,14 +72,14 @@ public class MiniGameForSudAdminController { @ApiOperation("获取休闲游戏时长明细列表") @ApiImplicitParams({ - @ApiImplicitParam(name = "gameId", value = "游戏ID", required = true, dataType = "Long", paramType = "query"), + @ApiImplicitParam(name = "gameId", value = "游戏ID", required = true, dataType = "String", paramType = "query"), @ApiImplicitParam(name = "month", value = "月份(格式: yyyy-MM)", required = true, dataType = "String", paramType = "query"), @ApiImplicitParam(name = "page", value = "页码", required = true, dataType = "Integer", paramType = "query"), @ApiImplicitParam(name = "size", value = "每页大小", required = true, dataType = "Integer", paramType = "query") }) @GetMapping("/pageDetail") public BusiResult> pageDetail( - Long gameId, + String gameId, String month, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) { @@ -90,12 +90,12 @@ public class MiniGameForSudAdminController { @SneakyThrows @ApiOperation("导出休闲游戏时长明细") @ApiImplicitParams({ - @ApiImplicitParam(name = "gameId", value = "游戏ID", required = true, dataType = "Long", paramType = "query"), + @ApiImplicitParam(name = "gameId", value = "游戏ID", required = true, dataType = "String", paramType = "query"), @ApiImplicitParam(name = "month", value = "月份(格式: yyyy-MM)", required = true, dataType = "String", paramType = "query") }) @GetMapping("/exportDetail") public void exportDetail( - Long gameId, + String gameId, String month, HttpServletResponse response) { if (null == gameId || !StringUtils.hasText(month)) { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameServiceImpl.java index 0e91fb137..68c63847b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameServiceImpl.java @@ -27,9 +27,6 @@ public class MiniGameServiceImpl extends ServiceImpl i @Autowired private MiniGameMapper miniGameMapper; - @Autowired - private BaiShunMiniGameConfig baiShunMiniGameConfig; - public MiniGame queryMiniGameByMgId(Long mgId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(MiniGame::getMgId, mgId);