diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java index 1fde976b..053d5744 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java @@ -21,6 +21,7 @@ */ package fun.asgc.neutrino.proxy.server.controller; +import fun.asgc.neutrino.core.annotation.Autowired; import fun.asgc.neutrino.core.annotation.NonIntercept; import fun.asgc.neutrino.core.db.page.Page; import fun.asgc.neutrino.core.db.page.PageQuery; @@ -32,6 +33,8 @@ import fun.asgc.neutrino.proxy.server.controller.req.UserFlowReportReq; import fun.asgc.neutrino.proxy.server.controller.res.LicenseFlowReportRes; import fun.asgc.neutrino.proxy.server.controller.res.ReportDataViewRes; import fun.asgc.neutrino.proxy.server.controller.res.UserFlowReportRes; +import fun.asgc.neutrino.proxy.server.service.ReportService; +import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; /** * 报表管理 @@ -43,6 +46,9 @@ import fun.asgc.neutrino.proxy.server.controller.res.UserFlowReportRes; @RestController public class ReportController { + @Autowired + private ReportService reportService; + /** * 数据一览: * 在线用户数 查询token有效的用户ID数 @@ -74,8 +80,9 @@ public class ReportController { */ @GetMapping("user/flow-report/page") public Page userFlowReportPage(PageQuery pageQuery, UserFlowReportReq req) { - // TODO - return null; + ParamCheckUtil.checkNotNull(pageQuery, "pageQuery"); + + return reportService.userFlowReportPage(pageQuery, req); } /** @@ -86,7 +93,8 @@ public class ReportController { */ @GetMapping("license/flow-report/page") public Page licenseFlowReportPage(PageQuery pageQuery, LicenseFlowReportReq req) { - // TODO - return null; + ParamCheckUtil.checkNotNull(pageQuery, "pageQuery"); + + return reportService.licenseFlowReportPage(pageQuery, req); } } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ReportService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ReportService.java new file mode 100644 index 00000000..802328b3 --- /dev/null +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ReportService.java @@ -0,0 +1,64 @@ +/** + * Copyright (c) 2022 aoshiguchen + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package fun.asgc.neutrino.proxy.server.service; + +import fun.asgc.neutrino.core.annotation.Component; +import fun.asgc.neutrino.core.annotation.NonIntercept; +import fun.asgc.neutrino.core.db.page.Page; +import fun.asgc.neutrino.core.db.page.PageQuery; +import fun.asgc.neutrino.proxy.server.controller.req.LicenseFlowReportReq; +import fun.asgc.neutrino.proxy.server.controller.req.UserFlowReportReq; +import fun.asgc.neutrino.proxy.server.controller.res.LicenseFlowReportRes; +import fun.asgc.neutrino.proxy.server.controller.res.UserFlowReportRes; +import lombok.extern.slf4j.Slf4j; + +/** + * @author: aoshiguchen + * @date: 2022/12/23 + */ +@Slf4j +@NonIntercept +@Component +public class ReportService { + + /** + * 用户流量报表分页 + * @param pageQuery + * @param req + * @return + */ + public Page userFlowReportPage(PageQuery pageQuery, UserFlowReportReq req) { + // TODO + return null; + } + + /** + * license流量报表分页 + * @param pageQuery + * @param req + * @return + */ + public Page licenseFlowReportPage(PageQuery pageQuery, LicenseFlowReportReq req) { + // TODO + return null; + } +}