diff --git a/game-service/src/main/java/awesome/group/game/service/AdminService.java b/game-service/src/main/java/awesome/group/game/service/AdminService.java index c083b8b..37c5d9c 100644 --- a/game-service/src/main/java/awesome/group/game/service/AdminService.java +++ b/game-service/src/main/java/awesome/group/game/service/AdminService.java @@ -8,7 +8,6 @@ import awesome.group.game.dao.mapper.MatrixAdvRecordMapper; import awesome.group.game.dao.mapper.MatrixAppMapper; import awesome.group.game.service.bo.AdvRecordQuery; import awesome.group.game.service.bo.MatrixAdvRecordBo; -import awesome.group.game.service.bo.PageParam; import awesome.group.game.service.bo.PageResult; import awesome.group.game.service.common.exception.PaganiException; import awesome.group.game.service.common.exception.PaganiExceptionCode; @@ -69,6 +68,9 @@ public class AdminService { if (param.platform != null) { wrapper.eq(MatrixAdvRecord::getPlatform, param.platform); } + if (param.appId != null) { + wrapper.eq(MatrixAdvRecord::getAppId, param.appId); + } if (StringUtils.hasText(param.deviceId)) { wrapper.eq(MatrixAdvRecord::getDeviceId, param.deviceId); } @@ -103,4 +105,13 @@ public class AdminService { }).toList(); return res; } + + public List appList(Integer adminId) { + if (adminId == 1) { + return appMapper.selectList(null); + } + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + query.eq(MatrixApp::getOwnerId, adminId); + return appMapper.selectList(query); + } } diff --git a/game-service/src/main/java/awesome/group/game/service/bo/AdvRecordQuery.java b/game-service/src/main/java/awesome/group/game/service/bo/AdvRecordQuery.java index 7f538f6..d78e879 100644 --- a/game-service/src/main/java/awesome/group/game/service/bo/AdvRecordQuery.java +++ b/game-service/src/main/java/awesome/group/game/service/bo/AdvRecordQuery.java @@ -6,5 +6,6 @@ public class AdvRecordQuery extends PageParam { public Integer advType = 3;//默认展示激励视频 public Integer platform; public String deviceId; + public Integer appId; public List createdAt; } diff --git a/game-web/src/main/java/awesome/group/rest/matrix/AdminController.java b/game-web/src/main/java/awesome/group/rest/matrix/AdminController.java index 13cfe3e..12b9a48 100644 --- a/game-web/src/main/java/awesome/group/rest/matrix/AdminController.java +++ b/game-web/src/main/java/awesome/group/rest/matrix/AdminController.java @@ -3,6 +3,7 @@ package awesome.group.rest.matrix; import awesome.group.RequestContext; import awesome.group.aop.RestApi; import awesome.group.game.dao.bean.MatrixAdmin; +import awesome.group.game.dao.bean.MatrixApp; import awesome.group.game.service.AdminService; import awesome.group.game.service.bo.*; import awesome.group.game.service.common.response.R; @@ -12,6 +13,8 @@ import jakarta.annotation.Resource; import jakarta.servlet.http.Cookie; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/api/admin") @Tag(name = "admin") @@ -43,4 +46,11 @@ public class AdminController { PageResult data = adminService.advList(query, RequestContext.getAdminID()); return new R<>(R.CODE_SUCCESS, "ok", data); } + + @GetMapping("/appList") + @RestApi + public R> appList() { + List data = adminService.appList(RequestContext.getAdminID()); + return new R<>(R.CODE_SUCCESS, "ok", data); + } }