From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期四, 15 十二月 2022 11:29:08 +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 | 49 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 40 insertions(+), 9 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 4240c35..1aeab86 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,21 +2,27 @@ 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.user.UmsMenu; 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.user.UmsMenuService; 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.*; +import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; @@ -31,15 +37,19 @@ UmsMenuService umsMenuService; @Autowired UmsThirdApplicationsService umsThirdApplicationsService; + @Autowired + IAdminMenuRelationService iAdminMenuRelationService; @ApiOperation("logo绠$悊-娣诲姞logo") @PostMapping("/logo/add") + @LogSave(operationType = "闂ㄦ埛绠$悊", contain = "娣诲姞logo") public CommonResult addLogo(@RequestBody @Validated WebsiteLogo websiteLogo) { return CommonResult.success(umsWebsiteLogoService.save(websiteLogo)); } @ApiOperation("logo绠$悊-淇敼logo") @PutMapping("/logo/update") + @LogSave(operationType = "闂ㄦ埛绠$悊", contain = "淇敼logo") public CommonResult updateLogo(@RequestBody WebsiteLogo websiteLogo) { return CommonResult.success(umsWebsiteLogoService.updateById(websiteLogo)); } @@ -58,22 +68,23 @@ @ApiOperation("logo绠$悊-鍒犻櫎logo") @DeleteMapping("/logo/delete") + @LogSave(operationType = "闂ㄦ埛绠$悊", contain = "鍒犻櫎logo") public CommonResult removeLogo(@RequestParam Integer id) { return CommonResult.success(umsWebsiteLogoService.removeById(id)); } @ApiOperation("鑷畾涔夎彍鍗�-鑿滃崟鏌ヨ") @GetMapping("/menu/search") - public CommonResult searchMenus(@RequestBody Page page) { + public CommonResult searchMenus(Page page) { Page menus = umsMenuService.page(page, new QueryWrapper<UmsMenu>().eq("parent_id", 0)); - List<UmsMenuVo> umsMenuVoList ; + List<UmsMenuVo> umsMenuVoList; List<UmsMenu> firstMenu = menus.getRecords(); - umsMenuVoList = firstMenu.stream().map(item -> { + umsMenuVoList = firstMenu.stream().map(item -> { UmsMenuVo umsMenuVo = new UmsMenuVo(); BeanUtils.copyProperties(item, umsMenuVo); return umsMenuVo; }).collect(Collectors.toList()); - if (firstMenu.size()!=0){ + if (firstMenu.size() != 0) { umsMenuVoList.forEach(item -> { List<UmsMenuVo> secondMenuListVos; List<UmsMenu> secondMenuList = umsMenuService.list(new QueryWrapper<UmsMenu>().eq("parent_id", item.getId())); @@ -101,10 +112,30 @@ return CommonResult.success(menus); } + @ApiOperation("鑿滃崟鏉冮檺-涓汉鑿滃崟鏌ヨ") + @GetMapping("/menu/search_myself") + public CommonResult searchMenusMyself() { + AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + HashMap<String, Object> map = new HashMap<>(); + map.put("menu",umsMenuService.ListTreeMyself(user.getUserId())); + map.put("permission",umsMenuService.getPermission(user.getUserId())); + return CommonResult.success(map); + } + + @ApiOperation("鑿滃崟鏉冮檺-涓汉鑿滃崟鐘舵�佷慨鏀�") + @PutMapping("/menu/modification_myself") + @LogSave(operationType = "闂ㄦ埛绠$悊", contain = "鑿滃崟鏉冮檺淇敼") + 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) { - return CommonResult.success(umsMenuService.save(umsMenu)); + return CommonResult.success(umsMenuService.save(umsMenu)); } @ApiOperation("鑷畾涔夎彍鍗�-淇敼鑿滃崟") @@ -127,8 +158,8 @@ @ApiOperation("绗笁鏂规帴鍙g鐞�-鏌ヨ") @GetMapping("/thirdApp/search") - public CommonResult searchThirdApp(@RequestBody Page page) { - return CommonResult.success(umsThirdApplicationsService.page(page,new QueryWrapper<>())); + public CommonResult searchThirdApp(Page page) { + return CommonResult.success(umsThirdApplicationsService.page(page, new QueryWrapper<>())); } @ApiOperation("绗笁鏂规帴鍙g鐞�-鏌ヨ閫氳繃id") -- Gitblit v1.8.0