菜单管理

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/LedgerRoomController.java

@@ -45,6 +45,7 @@ public class LedgerRoomController extends BaseController
     public TableDataInfo list(LedgerRoom ledgerRoom)
     {
         QueryWrapper<LedgerRoom> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("floor_id",ledgerRoom.getFloorId()).eq("del_flag","0");
         startPage();
         List<LedgerRoom> list = ledgerRoomService.list(queryWrapper);
         return getDataTable(list);
@@ -79,7 +80,7 @@ public class LedgerRoomController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:ledgerRoom:add')")
     @Log(title = "基础数据-楼层", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping(value = "/save")
     public AjaxResult add(@RequestBody LedgerRoom ledgerRoom)
     {
         return toAjax(ledgerRoomService.save(ledgerRoom));
@@ -90,7 +91,7 @@ public class LedgerRoomController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:ledgerRoom:edit')")
     @Log(title = "基础数据-楼层", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/update")
     public AjaxResult edit(@RequestBody LedgerRoom ledgerRoom)
     {
         return toAjax(ledgerRoomService.updateById(ledgerRoom));
@@ -101,10 +102,12 @@ public class LedgerRoomController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:ledgerRoom:remove')")
     @Log(title = "基础数据-楼层", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@PostMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        ledgerRoomService.removeBatchByIds(Arrays.asList(ids));
+        QueryWrapper<LedgerRoom> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("id", Arrays.asList(ids));
+        ledgerRoomService.remove(queryWrapper);
         return AjaxResult.success();
     }
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/SysMenuAppController.java

+package com.censoft.censoftrongtong.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 菜单信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/app-api/menu")
+public class SysMenuAppController extends BaseController
+{
+    @Autowired
+    private ISysMenuService menuService;
+
+    /**
+     * 查询角色菜单列表信息
+     */
+    @GetMapping(value = "/roleMenuTreeselect")
+    public AjaxResult roleMenuTreeselect()
+    {
+        //根数据
+        List<SysMenu> rootList = new ArrayList<>();
+        //初始化树
+        AjaxResult ajax = AjaxResult.success();
+        List<SysMenu> list = menuService.queryMenu(getUserId());
+        if(CollectionUtils.isEmpty(list)){
+            return ajax;
+        }
+        list.stream().filter(sysMenu -> 0L == sysMenu.getParentId()).forEach(rootList::add);
+        SysMenu sysMenu = rootList.get(0);
+        buildTreeNew(sysMenu,list);
+        ajax.put("list", sysMenu.getChildren());
+        return ajax;
+    }
+
+    public static void buildTreeNew(SysMenu root, List<SysMenu> nodeList) {
+        //step1 找出所有的下级
+        List<SysMenu> resultList = new ArrayList<>();
+        nodeList.forEach(node ->{
+            //如果id对应，则为下级
+            if(root.getMenuId().equals(node.getParentId())){
+                //递归查找下级的下级
+                buildTreeNew(node,nodeList);
+                resultList.add(node);
+            }
+        });
+        root.setChildren(resultList);
+    }
+}
\ No newline at end of file

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -36,7 +36,7 @@ public class SysMenuController extends BaseController
     /**
      * 获取菜单列表
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
     public AjaxResult list(SysMenu menu)
     {

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -122,4 +122,11 @@ public interface SysMenuMapper
      * @return 结果
      */
     public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
+
+    /**
+     * 根据用户 id 查询角色列表
+     * @param userId 用户 id
+     * @return 返回信息
+     */
+    List<SysMenu> queryMenu(@Param("userId")Long userId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java

@@ -141,4 +141,11 @@ public interface ISysMenuService
      * @return 结果
      */
     public boolean checkMenuNameUnique(SysMenu menu);
+
+    /**
+     * 根据用户 id 查询角色列表
+     * @param userId 用户 id
+     * @return 返回信息
+     */
+    List<SysMenu> queryMenu(Long userId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -528,4 +528,9 @@ public class SysMenuServiceImpl implements ISysMenuService
         return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS, Constants.WWW, "." },
                 new String[] { "", "", "", "/" });
     }
+
+    @Override
+    public List<SysMenu> queryMenu(Long userId) {
+        return menuMapper.queryMenu(userId);
+    }
 }

ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -199,4 +199,19 @@
 	    delete from sys_menu where menu_id = #{menuId}
 	</delete>
 
+	<select id="queryMenu" resultMap="SysMenuResult">
+		SELECT
+			*
+		FROM
+			sys_menu
+		WHERE
+				menu_id IN (
+				SELECT
+					menu_id
+				FROM
+					sys_role_menu
+				WHERE
+					role_id IN ( SELECT role_id FROM sys_user_role WHERE user_id = #{userId} ))
+		order by order_num
+	</select>
 </mapper> 
\ No newline at end of file