feat: add package list

wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/UPackageController.java

@@ -1,6 +1,7 @@
 package org.wfc.system.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,7 +15,9 @@ import org.wfc.common.core.web.controller.BaseController;
 import org.wfc.common.core.web.domain.AjaxResult;
 import org.wfc.common.core.web.page.TableDataInfo;
 import org.wfc.system.domain.UPackage;
+import org.wfc.system.domain.URateLimit;
 import org.wfc.system.service.IUPackageService;
+import org.wfc.system.service.IURateLimitService;
 
 import java.util.List;
 
@@ -31,18 +34,21 @@ import java.util.List;
 public class UPackageController extends BaseController {
 
     @Autowired
-    public IUPackageService uPackageService;
+    private IUPackageService uPackageService;
+
+    @Autowired
+    private IURateLimitService uRateLimitService;
 
     @GetMapping("/page")
     public TableDataInfo page(UPackage uPackage) {
         startPage();
-        List<UPackage> list = uPackageService.list();
+        List<UPackage> list = getPackages();
         return getDataTable(list);
     }
 
     @GetMapping("/list")
     public AjaxResult list(UPackage uPackage) {
-        List<UPackage> list = uPackageService.list();
+        List<UPackage> list = getPackages();
         return success(list);
     }
 
@@ -66,4 +72,15 @@ public class UPackageController extends BaseController {
         return toAjax(uPackageService.removeByIds(CollUtil.newArrayList(ids)));
     }
 
+    private List<UPackage> getPackages() {
+        List<UPackage> list = uPackageService.list();
+        for (UPackage pack : list) {
+            if (ObjectUtil.isNull(pack.getRateLimitId())) {
+                continue;
+            }
+            URateLimit uRateLimit = uRateLimitService.getById(pack.getRateLimitId());
+            pack.setRateLimits(uRateLimit);
+        }
+        return list;
+    }
 }

wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/URateLimitController.java

@@ -31,7 +31,7 @@ import java.util.List;
 public class URateLimitController extends BaseController {
 
     @Autowired
-    public IURateLimitService uRateLimitService;
+    private IURateLimitService uRateLimitService;
 
     @GetMapping("/page")
     public TableDataInfo page(URateLimit uRateLimit) {

wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/UPackage.java

@@ -1,12 +1,13 @@
 package org.wfc.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import org.wfc.common.mybatis.domain.BaseData;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
+import org.wfc.common.mybatis.domain.BaseData;
+
+import java.math.BigDecimal;
 
 /**
  * <p>
@@ -65,4 +66,8 @@ public class UPackage extends BaseData {
 
     @Schema(description = "套餐是否启用")
     private Boolean packageEnable;
+
+    @Schema(description = "带宽限速组")
+    @TableField(exist = false)
+    private URateLimit rateLimits;
 }