新增用户流量月度明细、license流量月度明细

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;

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.*;

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;

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;

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.*;

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;

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;

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.*;

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<UserFlowMonthReportRes> 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<LicenseFlowMonthReportRes> licenseFlowMonthReportPage(PageQuery pageQuery, LicenseFlowMonthReportReq req) {
+        ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
+
+        return reportService.licenseFlowMonthReportPage(pageQuery, req);
+    }
 }

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;

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;

neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseFlowReportReq.java

@@ -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;
-}

neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserFlowReportReq.java

@@ -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;
-}

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;

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;
 

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;
 

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;
+}

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;
+}

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;
+}

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;
+}

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 
 /**
  * 用户列表请求

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;
 

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;
 

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;
 

neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/LicenseFlowReportRes.java

@@ -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;
-}

neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupCreateRes.java

@@ -1,4 +0,0 @@
-package fun.asgc.neutrino.proxy.server.controller.res;
-
-public class PortGroupCreateRes {
-}

neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolUpdateGroupRes.java

@@ -1,4 +0,0 @@
-package fun.asgc.neutrino.proxy.server.controller.res;
-
-public class PortPoolUpdateGroupRes {
-}

neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserFlowReportRes.java

@@ -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;
-}

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;
 

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;
 

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;
 

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;
 

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;

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;

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;
 
 /**
  * 更新启用状态响应

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;
 
 /**
  *

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;
 

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;

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;

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;
 

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;
 

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;
+}

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;
+}

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;

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;
+}

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;
+}

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;
 

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;
 

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;

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;
 

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;
 

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;

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;

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 {
+}

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;

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;
 

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;
 

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;
 

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;
 

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 {
+}

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;
 

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;
 
 /**
  *

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;

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;
 

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;
 

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;
 
 /**
  *

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;
 
 /**
  *

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;
 

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;

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;

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<UserFlowReportRes> userFlowReportList(@Param("userId") Integer userId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate);
     /**
-     * 基于用户维度的流量报表
+     * 基于License维度的流量报表
      * @param userId
      * @return
      */
     List<LicenseFlowReportRes> licenseFLowReportList(@Param("userId") Integer userId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate);
+
+    /**
+     * 用户流量月度明细
+     * @param userId
+     * @return
+     */
+    List<UserFlowMonthReportRes> userFlowMonthReportList(@Param("userId") Integer userId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate);
+    /**
+     * License流量月度明细
+     * @param userId
+     * @return
+     */
+    List<LicenseFlowMonthReportRes> licenseFLowMonthReportList(@Param("userId") Integer userId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate);
 }

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;

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;

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;

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;

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;

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;

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;

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<UserFlowMonthReportRes> userFlowMonthReportPage(PageQuery pageQuery, UserFlowMonthReportReq req) {
+        Page<UserFlowMonthReportRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
+        Date now = new Date();
+        List<UserFlowMonthReportRes> 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<LicenseFlowMonthReportRes> licenseFlowMonthReportPage(PageQuery pageQuery, LicenseFlowMonthReportReq req) {
+        Page<LicenseFlowMonthReportRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
+        Date now = new Date();
+        List<LicenseFlowMonthReportRes> 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<UserFlowReportRes> list) {
         if (CollectionUtil.isEmpty(list)) {
             return;
@@ -99,4 +129,38 @@ public class ReportService {
             item.setTotalFlowDesc(FormatUtil.getSizeDescByByteCount(totalFlowBytes));
         }
     }
+
+    private void fillUserFlowMonthReport(List<UserFlowMonthReportRes> 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<LicenseFlowMonthReportRes> 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));
+        }
+    }
 }

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;

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;