添加菜单资源配置

bill-manager/src/main/java/com/mortals/xhx/base/system/menu/web/MenuController.java

@@ -147,7 +147,7 @@ public class MenuController extends BaseCRUDJsonBodyMappingController<MenuServic
         String busiDesc = "查询" + this.getModuleDesc() + "子节点";
         try {
             List<MenuTreeSelect> treeList = this.service.getListByParentId(parentId, getContext());
-            model.put(RESULT_KEY, treeList);
+            model.put(KEY_RESULT_DATA, treeList);
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
             ret.put(KEY_RESULT_DATA, model);
             recordSysLog(request, busiDesc + "【成功】");

bill-manager/src/main/java/com/mortals/xhx/base/system/resource/model/vo/ResourceVo.java

@@ -19,5 +19,9 @@ public class ResourceVo extends BaseEntityLong {
     /** 菜单ID，主键，自增长列表 */
     private List <Long> idList;
 
+    private Integer checked=0;
+
+    private Long roleId;
+
 
 }
\ No newline at end of file

bill-manager/src/main/java/com/mortals/xhx/base/system/resource/web/ResourceController.java

@@ -10,20 +10,27 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.menu.model.MenuTreeSelect;
 import com.mortals.xhx.base.system.resource.model.ResourceEntity;
+import com.mortals.xhx.base.system.resource.model.ResourceQuery;
 import com.mortals.xhx.base.system.resource.service.ResourceService;
+import com.mortals.xhx.base.system.role.model.RoleAuthEntity;
+import com.mortals.xhx.base.system.role.model.RoleAuthQuery;
+import com.mortals.xhx.base.system.role.service.RoleAuthService;
 import com.mortals.xhx.common.code.AuthType;
 import com.mortals.xhx.common.code.SourceType;
+import com.mortals.xhx.common.code.YesNoEnum;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.mortals.framework.ap.SysConstains.RESULT_KEY;
 
 /**
  * 资源信息
@@ -36,6 +43,9 @@ import java.util.Map;
 @RequestMapping("resource")
 public class ResourceController extends BaseCRUDJsonBodyMappingController<ResourceService, ResourceEntity, Long> {
 
+    @Autowired
+    private RoleAuthService roleAuthService;
+
     public ResourceController() {
         super.setModuleDesc("资源信息");
     }
@@ -79,4 +89,48 @@ public class ResourceController extends BaseCRUDJsonBodyMappingController<Resour
         return rest;
     }
 
+
+    /**
+     * 分组显示
+     */
+    @ApiOperation(value = "分组列表")
+    @PostMapping(value = "group")
+    @UnAuth
+    public String group(@RequestBody ResourceQuery query) {
+        JSONObject ret = new JSONObject();
+        Map<String, Object> model = new HashMap<>();
+        String busiDesc = "查询" + this.getModuleDesc() + "子节点";
+        try {
+            if (!ObjectUtils.isEmpty(query.getRoleId())) {
+                List<RoleAuthEntity> roleAuthEntities = roleAuthService.find(new RoleAuthQuery().roleId(query.getRoleId()));
+                Set<Long> collect = roleAuthEntities.stream()
+                        .filter(f -> f.getMenuId() == null)
+                        .map(m -> m.getResourceId())
+                        .collect(Collectors.toSet());
+                Map<String, List<ResourceEntity>> group = this.service.find(new ResourceQuery(), getContext()).stream()
+                        .map(m -> {
+                            if (collect.contains(m.getId())) {
+                                m.setChecked(YesNoEnum.YES.getValue());
+                            }
+                            return m;
+                        })
+                        .collect(Collectors.groupingBy(x -> x.getGroupName()));
+                model.put(KEY_RESULT_DATA, group);
+            }else{
+                Map<String, List<ResourceEntity>> group = this.service.find(new ResourceQuery(), getContext()).stream()
+                        .collect(Collectors.groupingBy(x -> x.getGroupName()));
+                model.put(KEY_RESULT_DATA, group);
+            }
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+            ret.put(KEY_RESULT_DATA, model);
+            recordSysLog(request, busiDesc + "【成功】");
+        } catch (Exception e) {
+            log.error("分组列表错误", e);
+            this.doException(request, busiDesc, model, e);
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            ret.put(KEY_RESULT_MSG, e.getMessage());
+        }
+        return ret.toJSONString();
+    }
+
 }
\ No newline at end of file