重写复现方法

src/main/java/com/mini/capi/biz/domain/ApiModule.java

@@ -59,4 +59,5 @@ public class ApiModule implements Serializable {
      */
     @TableField("f_flow_state")
     private Integer fFlowState;
+
 }

src/main/java/com/mini/capi/sys/domain/ModuleMenuDTO.java

@@ -0,0 +1,31 @@
+package com.mini.capi.sys.domain;
+
+import com.mini.capi.biz.domain.ApiMenus;
+import com.mini.capi.biz.domain.ApiModule;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class ModuleMenuDTO implements Serializable {
+
+    private String moduleName;
+    private String moduleCode;
+    private String icon;
+    private String href;
+
+    List<ApiMenus> menus = new ArrayList<>();
+
+    public ModuleMenuDTO() {
+    }
+
+    public ModuleMenuDTO(String moduleName,String moduleCode,String icon,String href,List<ApiMenus> menus){
+        this.moduleName = moduleName;
+        this.moduleCode = moduleCode;
+        this.icon = icon;
+        this.href = href;
+        this.menus = menus;
+    }
+}

src/main/java/com/mini/capi/sys/pageController/loginPageController.java

@@ -1,6 +1,5 @@
 package com.mini.capi.sys.pageController;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mini.capi.biz.domain.ApiMenus;
 import com.mini.capi.biz.domain.ApiModule;
@@ -8,13 +7,16 @@ import com.mini.capi.biz.domain.ApiUser;
 import com.mini.capi.biz.service.ApiMenusService;
 import com.mini.capi.biz.service.ApiModuleService;
 import com.mini.capi.biz.service.ApiUserService;
+import com.mini.capi.model.ApiResult;
 import com.mini.capi.model.auth.Result;
+import com.mini.capi.sys.domain.ModuleMenuDTO;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpSession;
 import lombok.Data;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -98,20 +100,21 @@ public class loginPageController {
     }
 
 
-    @GetMapping("/modules")
-    public List<ApiModule> modules() {
-        return moduleService.list();
+    @GetMapping("/getModules")
+    public ApiResult<List<ModuleMenuDTO>> getModules() {
+        List<ApiModule> apiModules = moduleService.list();
+        List<ModuleMenuDTO> menuDTOList = new ArrayList<>();
+        for (ApiModule apiModule : apiModules) {
+            ModuleMenuDTO menuDTO = new ModuleMenuDTO(apiModule.getModuleName(), apiModule.getModuleCode(), apiModule.getCIcon(), apiModule.getCHref(), getMenus(apiModule.getModuleCode()));
+            menuDTOList.add(menuDTO);
+        }
+        return ApiResult.success(menuDTOList);
     }
 
-    @GetMapping("/menus")
-    public List<ApiMenus> menus(@RequestParam String moduleCode) {
+
+    public List<ApiMenus> getMenus(String moduleCode) {
         QueryWrapper<ApiMenus> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("module_code", moduleCode);
         return menusService.list(queryWrapper);
     }
-
-    @GetMapping("/me")
-    public ApiUser me(HttpSession session) {
-        return (ApiUser) session.getAttribute("Authorization");
-    }
 }