diff --git a/neutrino-proxy-admin/src/api/report.js b/neutrino-proxy-admin/src/api/report.js index f4632503..9fa9bb94 100644 --- a/neutrino-proxy-admin/src/api/report.js +++ b/neutrino-proxy-admin/src/api/report.js @@ -14,3 +14,19 @@ export function fetchLicenseFlowReportList(query) { params: query }) } + +export function fetchUserFlowMonthReportList(query) { + return request({ + url: '/report/user/flow-month-report/page', + method: 'get', + params: query + }) +} + +export function fetchLicenseFlowMonthReportList(query) { + return request({ + url: '/report/license/flow-month-report/page', + method: 'get', + params: query + }) +} diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js index 7fc4f215..b342fe7e 100644 --- a/neutrino-proxy-admin/src/lang/zh.js +++ b/neutrino-proxy-admin/src/lang/zh.js @@ -59,7 +59,9 @@ export default { clientConnectLog: '客户端连接日志', report: '报表管理', userFlowReport: '用户流量报表', - licenseFlowReport: 'License流量报表' + licenseFlowReport: 'License流量报表', + userFlowMonthReport: '用户流量月度明细', + licenseFlowMonthReport: 'License流量月度明细' }, navbar: { logOut: '退出登录', diff --git a/neutrino-proxy-admin/src/router/index.js b/neutrino-proxy-admin/src/router/index.js index 1dd444cf..8fc01e28 100644 --- a/neutrino-proxy-admin/src/router/index.js +++ b/neutrino-proxy-admin/src/router/index.js @@ -91,7 +91,9 @@ export const asyncRouterMap = [ }, children: [ { path: 'userFlowReport', component: _import('report/userFlowReport'), name: 'userFlowReport', meta: { title: 'userFlowReport' }}, - { path: 'licenseFlowReport', component: _import('report/licenseFlowReport'), name: 'licenseFlowReport', meta: { title: 'licenseFlowReport' }} + { path: 'licenseFlowReport', component: _import('report/licenseFlowReport'), name: 'licenseFlowReport', meta: { title: 'licenseFlowReport' }}, + { path: 'userFlowMonthReport', component: _import('report/userFlowMonthReport'), name: 'userFlowMonthReport', meta: { title: 'userFlowMonthReport' }}, + { path: 'licenseFlowMonthReport', component: _import('report/licenseFlowMonthReport'), name: 'licenseFlowMonthReport', meta: { title: 'licenseFlowMonthReport' }} ] }, { diff --git a/neutrino-proxy-admin/src/views/report/licenseFlowMonthReport.vue b/neutrino-proxy-admin/src/views/report/licenseFlowMonthReport.vue new file mode 100644 index 00000000..32e5567e --- /dev/null +++ b/neutrino-proxy-admin/src/views/report/licenseFlowMonthReport.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/neutrino-proxy-admin/src/views/report/userFlowMonthReport.vue b/neutrino-proxy-admin/src/views/report/userFlowMonthReport.vue new file mode 100644 index 00000000..1e83dea1 --- /dev/null +++ b/neutrino-proxy-admin/src/views/report/userFlowMonthReport.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ClientConnectRecordController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ClientConnectRecordController.java index b260b082..8e75d29d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ClientConnectRecordController.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ClientConnectRecordController.java @@ -23,8 +23,8 @@ package fun.asgc.neutrino.proxy.server.controller; import fun.asgc.neutrino.proxy.server.base.page.PageInfo; import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.controller.req.ClientConnectRecordListReq; -import fun.asgc.neutrino.proxy.server.controller.res.ClientConnectRecordListRes; +import fun.asgc.neutrino.proxy.server.controller.req.log.ClientConnectRecordListReq; +import fun.asgc.neutrino.proxy.server.controller.res.log.ClientConnectRecordListRes; import fun.asgc.neutrino.proxy.server.service.ClientConnectRecordService; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; import lombok.extern.slf4j.Slf4j; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/IndexController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/IndexController.java index b15dc41b..a9e510d1 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/IndexController.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/IndexController.java @@ -22,8 +22,8 @@ package fun.asgc.neutrino.proxy.server.controller; import fun.asgc.neutrino.proxy.server.base.rest.Authorization; -import fun.asgc.neutrino.proxy.server.controller.req.LoginReq; -import fun.asgc.neutrino.proxy.server.controller.res.LoginRes; +import fun.asgc.neutrino.proxy.server.controller.req.system.LoginReq; +import fun.asgc.neutrino.proxy.server.controller.res.system.LoginRes; import fun.asgc.neutrino.proxy.server.service.UserService; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; import org.noear.solon.annotation.*; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java index 96be7a30..27e39853 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java @@ -24,14 +24,14 @@ package fun.asgc.neutrino.proxy.server.controller; import fun.asgc.neutrino.proxy.server.base.page.PageInfo; import fun.asgc.neutrino.proxy.server.base.page.PageQuery; import fun.asgc.neutrino.proxy.server.base.rest.Authorization; -import fun.asgc.neutrino.proxy.server.controller.req.JobInfoExecuteReq; -import fun.asgc.neutrino.proxy.server.controller.req.JobInfoListReq; -import fun.asgc.neutrino.proxy.server.controller.req.JobInfoUpdateEnableStatusReq; -import fun.asgc.neutrino.proxy.server.controller.req.JobInfoUpdateReq; -import fun.asgc.neutrino.proxy.server.controller.res.JobInfoExecuteRes; -import fun.asgc.neutrino.proxy.server.controller.res.JobInfoListRes; -import fun.asgc.neutrino.proxy.server.controller.res.JobInfoUpdateEnableStatusRes; -import fun.asgc.neutrino.proxy.server.controller.res.JobInfoUpdateRes; +import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoExecuteReq; +import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoListReq; +import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoUpdateEnableStatusReq; +import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoUpdateReq; +import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoExecuteRes; +import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoListRes; +import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoUpdateEnableStatusRes; +import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoUpdateRes; import fun.asgc.neutrino.proxy.server.dal.entity.JobInfoDO; import fun.asgc.neutrino.proxy.server.service.JobInfoService; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobLogController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobLogController.java index c98e2ae5..e9e73340 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobLogController.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobLogController.java @@ -23,8 +23,8 @@ package fun.asgc.neutrino.proxy.server.controller; import fun.asgc.neutrino.proxy.server.base.page.PageInfo; import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.controller.req.JobLogListReq; -import fun.asgc.neutrino.proxy.server.controller.res.JobLogListRes; +import fun.asgc.neutrino.proxy.server.controller.req.log.JobLogListReq; +import fun.asgc.neutrino.proxy.server.controller.res.log.JobLogListRes; import fun.asgc.neutrino.proxy.server.service.JobLogService; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; import lombok.extern.slf4j.Slf4j; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/LicenseController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/LicenseController.java index 04999837..5b9ea803 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/LicenseController.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/LicenseController.java @@ -24,8 +24,8 @@ package fun.asgc.neutrino.proxy.server.controller; import fun.asgc.neutrino.proxy.server.base.page.PageInfo; import fun.asgc.neutrino.proxy.server.base.page.PageQuery; import fun.asgc.neutrino.proxy.server.base.rest.Authorization; -import fun.asgc.neutrino.proxy.server.controller.req.*; -import fun.asgc.neutrino.proxy.server.controller.res.*; +import fun.asgc.neutrino.proxy.server.controller.req.proxy.*; +import fun.asgc.neutrino.proxy.server.controller.res.proxy.*; import fun.asgc.neutrino.proxy.server.service.LicenseService; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; import org.noear.solon.annotation.*; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortGroupController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortGroupController.java index 6c65a0ca..ac40b956 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortGroupController.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortGroupController.java @@ -3,12 +3,15 @@ package fun.asgc.neutrino.proxy.server.controller; import fun.asgc.neutrino.proxy.server.base.page.PageInfo; import fun.asgc.neutrino.proxy.server.base.page.PageQuery; import fun.asgc.neutrino.proxy.server.base.rest.Authorization; -import fun.asgc.neutrino.proxy.server.controller.req.*; -import fun.asgc.neutrino.proxy.server.controller.res.*; +import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupCreateReq; +import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupDeleteReq; +import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupListReq; +import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupUpdateEnableStatusReq; +import fun.asgc.neutrino.proxy.server.controller.res.system.PortGroupCreateRes; +import fun.asgc.neutrino.proxy.server.controller.res.system.PortGroupListRes; +import fun.asgc.neutrino.proxy.server.controller.res.system.PortGroupUpdateEnableStatusRes; import fun.asgc.neutrino.proxy.server.service.PortGroupService; -import fun.asgc.neutrino.proxy.server.service.PortPoolService; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; -import org.apache.commons.lang3.StringUtils; import org.noear.solon.annotation.*; import java.util.List; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortMappingController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortMappingController.java index 34ec8978..fca42576 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortMappingController.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortMappingController.java @@ -2,8 +2,8 @@ package fun.asgc.neutrino.proxy.server.controller; import fun.asgc.neutrino.proxy.server.base.page.PageInfo; import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.controller.req.*; -import fun.asgc.neutrino.proxy.server.controller.res.*; +import fun.asgc.neutrino.proxy.server.controller.req.proxy.*; +import fun.asgc.neutrino.proxy.server.controller.res.proxy.*; import fun.asgc.neutrino.proxy.server.service.PortMappingService; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; import org.apache.commons.lang3.StringUtils; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortPoolController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortPoolController.java index b00c68ed..e3de45f2 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortPoolController.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortPoolController.java @@ -24,8 +24,8 @@ package fun.asgc.neutrino.proxy.server.controller; import fun.asgc.neutrino.proxy.server.base.page.PageInfo; import fun.asgc.neutrino.proxy.server.base.page.PageQuery; import fun.asgc.neutrino.proxy.server.base.rest.Authorization; -import fun.asgc.neutrino.proxy.server.controller.req.*; -import fun.asgc.neutrino.proxy.server.controller.res.*; +import fun.asgc.neutrino.proxy.server.controller.req.system.*; +import fun.asgc.neutrino.proxy.server.controller.res.system.*; import fun.asgc.neutrino.proxy.server.service.PortPoolService; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; import org.noear.solon.annotation.*; 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 94f551e3..f2b04aea 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 @@ -2,11 +2,11 @@ package fun.asgc.neutrino.proxy.server.controller; import fun.asgc.neutrino.proxy.server.base.page.PageInfo; import fun.asgc.neutrino.proxy.server.base.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.ReportDataViewRes; -import fun.asgc.neutrino.proxy.server.controller.res.UserFlowReportRes; +import fun.asgc.neutrino.proxy.server.controller.req.report.LicenseFlowMonthReportReq; +import fun.asgc.neutrino.proxy.server.controller.req.report.LicenseFlowReportReq; +import fun.asgc.neutrino.proxy.server.controller.req.report.UserFlowMonthReportReq; +import fun.asgc.neutrino.proxy.server.controller.req.report.UserFlowReportReq; +import fun.asgc.neutrino.proxy.server.controller.res.report.*; import fun.asgc.neutrino.proxy.server.service.ReportService; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; import org.noear.solon.annotation.Controller; @@ -77,4 +77,32 @@ public class ReportController { return reportService.licenseFlowReportPage(pageQuery, req); } + + /** + * 用户流量报表月度明细 + * @param pageQuery + * @param req + * @return + */ + @Get + @Mapping("/user/flow-month-report/page") + public PageInfo userFlowMonthReportPage(PageQuery pageQuery, UserFlowMonthReportReq req) { + ParamCheckUtil.checkNotNull(pageQuery, "pageQuery"); + + return reportService.userFlowMonthReportPage(pageQuery, req); + } + + /** + * license流量报表月度明细 + * @param pageQuery + * @param req + * @return + */ + @Get + @Mapping("/license/flow-month-report/page") + public PageInfo licenseFlowMonthReportPage(PageQuery pageQuery, LicenseFlowMonthReportReq req) { + ParamCheckUtil.checkNotNull(pageQuery, "pageQuery"); + + return reportService.licenseFlowMonthReportPage(pageQuery, req); + } } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserController.java index a8146f8a..7e2283bf 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserController.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserController.java @@ -26,8 +26,8 @@ import fun.asgc.neutrino.proxy.server.base.page.PageQuery; import fun.asgc.neutrino.proxy.server.base.rest.Authorization; import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder; import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; -import fun.asgc.neutrino.proxy.server.controller.req.*; -import fun.asgc.neutrino.proxy.server.controller.res.*; +import fun.asgc.neutrino.proxy.server.controller.req.system.*; +import fun.asgc.neutrino.proxy.server.controller.res.system.*; import fun.asgc.neutrino.proxy.server.dal.UserMapper; import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; import fun.asgc.neutrino.proxy.server.service.UserService; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserLoginRecordController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserLoginRecordController.java index 7907b93c..048a05ec 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserLoginRecordController.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserLoginRecordController.java @@ -23,8 +23,8 @@ package fun.asgc.neutrino.proxy.server.controller; import fun.asgc.neutrino.proxy.server.base.page.PageInfo; import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.controller.req.UserLoginRecordListReq; -import fun.asgc.neutrino.proxy.server.controller.res.UserLoginRecordListRes; +import fun.asgc.neutrino.proxy.server.controller.req.log.UserLoginRecordListReq; +import fun.asgc.neutrino.proxy.server.controller.res.log.UserLoginRecordListRes; import fun.asgc.neutrino.proxy.server.service.UserLoginRecordService; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; import org.noear.solon.annotation.Controller; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseFlowReportReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseFlowReportReq.java deleted file mode 100644 index 8d06f818..00000000 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseFlowReportReq.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * 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.controller.req; - -import lombok.Data; - -/** - * @author: aoshiguchen - * @date: 2022/12/21 - */ -@Data -public class LicenseFlowReportReq { - private Integer userId; - private Integer licenseId; -} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserFlowReportReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserFlowReportReq.java deleted file mode 100644 index 943bf4d1..00000000 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserFlowReportReq.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * 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.controller.req; - -import lombok.Data; - -/** - * @author: aoshiguchen - * @date: 2022/12/21 - */ -@Data -public class UserFlowReportReq { - /** - * 用户ID - */ - private Integer userId; -} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/ClientConnectRecordListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/ClientConnectRecordListReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/ClientConnectRecordListReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/ClientConnectRecordListReq.java index f3854409..5848511e 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/ClientConnectRecordListReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/ClientConnectRecordListReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.log; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobLogListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/JobLogListReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobLogListReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/JobLogListReq.java index 274b44e2..5da3eb17 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobLogListReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/JobLogListReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.log; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserLoginRecordListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/UserLoginRecordListReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserLoginRecordListReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/UserLoginRecordListReq.java index 5dc4c32c..432be281 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserLoginRecordListReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/UserLoginRecordListReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.log; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseCreateReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseCreateReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseCreateReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseCreateReq.java index 8b3a0025..126c7ce8 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseCreateReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseCreateReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseDeleteReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseDeleteReq.java similarity index 72% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseDeleteReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseDeleteReq.java index d610349a..29dfd58b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseDeleteReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseDeleteReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseDetailReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseDetailReq.java similarity index 69% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseDetailReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseDetailReq.java index 29798142..8ba9ea4f 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseDetailReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseDetailReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseListReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseListReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseListReq.java index 875ad359..622c5731 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseListReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseListReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseResetReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseResetReq.java similarity index 69% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseResetReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseResetReq.java index 2002107d..8b604911 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseResetReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseResetReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseUpdateEnableStatusReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseUpdateEnableStatusReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseUpdateEnableStatusReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseUpdateEnableStatusReq.java index e1a3ba5a..d3fe5f4d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseUpdateEnableStatusReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseUpdateEnableStatusReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseUpdateReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseUpdateReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseUpdateReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseUpdateReq.java index 58abcf50..3dc3066d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseUpdateReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseUpdateReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingCreateReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingCreateReq.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingCreateReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingCreateReq.java index 39592fb2..10a9c1e1 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingCreateReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingCreateReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingDeleteReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingDeleteReq.java similarity index 69% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingDeleteReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingDeleteReq.java index 6baba0d8..561fdd0a 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingDeleteReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingDeleteReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingDetailReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingDetailReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingDetailReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingDetailReq.java index c0f42cdb..032c563b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingDetailReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingDetailReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingListReq.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingListReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingListReq.java index 8a6550e5..4e9f7bb9 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingListReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingListReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.proxy; import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingUpdateEnableStatusReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingUpdateEnableStatusReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingUpdateEnableStatusReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingUpdateEnableStatusReq.java index 9a455b3b..110d1a1a 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingUpdateEnableStatusReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingUpdateEnableStatusReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingUpdateReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingUpdateReq.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingUpdateReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingUpdateReq.java index bd3e6adc..b5f6a8c1 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortMappingUpdateReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingUpdateReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/LicenseFlowMonthReportReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/LicenseFlowMonthReportReq.java new file mode 100644 index 00000000..0c3b5e1c --- /dev/null +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/LicenseFlowMonthReportReq.java @@ -0,0 +1,13 @@ +package fun.asgc.neutrino.proxy.server.controller.req.report; + +import lombok.Data; + +/** + * @author: aoshiguchen + * @date: 2022/12/21 + */ +@Data +public class LicenseFlowMonthReportReq { + private Integer userId; + private Integer licenseId; +} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/LicenseFlowReportReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/LicenseFlowReportReq.java new file mode 100644 index 00000000..2a5622d9 --- /dev/null +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/LicenseFlowReportReq.java @@ -0,0 +1,13 @@ +package fun.asgc.neutrino.proxy.server.controller.req.report; + +import lombok.Data; + +/** + * @author: aoshiguchen + * @date: 2022/12/21 + */ +@Data +public class LicenseFlowReportReq { + private Integer userId; + private Integer licenseId; +} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/UserFlowMonthReportReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/UserFlowMonthReportReq.java new file mode 100644 index 00000000..230bb365 --- /dev/null +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/UserFlowMonthReportReq.java @@ -0,0 +1,15 @@ +package fun.asgc.neutrino.proxy.server.controller.req.report; + +import lombok.Data; + +/** + * @author: aoshiguchen + * @date: 2022/12/21 + */ +@Data +public class UserFlowMonthReportReq { + /** + * 用户ID + */ + private Integer userId; +} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/UserFlowReportReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/UserFlowReportReq.java new file mode 100644 index 00000000..a8949527 --- /dev/null +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/UserFlowReportReq.java @@ -0,0 +1,15 @@ +package fun.asgc.neutrino.proxy.server.controller.req.report; + +import lombok.Data; + +/** + * @author: aoshiguchen + * @date: 2022/12/21 + */ +@Data +public class UserFlowReportReq { + /** + * 用户ID + */ + private Integer userId; +} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/AvailablePortListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/AvailablePortListReq.java similarity index 72% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/AvailablePortListReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/AvailablePortListReq.java index 47cf5d51..1b45c938 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/AvailablePortListReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/AvailablePortListReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoExecuteReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoExecuteReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoExecuteReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoExecuteReq.java index ee994c7c..8c080b27 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoExecuteReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoExecuteReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoListReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoListReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoListReq.java index 688e0513..d0b84347 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoListReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoListReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoUpdateEnableStatusReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoUpdateEnableStatusReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoUpdateEnableStatusReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoUpdateEnableStatusReq.java index 395b186f..c9a99075 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoUpdateEnableStatusReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoUpdateEnableStatusReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoUpdateReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoUpdateReq.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoUpdateReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoUpdateReq.java index 4dc91596..fa627d7c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoUpdateReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoUpdateReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LoginReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/LoginReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LoginReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/LoginReq.java index 7ba3b461..52e02ab6 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LoginReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/LoginReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LogoutReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/LogoutReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LogoutReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/LogoutReq.java index 616ef5f0..4417d6f8 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LogoutReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/LogoutReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupCreateReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupCreateReq.java similarity index 87% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupCreateReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupCreateReq.java index 3d8a2e92..0d15a8e8 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupCreateReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupCreateReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupDeleteReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupDeleteReq.java similarity index 66% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupDeleteReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupDeleteReq.java index 533c575e..9ec3b4f3 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupDeleteReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupDeleteReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupListReq.java similarity index 87% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupListReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupListReq.java index 39eb2883..4ab17ce4 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupListReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupListReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupUpdateEnableStatusReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupUpdateEnableStatusReq.java similarity index 72% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupUpdateEnableStatusReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupUpdateEnableStatusReq.java index 80a4d453..96fdaa92 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupUpdateEnableStatusReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupUpdateEnableStatusReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolCreateReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolCreateReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolCreateReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolCreateReq.java index 18cc84b8..802dfd15 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolCreateReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolCreateReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolDeleteReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolDeleteReq.java similarity index 69% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolDeleteReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolDeleteReq.java index 9520e165..c4ad3b06 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolDeleteReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolDeleteReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolListReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolListReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolListReq.java index 9e34975d..7eb49191 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolListReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolListReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolUpdateEnableStatusReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateEnableStatusReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolUpdateEnableStatusReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateEnableStatusReq.java index 29a04f35..efb919a5 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolUpdateEnableStatusReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateEnableStatusReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolUpdateGroupReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateGroupReq.java similarity index 76% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolUpdateGroupReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateGroupReq.java index ee14f0a6..677790f8 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolUpdateGroupReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateGroupReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolUpdateReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateReq.java similarity index 73% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolUpdateReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateReq.java index 57a29596..5ac1ac6f 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolUpdateReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserCreateReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserCreateReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserCreateReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserCreateReq.java index d980b3cf..bc665d34 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserCreateReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserCreateReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserDeleteReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserDeleteReq.java similarity index 68% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserDeleteReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserDeleteReq.java index ed0bb6a1..39bcb0ca 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserDeleteReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserDeleteReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserInfoReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserInfoReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserInfoReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserInfoReq.java index 9fca17a0..c3c34696 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserInfoReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserInfoReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserListReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserListReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserListReq.java index d26d7734..cd1ce1b9 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserListReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserListReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; /** * 用户列表请求 diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserUpdateEnableStatusReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdateEnableStatusReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserUpdateEnableStatusReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdateEnableStatusReq.java index 115fe070..d1394dfc 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserUpdateEnableStatusReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdateEnableStatusReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserUpdatePasswordReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdatePasswordReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserUpdatePasswordReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdatePasswordReq.java index 385eea07..62ada017 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserUpdatePasswordReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdatePasswordReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserUpdateReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdateReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserUpdateReq.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdateReq.java index 9f5e820f..f082156d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserUpdateReq.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdateReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req; +package fun.asgc.neutrino.proxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseFlowReportRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseFlowReportRes.java deleted file mode 100644 index 84df44cb..00000000 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseFlowReportRes.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * 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.controller.res; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * @author: aoshiguchen - * @date: 2022/12/21 - */ -@Accessors(chain = true) -@Data -public class LicenseFlowReportRes { - /** - * 用户ID - */ - private Integer userId; - /** - * 用户名称 - */ - private String userName; - /** - * licenseId - */ - private Integer licenseId; - /** - * license名称 - */ - private String licenseName; - /** - * 上行流量字节数 - */ - private Long upFlowBytes; - /** - * 下行流量字节数 - */ - private Long downFlowBytes; - /** - * 总流量字节数 - */ - private Long totalFlowBytes; - /** - * 上行流量描述 - */ - private String upFlowDesc; - /** - * 下行流量描述 - */ - private String downFlowDesc; - /** - * 总流量描述 - */ - private String totalFlowDesc; -} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupCreateRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupCreateRes.java deleted file mode 100644 index cf88c064..00000000 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupCreateRes.java +++ /dev/null @@ -1,4 +0,0 @@ -package fun.asgc.neutrino.proxy.server.controller.res; - -public class PortGroupCreateRes { -} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolUpdateGroupRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolUpdateGroupRes.java deleted file mode 100644 index 99928db3..00000000 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolUpdateGroupRes.java +++ /dev/null @@ -1,4 +0,0 @@ -package fun.asgc.neutrino.proxy.server.controller.res; - -public class PortPoolUpdateGroupRes { -} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserFlowReportRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserFlowReportRes.java deleted file mode 100644 index 802126d9..00000000 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserFlowReportRes.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * 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.controller.res; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * @author: aoshiguchen - * @date: 2022/12/21 - */ -@Accessors(chain = true) -@Data -public class UserFlowReportRes { - /** - * 用户ID - */ - private Integer userId; - /** - * 用户名称 - */ - private String userName; - /** - * 上行流量字节数 - */ - private Long upFlowBytes; - /** - * 下行流量字节数 - */ - private Long downFlowBytes; - /** - * 总流量字节数 - */ - private Long totalFlowBytes; - /** - * 上行流量描述 - */ - private String upFlowDesc; - /** - * 下行流量描述 - */ - private String downFlowDesc; - /** - * 总流量描述 - */ - private String totalFlowDesc; -} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/ClientConnectRecordListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/ClientConnectRecordListRes.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/ClientConnectRecordListRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/ClientConnectRecordListRes.java index 4c6116ea..298be764 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/ClientConnectRecordListRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/ClientConnectRecordListRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.log; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobLogListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/JobLogListRes.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobLogListRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/JobLogListRes.java index d350112f..916ac4c7 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobLogListRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/JobLogListRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.log; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserLoginRecordListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/UserLoginRecordListRes.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserLoginRecordListRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/UserLoginRecordListRes.java index 2f5ba48e..c06eb7db 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserLoginRecordListRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/UserLoginRecordListRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.log; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseCreateRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseCreateRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseCreateRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseCreateRes.java index 86b7e303..e59e11b5 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseCreateRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseCreateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseDetailRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseDetailRes.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseDetailRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseDetailRes.java index 5b2ee9bc..64427088 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseDetailRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseDetailRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.proxy; import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseListRes.java similarity index 92% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseListRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseListRes.java index 09fd8427..6751e00d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseListRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseListRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.proxy; import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseUpdateEnableStatusRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseUpdateEnableStatusRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseUpdateEnableStatusRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseUpdateEnableStatusRes.java index f829e8b6..2203968d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseUpdateEnableStatusRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseUpdateEnableStatusRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.proxy; /** * 更新启用状态响应 diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseUpdateRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseUpdateRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseUpdateRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseUpdateRes.java index adf8c051..a749666c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseUpdateRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseUpdateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.proxy; /** * diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortMappingCreateRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingCreateRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortMappingCreateRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingCreateRes.java index ef1c3d8e..aa470671 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortMappingCreateRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingCreateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortMappingDetailRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingDetailRes.java similarity index 94% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortMappingDetailRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingDetailRes.java index b10045b3..c66e9bbf 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortMappingDetailRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingDetailRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.proxy; import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortMappingListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingListRes.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortMappingListRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingListRes.java index 4f9323f9..41f8ff28 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortMappingListRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingListRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.proxy; import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortMappingUpdateEnableStatusRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingUpdateEnableStatusRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortMappingUpdateEnableStatusRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingUpdateEnableStatusRes.java index 9f8ae5ea..ac17e3b6 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortMappingUpdateEnableStatusRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingUpdateEnableStatusRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortMappingUpdateRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingUpdateRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortMappingUpdateRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingUpdateRes.java index 7428142d..81f47c6c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortMappingUpdateRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingUpdateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/LicenseFlowMonthReportRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/LicenseFlowMonthReportRes.java new file mode 100644 index 00000000..06ce9131 --- /dev/null +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/LicenseFlowMonthReportRes.java @@ -0,0 +1,59 @@ +package fun.asgc.neutrino.proxy.server.controller.res.report; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * @author: aoshiguchen + * @date: 2022/12/21 + */ +@Accessors(chain = true) +@Data +public class LicenseFlowMonthReportRes { + /** + * 用户ID + */ + private Integer userId; + /** + * 用户名称 + */ + private String userName; + /** + * licenseId + */ + private Integer licenseId; + /** + * license名称 + */ + private String licenseName; + /** + * 上行流量字节数 + */ + private Long upFlowBytes; + /** + * 下行流量字节数 + */ + private Long downFlowBytes; + /** + * 总流量字节数 + */ + private Long totalFlowBytes; + /** + * 上行流量描述 + */ + private String upFlowDesc; + /** + * 下行流量描述 + */ + private String downFlowDesc; + /** + * 总流量描述 + */ + private String totalFlowDesc; + /** + * 日期 + */ + private Date date; +} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/LicenseFlowReportRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/LicenseFlowReportRes.java new file mode 100644 index 00000000..eba67257 --- /dev/null +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/LicenseFlowReportRes.java @@ -0,0 +1,55 @@ +package fun.asgc.neutrino.proxy.server.controller.res.report; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * @author: aoshiguchen + * @date: 2022/12/21 + */ +@Accessors(chain = true) +@Data +public class LicenseFlowReportRes { + /** + * 用户ID + */ + private Integer userId; + /** + * 用户名称 + */ + private String userName; + /** + * licenseId + */ + private Integer licenseId; + /** + * license名称 + */ + private String licenseName; + /** + * 上行流量字节数 + */ + private Long upFlowBytes; + /** + * 下行流量字节数 + */ + private Long downFlowBytes; + /** + * 总流量字节数 + */ + private Long totalFlowBytes; + /** + * 上行流量描述 + */ + private String upFlowDesc; + /** + * 下行流量描述 + */ + private String downFlowDesc; + /** + * 总流量描述 + */ + private String totalFlowDesc; +} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/ReportDataViewRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/ReportDataViewRes.java similarity index 94% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/ReportDataViewRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/ReportDataViewRes.java index 442d5e4b..ac893bd6 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/ReportDataViewRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/ReportDataViewRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.report; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/UserFlowMonthReportRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/UserFlowMonthReportRes.java new file mode 100644 index 00000000..88a4bcdc --- /dev/null +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/UserFlowMonthReportRes.java @@ -0,0 +1,51 @@ +package fun.asgc.neutrino.proxy.server.controller.res.report; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * @author: aoshiguchen + * @date: 2022/12/21 + */ +@Accessors(chain = true) +@Data +public class UserFlowMonthReportRes { + /** + * 用户ID + */ + private Integer userId; + /** + * 用户名称 + */ + private String userName; + /** + * 上行流量字节数 + */ + private Long upFlowBytes; + /** + * 下行流量字节数 + */ + private Long downFlowBytes; + /** + * 总流量字节数 + */ + private Long totalFlowBytes; + /** + * 上行流量描述 + */ + private String upFlowDesc; + /** + * 下行流量描述 + */ + private String downFlowDesc; + /** + * 总流量描述 + */ + private String totalFlowDesc; + /** + * 日期 + */ + private Date date; +} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/UserFlowReportRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/UserFlowReportRes.java new file mode 100644 index 00000000..e15249f1 --- /dev/null +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/UserFlowReportRes.java @@ -0,0 +1,47 @@ +package fun.asgc.neutrino.proxy.server.controller.res.report; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * @author: aoshiguchen + * @date: 2022/12/21 + */ +@Accessors(chain = true) +@Data +public class UserFlowReportRes { + /** + * 用户ID + */ + private Integer userId; + /** + * 用户名称 + */ + private String userName; + /** + * 上行流量字节数 + */ + private Long upFlowBytes; + /** + * 下行流量字节数 + */ + private Long downFlowBytes; + /** + * 总流量字节数 + */ + private Long totalFlowBytes; + /** + * 上行流量描述 + */ + private String upFlowDesc; + /** + * 下行流量描述 + */ + private String downFlowDesc; + /** + * 总流量描述 + */ + private String totalFlowDesc; +} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/AvailablePortListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/AvailablePortListRes.java similarity index 51% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/AvailablePortListRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/AvailablePortListRes.java index fcea0690..2bb5dc91 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/AvailablePortListRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/AvailablePortListRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoExecuteRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoExecuteRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoExecuteRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoExecuteRes.java index 8dba8f0e..dcea4952 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoExecuteRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoExecuteRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoListRes.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoListRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoListRes.java index c6bad582..29a8bd3c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoListRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoListRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import lombok.Data; import java.util.Date; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoUpdateEnableStatusRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoUpdateEnableStatusRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoUpdateEnableStatusRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoUpdateEnableStatusRes.java index e8b51c2b..f85fd040 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoUpdateEnableStatusRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoUpdateEnableStatusRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoUpdateRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoUpdateRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoUpdateRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoUpdateRes.java index 2606df17..1fca9230 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoUpdateRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoUpdateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LoginRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/LoginRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LoginRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/LoginRes.java index 14ce115b..dddcfdac 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LoginRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/LoginRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LogoutRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/LogoutRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LogoutRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/LogoutRes.java index 232f2ac7..4a06ad9d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LogoutRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/LogoutRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupCreateRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupCreateRes.java new file mode 100644 index 00000000..4d3aa353 --- /dev/null +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupCreateRes.java @@ -0,0 +1,4 @@ +package fun.asgc.neutrino.proxy.server.controller.res.system; + +public class PortGroupCreateRes { +} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupListRes.java similarity index 93% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupListRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupListRes.java index fca18ea5..ba8c0bf4 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupListRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupListRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupUpdateEnableStatusRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupUpdateEnableStatusRes.java similarity index 55% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupUpdateEnableStatusRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupUpdateEnableStatusRes.java index 55587dbe..f4e671dd 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupUpdateEnableStatusRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupUpdateEnableStatusRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolCreateRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolCreateRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolCreateRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolCreateRes.java index 12d4d81c..b0609c04 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolCreateRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolCreateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolListRes.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolListRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolListRes.java index f9a4a513..c1abccfe 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolListRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolListRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolUpdateEnableStatusRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateEnableStatusRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolUpdateEnableStatusRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateEnableStatusRes.java index d7edde31..ff1b86ab 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolUpdateEnableStatusRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateEnableStatusRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateGroupRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateGroupRes.java new file mode 100644 index 00000000..5033e443 --- /dev/null +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateGroupRes.java @@ -0,0 +1,4 @@ +package fun.asgc.neutrino.proxy.server.controller.res.system; + +public class PortPoolUpdateGroupRes { +} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolUpdateRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateRes.java similarity index 64% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolUpdateRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateRes.java index a3850466..7c84a322 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolUpdateRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserCreateRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserCreateRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserCreateRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserCreateRes.java index aab42b49..cda1bbf5 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserCreateRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserCreateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; /** * diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserInfoRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserInfoRes.java similarity index 87% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserInfoRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserInfoRes.java index 1a394451..bb7a7ed0 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserInfoRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserInfoRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserListRes.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserListRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserListRes.java index 52090db9..03fe8452 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserListRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserListRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserUpdateEnableStatusRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdateEnableStatusRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserUpdateEnableStatusRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdateEnableStatusRes.java index 65a7a301..fd48cd5e 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserUpdateEnableStatusRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdateEnableStatusRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserUpdatePasswordRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdatePasswordRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserUpdatePasswordRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdatePasswordRes.java index 90c3345b..2c8e7791 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserUpdatePasswordRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdatePasswordRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; /** * diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserUpdateRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdateRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserUpdateRes.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdateRes.java index f34e911c..a90eb90f 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserUpdateRes.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res; +package fun.asgc.neutrino.proxy.server.controller.res.system; /** * diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortGroupMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortGroupMapper.java index 88ae3900..83c735bb 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortGroupMapper.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortGroupMapper.java @@ -2,8 +2,8 @@ package fun.asgc.neutrino.proxy.server.dal; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import fun.asgc.neutrino.proxy.server.controller.req.PortGroupListReq; -import fun.asgc.neutrino.proxy.server.controller.res.PortGroupListRes; +import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupListReq; +import fun.asgc.neutrino.proxy.server.controller.res.system.PortGroupListRes; import fun.asgc.neutrino.proxy.server.dal.entity.PortGroupDO; import org.apache.ibatis.annotations.Mapper; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java index cd807217..84a9d2b9 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java @@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; -import fun.asgc.neutrino.proxy.server.controller.req.PortMappingListReq; -import fun.asgc.neutrino.proxy.server.controller.res.PortMappingListRes; +import fun.asgc.neutrino.proxy.server.controller.req.proxy.PortMappingListReq; import fun.asgc.neutrino.proxy.server.dal.entity.PortMappingDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java index c2120107..7263f063 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java @@ -24,9 +24,8 @@ package fun.asgc.neutrino.proxy.server.dal; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import fun.asgc.neutrino.proxy.server.controller.req.PortPoolListReq; -import fun.asgc.neutrino.proxy.server.controller.res.AvailablePortListRes; -import fun.asgc.neutrino.proxy.server.controller.res.PortPoolListRes; +import fun.asgc.neutrino.proxy.server.controller.req.system.PortPoolListReq; +import fun.asgc.neutrino.proxy.server.controller.res.system.PortPoolListRes; import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ReportMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ReportMapper.java index a134028c..e9b9f421 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ReportMapper.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ReportMapper.java @@ -1,9 +1,9 @@ package fun.asgc.neutrino.proxy.server.dal; -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 fun.asgc.neutrino.proxy.server.controller.res.report.LicenseFlowMonthReportRes; +import fun.asgc.neutrino.proxy.server.controller.res.report.LicenseFlowReportRes; +import fun.asgc.neutrino.proxy.server.controller.res.report.UserFlowMonthReportRes; +import fun.asgc.neutrino.proxy.server.controller.res.report.UserFlowReportRes; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -23,9 +23,22 @@ public interface ReportMapper { */ List userFlowReportList(@Param("userId") Integer userId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate); /** - * 基于用户维度的流量报表 + * 基于License维度的流量报表 * @param userId * @return */ List licenseFLowReportList(@Param("userId") Integer userId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate); + + /** + * 用户流量月度明细 + * @param userId + * @return + */ + List userFlowMonthReportList(@Param("userId") Integer userId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate); + /** + * License流量月度明细 + * @param userId + * @return + */ + List licenseFLowMonthReportList(@Param("userId") Integer userId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate); } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java index 66f46d4d..41799f78 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java @@ -8,8 +8,8 @@ import com.github.pagehelper.PageHelper; import fun.asgc.neutrino.proxy.server.base.page.PageInfo; import fun.asgc.neutrino.proxy.server.base.page.PageQuery; import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder; -import fun.asgc.neutrino.proxy.server.controller.req.ClientConnectRecordListReq; -import fun.asgc.neutrino.proxy.server.controller.res.ClientConnectRecordListRes; +import fun.asgc.neutrino.proxy.server.controller.req.log.ClientConnectRecordListReq; +import fun.asgc.neutrino.proxy.server.controller.res.log.ClientConnectRecordListRes; import fun.asgc.neutrino.proxy.server.dal.ClientConnectRecordMapper; import fun.asgc.neutrino.proxy.server.dal.LicenseMapper; import fun.asgc.neutrino.proxy.server.dal.UserMapper; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java index 84dcab60..42f65919 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java @@ -9,14 +9,14 @@ import fun.asgc.neutrino.proxy.server.base.page.PageInfo; import fun.asgc.neutrino.proxy.server.base.page.PageQuery; import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; -import fun.asgc.neutrino.proxy.server.controller.req.JobInfoExecuteReq; -import fun.asgc.neutrino.proxy.server.controller.req.JobInfoListReq; -import fun.asgc.neutrino.proxy.server.controller.req.JobInfoUpdateEnableStatusReq; -import fun.asgc.neutrino.proxy.server.controller.req.JobInfoUpdateReq; -import fun.asgc.neutrino.proxy.server.controller.res.JobInfoExecuteRes; -import fun.asgc.neutrino.proxy.server.controller.res.JobInfoListRes; -import fun.asgc.neutrino.proxy.server.controller.res.JobInfoUpdateEnableStatusRes; -import fun.asgc.neutrino.proxy.server.controller.res.JobInfoUpdateRes; +import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoExecuteReq; +import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoListReq; +import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoUpdateEnableStatusReq; +import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoUpdateReq; +import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoExecuteRes; +import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoListRes; +import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoUpdateEnableStatusRes; +import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoUpdateRes; import fun.asgc.neutrino.proxy.server.dal.JobInfoMapper; import fun.asgc.neutrino.proxy.server.dal.entity.JobInfoDO; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java index de7fe25d..63c61b76 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java @@ -26,8 +26,8 @@ import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import fun.asgc.neutrino.proxy.server.base.page.PageInfo; import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.controller.req.JobLogListReq; -import fun.asgc.neutrino.proxy.server.controller.res.JobLogListRes; +import fun.asgc.neutrino.proxy.server.controller.req.log.JobLogListReq; +import fun.asgc.neutrino.proxy.server.controller.res.log.JobLogListRes; import fun.asgc.neutrino.proxy.server.dal.JobLogMapper; import fun.asgc.neutrino.proxy.server.dal.entity.JobLogDO; import fun.asgc.solon.extend.job.IJobCallback; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java index e2a1a362..68c08922 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java @@ -12,11 +12,11 @@ import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder; import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; -import fun.asgc.neutrino.proxy.server.controller.req.LicenseCreateReq; -import fun.asgc.neutrino.proxy.server.controller.req.LicenseListReq; -import fun.asgc.neutrino.proxy.server.controller.req.LicenseUpdateEnableStatusReq; -import fun.asgc.neutrino.proxy.server.controller.req.LicenseUpdateReq; -import fun.asgc.neutrino.proxy.server.controller.res.*; +import fun.asgc.neutrino.proxy.server.controller.req.proxy.LicenseCreateReq; +import fun.asgc.neutrino.proxy.server.controller.req.proxy.LicenseListReq; +import fun.asgc.neutrino.proxy.server.controller.req.proxy.LicenseUpdateEnableStatusReq; +import fun.asgc.neutrino.proxy.server.controller.req.proxy.LicenseUpdateReq; +import fun.asgc.neutrino.proxy.server.controller.res.proxy.*; import fun.asgc.neutrino.proxy.server.dal.LicenseMapper; import fun.asgc.neutrino.proxy.server.dal.UserMapper; import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortGroupService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortGroupService.java index a5a52666..a1b14162 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortGroupService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortGroupService.java @@ -10,15 +10,15 @@ import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder; import fun.asgc.neutrino.proxy.server.constant.Constants; import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; -import fun.asgc.neutrino.proxy.server.controller.req.PortGroupCreateReq; -import fun.asgc.neutrino.proxy.server.controller.req.PortGroupListReq; -import fun.asgc.neutrino.proxy.server.controller.req.PortGroupUpdateEnableStatusReq; -import fun.asgc.neutrino.proxy.server.controller.res.*; +import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupCreateReq; +import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupListReq; +import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupUpdateEnableStatusReq; +import fun.asgc.neutrino.proxy.server.controller.res.system.PortGroupCreateRes; +import fun.asgc.neutrino.proxy.server.controller.res.system.PortGroupListRes; +import fun.asgc.neutrino.proxy.server.controller.res.system.PortGroupUpdateEnableStatusRes; import fun.asgc.neutrino.proxy.server.dal.PortGroupMapper; import fun.asgc.neutrino.proxy.server.dal.PortPoolMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO; import fun.asgc.neutrino.proxy.server.dal.entity.PortGroupDO; -import fun.asgc.neutrino.proxy.server.dal.entity.PortMappingDO; import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; import ma.glasnost.orika.MapperFacade; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java index dfb6c2a0..48bd2a41 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java @@ -1,7 +1,6 @@ package fun.asgc.neutrino.proxy.server.service; import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; @@ -12,8 +11,11 @@ import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder; import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; -import fun.asgc.neutrino.proxy.server.controller.req.*; -import fun.asgc.neutrino.proxy.server.controller.res.*; +import fun.asgc.neutrino.proxy.server.controller.req.proxy.PortMappingCreateReq; +import fun.asgc.neutrino.proxy.server.controller.req.proxy.PortMappingListReq; +import fun.asgc.neutrino.proxy.server.controller.req.proxy.PortMappingUpdateEnableStatusReq; +import fun.asgc.neutrino.proxy.server.controller.req.proxy.PortMappingUpdateReq; +import fun.asgc.neutrino.proxy.server.controller.res.proxy.*; import fun.asgc.neutrino.proxy.server.dal.LicenseMapper; import fun.asgc.neutrino.proxy.server.dal.PortMappingMapper; import fun.asgc.neutrino.proxy.server.dal.PortPoolMapper; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java index fa322069..b5faf42d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java @@ -10,8 +10,8 @@ import fun.asgc.neutrino.proxy.server.base.page.PageQuery; import fun.asgc.neutrino.proxy.server.base.rest.ServiceException; import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; -import fun.asgc.neutrino.proxy.server.controller.req.*; -import fun.asgc.neutrino.proxy.server.controller.res.*; +import fun.asgc.neutrino.proxy.server.controller.req.system.*; +import fun.asgc.neutrino.proxy.server.controller.res.system.*; import fun.asgc.neutrino.proxy.server.dal.LicenseMapper; import fun.asgc.neutrino.proxy.server.dal.PortGroupMapper; import fun.asgc.neutrino.proxy.server.dal.PortMappingMapper; @@ -23,7 +23,6 @@ import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; 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 index c126ed78..d2f71aca 100644 --- 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 @@ -3,16 +3,18 @@ package fun.asgc.neutrino.proxy.server.service; import cn.hutool.core.collection.CollectionUtil; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import com.google.common.collect.Lists; import fun.asgc.neutrino.proxy.core.util.DateUtil; import fun.asgc.neutrino.proxy.server.base.db.DbConfig; import fun.asgc.neutrino.proxy.server.base.page.PageInfo; import fun.asgc.neutrino.proxy.server.base.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.JobLogListRes; -import fun.asgc.neutrino.proxy.server.controller.res.LicenseFlowReportRes; -import fun.asgc.neutrino.proxy.server.controller.res.UserFlowReportRes; +import fun.asgc.neutrino.proxy.server.controller.req.report.LicenseFlowMonthReportReq; +import fun.asgc.neutrino.proxy.server.controller.req.report.LicenseFlowReportReq; +import fun.asgc.neutrino.proxy.server.controller.req.report.UserFlowMonthReportReq; +import fun.asgc.neutrino.proxy.server.controller.req.report.UserFlowReportReq; +import fun.asgc.neutrino.proxy.server.controller.res.report.LicenseFlowMonthReportRes; +import fun.asgc.neutrino.proxy.server.controller.res.report.LicenseFlowReportRes; +import fun.asgc.neutrino.proxy.server.controller.res.report.UserFlowMonthReportRes; +import fun.asgc.neutrino.proxy.server.controller.res.report.UserFlowReportRes; import fun.asgc.neutrino.proxy.server.dal.ReportMapper; import fun.asgc.neutrino.proxy.server.util.FormatUtil; import lombok.extern.slf4j.Slf4j; @@ -66,6 +68,34 @@ public class ReportService { return PageInfo.of(list, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize()); } + /** + * 用户流量月度明细 + * @param pageQuery + * @param req + * @return + */ + public PageInfo userFlowMonthReportPage(PageQuery pageQuery, UserFlowMonthReportReq req) { + Page result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize()); + Date now = new Date(); + List list = reportMapper.userFlowMonthReportList(req.getUserId(), DateUtil.getMonthBegin(now), DateUtil.getDayBegin(now), now); + fillUserFlowMonthReport(list); + return PageInfo.of(list, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize()); + } + + /** + * license流量月度明细 + * @param pageQuery + * @param req + * @return + */ + public PageInfo licenseFlowMonthReportPage(PageQuery pageQuery, LicenseFlowMonthReportReq req) { + Page result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize()); + Date now = new Date(); + List list = reportMapper.licenseFLowMonthReportList(req.getUserId(), DateUtil.getMonthBegin(now), DateUtil.getDayBegin(now), now); + fillLicenseFlowMonthReport(list); + return PageInfo.of(list, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize()); + } + private void fillUserFlowReport(List list) { if (CollectionUtil.isEmpty(list)) { return; @@ -99,4 +129,38 @@ public class ReportService { item.setTotalFlowDesc(FormatUtil.getSizeDescByByteCount(totalFlowBytes)); } } + + private void fillUserFlowMonthReport(List list) { + if (CollectionUtil.isEmpty(list)) { + return; + } + for (UserFlowMonthReportRes item : list) { + long upFlowBytes = (null == item.getUpFlowBytes()) ? 0 : item.getUpFlowBytes(); + long downFlowBytes = (null == item.getDownFlowBytes()) ? 0 : item.getDownFlowBytes(); + long totalFlowBytes = upFlowBytes + downFlowBytes; + item.setUpFlowBytes(upFlowBytes); + item.setDownFlowBytes(downFlowBytes); + item.setTotalFlowBytes(totalFlowBytes); + item.setUpFlowDesc(FormatUtil.getSizeDescByByteCount(upFlowBytes)); + item.setDownFlowDesc(FormatUtil.getSizeDescByByteCount(downFlowBytes)); + item.setTotalFlowDesc(FormatUtil.getSizeDescByByteCount(totalFlowBytes)); + } + } + + private void fillLicenseFlowMonthReport(List list) { + if (CollectionUtil.isEmpty(list)) { + return; + } + for (LicenseFlowMonthReportRes item : list) { + long upFlowBytes = (null == item.getUpFlowBytes()) ? 0 : item.getUpFlowBytes(); + long downFlowBytes = (null == item.getDownFlowBytes()) ? 0 : item.getDownFlowBytes(); + long totalFlowBytes = upFlowBytes + downFlowBytes; + item.setUpFlowBytes(upFlowBytes); + item.setDownFlowBytes(downFlowBytes); + item.setTotalFlowBytes(totalFlowBytes); + item.setUpFlowDesc(FormatUtil.getSizeDescByByteCount(upFlowBytes)); + item.setDownFlowDesc(FormatUtil.getSizeDescByByteCount(downFlowBytes)); + item.setTotalFlowDesc(FormatUtil.getSizeDescByByteCount(totalFlowBytes)); + } + } } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java index 1670b3df..173faccb 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java @@ -7,8 +7,8 @@ import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import fun.asgc.neutrino.proxy.server.base.page.PageInfo; import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.controller.req.UserLoginRecordListReq; -import fun.asgc.neutrino.proxy.server.controller.res.UserLoginRecordListRes; +import fun.asgc.neutrino.proxy.server.controller.req.log.UserLoginRecordListReq; +import fun.asgc.neutrino.proxy.server.controller.res.log.UserLoginRecordListRes; import fun.asgc.neutrino.proxy.server.dal.UserLoginRecordMapper; import fun.asgc.neutrino.proxy.server.dal.UserMapper; import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java index a293963f..5f173e7c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java @@ -11,8 +11,8 @@ import fun.asgc.neutrino.proxy.server.base.rest.ServiceException; import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder; import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; -import fun.asgc.neutrino.proxy.server.controller.req.*; -import fun.asgc.neutrino.proxy.server.controller.res.*; +import fun.asgc.neutrino.proxy.server.controller.req.system.*; +import fun.asgc.neutrino.proxy.server.controller.res.system.*; import fun.asgc.neutrino.proxy.server.dal.UserLoginRecordMapper; import fun.asgc.neutrino.proxy.server.dal.UserMapper; import fun.asgc.neutrino.proxy.server.dal.UserTokenMapper; diff --git a/neutrino-proxy-server/src/main/resources/mapper/PortGroupMapper.xml b/neutrino-proxy-server/src/main/resources/mapper/PortGroupMapper.xml index 81d58e84..9108a026 100644 --- a/neutrino-proxy-server/src/main/resources/mapper/PortGroupMapper.xml +++ b/neutrino-proxy-server/src/main/resources/mapper/PortGroupMapper.xml @@ -2,7 +2,7 @@ - SELECT g.*, CASE WHEN g.possessor_type = 1 THEN diff --git a/neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml b/neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml index f8397e2a..54d875a0 100644 --- a/neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml +++ b/neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml @@ -2,7 +2,7 @@ - SELECT p.*, g.possessor_type, g.`name` group_name @@ -16,7 +16,7 @@ ORDER BY p.id - SELECT * FROM diff --git a/neutrino-proxy-server/src/main/resources/mapper/ReportMapper.xml b/neutrino-proxy-server/src/main/resources/mapper/ReportMapper.xml index 9cc807fc..213badaf 100644 --- a/neutrino-proxy-server/src/main/resources/mapper/ReportMapper.xml +++ b/neutrino-proxy-server/src/main/resources/mapper/ReportMapper.xml @@ -2,7 +2,7 @@ - SELECT u.id AS 'userId', u.name AS 'userName', @@ -30,7 +30,7 @@ GROUP BY u.id - SELECT l.id AS 'licenseId', l.name AS 'licenseName', @@ -60,4 +60,131 @@ GROUP BY l.id + + + +