From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 163 insertions(+), 0 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
new file mode 100644
index 0000000..2b5e89c
--- /dev/null
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -0,0 +1,163 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+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;
+
+/**
+ * 菜单信息
+ *
+ * @author ruoyi
+ */
+@Api(tags = "菜单信息")
+@RestController
+@RequestMapping("/system/menu")
+public class SysMenuController extends BaseController
+{
+ @Autowired
+ private ISysMenuService menuService;
+
+ @ApiOperation("菜单权限（有层级）")
+ @GetMapping("/levelList")
+ public AjaxResult levelList()
+ {
+ // 获取当前角色的菜单列表
+ List<SysMenu> menus = menuService.selectList();
+ if(menus.size()==0){
+ return AjaxResult.success(new ArrayList<>());
+ }
+ // 第三级
+ List<SysMenu> s3 = menus.stream().filter(e -> e.getMenuType().equals("F")).collect(Collectors.toList());
+ // 第二级
+ List<SysMenu> s2 = menus.stream().filter(e -> e.getMenuType().equals("C")).collect(Collectors.toList());
+ // 第一级
+ List<SysMenu> s1 = menus.stream().filter(e -> e.getMenuType().equals("M")).collect(Collectors.toList());
+
+ for (SysMenu menu : s2) {
+ List<SysMenu> collect = s3.stream().filter(e -> e.getParentId().equals(menu.getMenuId())).collect(Collectors.toList());
+ menu.setChildren(collect);
+ }
+ for (SysMenu menu : s1) {
+ List<SysMenu> collect = s2.stream().filter(e -> e.getParentId().equals(menu.getMenuId())).collect(Collectors.toList());
+ menu.setChildren(collect);
+ }
+
+ return AjaxResult.success(s1);
+ }
+
+ /**
+ * 获取菜单列表
+ */
+ @GetMapping("/list")
+ public AjaxResult list(SysMenu menu)
+ {
+ List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+ return AjaxResult.success(menus);
+ }
+
+ /**
+ * 根据菜单编号获取详细信息
+ */
+ @GetMapping(value = "/{menuId}")
+ public AjaxResult getInfo(@PathVariable Long menuId)
+ {
+ return AjaxResult.success(menuService.selectMenuById(menuId));
+ }
+
+ /**
+ * 获取菜单下拉树列表
+ */
+ @GetMapping("/treeselect")
+ public AjaxResult treeselect(SysMenu menu)
+ {
+ List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+ return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
+ }
+
+ /**
+ * 加载对应角色菜单列表树
+ */
+ @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+ public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+ {
+ List<SysMenu> menus = menuService.selectMenuList(getUserId());
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+ ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+ return ajax;
+ }
+
+ /**
+ * 新增菜单
+ */
+ @Log(title = "菜单管理", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@Validated @RequestBody SysMenu menu)
+ {
+ if (!menuService.checkMenuNameUnique(menu))
+ {
+ return error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+ }
+ else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
+ {
+ return error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+ }
+ menu.setCreateBy(getUsername());
+ return AjaxResult.success(menuService.insertMenu(menu));
+ }
+
+ /**
+ * 修改菜单
+ */
+ @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@Validated @RequestBody SysMenu menu)
+ {
+ if (!menuService.checkMenuNameUnique(menu))
+ {
+ return error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+ }
+ else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
+ {
+ return error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+ }
+ else if (menu.getMenuId().equals(menu.getParentId()))
+ {
+ return error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+ }
+ menu.setUpdateBy(getUsername());
+ return AjaxResult.success(menuService.updateMenu(menu));
+ }
+
+ /**
+ * 删除菜单
+ */
+ @Log(title = "菜单管理", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{menuId}")
+ public AjaxResult remove(@PathVariable("menuId") Long menuId)
+ {
+ if (menuService.hasChildByMenuId(menuId))
+ {
+ return warn("存在子菜单,不允许删除");
+ }
+ if (menuService.checkMenuExistRole(menuId))
+ {
+ return warn("菜单已分配,不允许删除");
+ }
+ return AjaxResult.success(menuService.deleteMenuById(menuId));
+ }
+}
\ No newline at end of file
--
Gitblit v1.7.1