From 3f9ebf19e687c33287b0eaec64d4564a212f57db Mon Sep 17 00:00:00 2001 From: mg <maokecheng@163.com> Date: 星期三, 12 十月 2022 16:59:57 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java b/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java index d8a7d90..3fde2c6 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java @@ -2,18 +2,23 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ycl.annotation.LogSave; import com.ycl.api.CommonResult; +import com.ycl.bo.AdminUserDetails; import com.ycl.entity.portal.ThirdApplications; import com.ycl.entity.portal.WebsiteLogo; +import com.ycl.entity.user.AdminMenuRelation; import com.ycl.entity.user.UmsMenu; import com.ycl.entity.user.vo.UmsMenuVo; import com.ycl.service.portal.UmsThirdApplicationsService; import com.ycl.service.portal.UmsWebsiteLogoService; +import com.ycl.service.user.IAdminMenuRelationService; import com.ycl.service.user.UmsMenuService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -31,6 +36,8 @@ UmsMenuService umsMenuService; @Autowired UmsThirdApplicationsService umsThirdApplicationsService; + @Autowired + IAdminMenuRelationService iAdminMenuRelationService; @ApiOperation("logo绠$悊-娣诲姞logo") @PostMapping("/logo/add") @@ -101,6 +108,23 @@ return CommonResult.success(menus); } + @ApiOperation("鑿滃崟鏉冮檺-涓汉鑿滃崟鏌ヨ") + @GetMapping("/menu/search_myself") + @LogSave(contain = "鐧诲綍鎷垮埌涓汉鑿滃崟",operationType = "涓汉鎿嶄綔") + public CommonResult searchMenusMyself() { + AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + return CommonResult.success(umsMenuService.ListTreeMyself(user.getUserId())); + } + + @ApiOperation("鑿滃崟鏉冮檺-涓汉鑿滃崟鐘舵�佷慨鏀�") + @PutMapping("/menu/modification_myself") + public CommonResult modifyMenusMyself(@RequestParam Long relationId, Integer status) { + AdminMenuRelation adminMenuRelation = new AdminMenuRelation(); + adminMenuRelation.setId(relationId); + adminMenuRelation.setIsStart(status); + return CommonResult.success(iAdminMenuRelationService.updateById(adminMenuRelation)); + } + @ApiOperation("鑷畾涔夎彍鍗�-娣诲姞鑿滃崟") @PostMapping("/menu/add") public CommonResult addMenu(@RequestBody UmsMenu umsMenu) { -- Gitblit v1.8.0