xuq

src/main/java/com/zfire/mall/manager/bean/admin/AdminModuleVO.java

@@ -0,0 +1,68 @@
+package com.zfire.mall.manager.bean.admin;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author qinrongjun
+ * @description
+ * @date 2023/8/12 14:55 星期六
+ */
+@Data
+public class AdminModuleVO {
+
+    @ApiModelProperty( "id")
+    private String moduleId;
+
+    @ApiModelProperty( "名称")
+    private String moduleName;
+
+    @ApiModelProperty( "模块路径")
+    private String modulePath;
+
+    @ApiModelProperty( "true=正常 false=作废")
+    private Boolean status;
+
+    @ApiModelProperty( "1=普通菜单 2=功能菜单 3=功能点  4=外部菜单")
+    private Integer type;
+
+    @ApiModelProperty( "编号")
+    private String code;
+
+    @ApiModelProperty( "层级")
+    private Integer level;
+
+    @ApiModelProperty( "url")
+    private String url;
+
+    @ApiModelProperty( "全url")
+    private String fullUrl;
+
+    @ApiModelProperty( "当前url")
+    private String curUrl;
+
+    @ApiModelProperty( "父id")
+    private String parentId;
+
+    @ApiModelProperty( "父级名称")
+    private String parentModule;
+
+    @ApiModelProperty( "排序号")
+    private Integer sortNum;
+
+    @ApiModelProperty( "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty( "icon")
+    private String icon;
+
+    @ApiModelProperty( "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty( "type=2的功能点")
+    List<AdminModuleVO> childList;
+
+}

src/main/java/com/zfire/mall/manager/controller/admin/AdminModuleController.java

@@ -1,6 +1,7 @@
 package com.zfire.mall.manager.controller.admin;
 
 import com.zfire.mall.manager.bean.admin.AdminModuleTree;
+import com.zfire.mall.manager.bean.admin.AdminModuleVO;
 import com.zfire.mall.manager.bean.admin.AdminWebsitTree;
 import com.zfire.mall.manager.exception.RemoteServiceException;
 import com.zfire.mall.manager.helper.ResponseHelper;
@@ -29,8 +30,8 @@ public class AdminModuleController {
 
     @GetMapping("/detail")
     @ApiOperation("详情")
-    public ResponseHelper<AdminModule> detail(@RequestParam String moduleId){
-        AdminModule detail = adminModuleLogic.detail(moduleId);
+    public ResponseHelper<AdminModuleVO> detail(@RequestParam String moduleId){
+        AdminModuleVO detail = adminModuleLogic.detail(moduleId);
         return ResponseHelper.success(detail);
     }
 

src/main/java/com/zfire/mall/manager/logic/admin/AdminModuleLogic.java

@@ -1,6 +1,8 @@
 package com.zfire.mall.manager.logic.admin;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.zfire.mall.manager.bean.admin.AdminModuleTree;
+import com.zfire.mall.manager.bean.admin.AdminModuleVO;
 import com.zfire.mall.manager.bean.admin.AdminUserCom;
 import com.zfire.mall.manager.exception.RemoteServiceException;
 import com.zfire.mall.manager.logic.common.CommonLogic;
@@ -106,8 +108,16 @@ public class AdminModuleLogic {
     }
 
 
-    public AdminModule detail(String id){
-        return adminModuleService.getById(id);
+    public AdminModuleVO detail(String id){
+        AdminModule adminModule = adminModuleService.getById(id);
+        AdminModuleVO adminModuleVO = BeanUtil.copyProperties(adminModule, AdminModuleVO.class);
+        //查询子集
+        if(adminModule.getType() == 2){
+            List<AdminModule> list = adminModuleService.lambdaQuery().eq(AdminModule::getParentId, adminModule.getModuleId()).list();
+            List<AdminModuleVO> adminModuleVOS = BeanUtil.copyToList(list, AdminModuleVO.class);
+            adminModuleVO.setChildList(adminModuleVOS);
+        }
+        return adminModuleVO;
     }