From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 08 九月 2023 11:16:35 +0800
Subject: [PATCH] 优化
---
ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java | 117 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 90 insertions(+), 27 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 6b93823..bba5f77 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
@@ -1,21 +1,30 @@
package com.ycl.controller.portal;
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.entity.platform.portal.UmsThirdApplications;
-import com.ycl.entity.platform.user.UmsMenu;
-import com.ycl.entity.platform.portal.UmsWebsiteLogo;
-import com.ycl.entity.platform.user.vo.UmsMenuVo;
-import com.ycl.service.platform.portal.UmsThirdApplicationsService;
-import com.ycl.service.platform.user.UmsMenuService;
-import com.ycl.service.platform.portal.UmsWebsiteLogoService;
+import com.ycl.bo.AdminUserDetails;
+import com.ycl.entity.portal.ExternalLink;
+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.IExternalLinkService;
+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.*;
+import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -30,48 +39,56 @@
UmsMenuService umsMenuService;
@Autowired
UmsThirdApplicationsService umsThirdApplicationsService;
+ @Autowired
+ IAdminMenuRelationService iAdminMenuRelationService;
+ @Autowired
+ IExternalLinkService externalLinkService;
@ApiOperation("logo绠＄悊-娣诲姞logo")
@PostMapping("/logo/add")
- public CommonResult addLogo(@RequestBody @Validated UmsWebsiteLogo umsWebsiteLogo) {
- return CommonResult.success(umsWebsiteLogoService.save(umsWebsiteLogo));
+ @LogSave(operationType = "闂ㄦ埛绠＄悊", contain = "娣诲姞logo")
+ public CommonResult addLogo(@RequestBody @Validated WebsiteLogo websiteLogo) {
+ return CommonResult.success(umsWebsiteLogoService.save(websiteLogo));
}
@ApiOperation("logo绠＄悊-淇敼logo")
@PutMapping("/logo/update")
- public CommonResult updateLogo(@RequestBody UmsWebsiteLogo umsWebsiteLogo) {
- return CommonResult.success(umsWebsiteLogoService.updateById(umsWebsiteLogo));
+ @LogSave(operationType = "闂ㄦ埛绠＄悊", contain = "淇敼logo")
+ public CommonResult updateLogo(@RequestBody WebsiteLogo websiteLogo) {
+ return CommonResult.success(umsWebsiteLogoService.updateById(websiteLogo));
}
@ApiOperation("logo绠＄悊-鏌ヨlogo")
@GetMapping("/logo/search")
public CommonResult searchLogo() {
- return CommonResult.success(umsWebsiteLogoService.list(new QueryWrapper<>()));
+ return CommonResult.success(umsWebsiteLogoService.list(new QueryWrapper<>()).get(0));
}
@ApiOperation("logo绠＄悊-鏌ヨlogo")
@GetMapping("/logo/searchOne")
public CommonResult searchLogo(@RequestParam Integer id) {
- return CommonResult.success(umsWebsiteLogoService.getOne(new QueryWrapper<UmsWebsiteLogo>().eq("id", id)));
+ return CommonResult.success(umsWebsiteLogoService.getOne(new QueryWrapper<WebsiteLogo>().eq("id", id)));
}
@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() {
- List<UmsMenuVo> umsMenuVoList ;
- List<UmsMenu> firstMenu = umsMenuService.list(new QueryWrapper<UmsMenu>().eq("parent_id", 0));
- umsMenuVoList = firstMenu.stream().map(item -> {
+ public CommonResult searchMenus(Page page) {
+ Page menus = umsMenuService.page(page, new QueryWrapper<UmsMenu>().eq("parent_id", 0));
+ List<UmsMenuVo> umsMenuVoList;
+ List<UmsMenu> firstMenu = menus.getRecords();
+ 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()));
@@ -95,13 +112,34 @@
item.setMenuVoArrayList(secondMenuListVos);
});
}
- return CommonResult.success(umsMenuVoList);
+ menus.setRecords(umsMenuVoList);
+ 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("鑷畾涔夎彍鍗�-淇敼鑿滃崟")
@@ -112,26 +150,26 @@
@ApiOperation("绗笁鏂规帴鍙ｇ鐞�-娣诲姞")
@PostMapping("/thirdApp/add")
- public CommonResult addThirdApp(@RequestBody @Validated UmsThirdApplications umsThirdApplications) {
- return CommonResult.success(umsThirdApplicationsService.save(umsThirdApplications));
+ public CommonResult addThirdApp(@RequestBody @Validated ThirdApplications thirdApplications) {
+ return CommonResult.success(umsThirdApplicationsService.save(thirdApplications));
}
@ApiOperation("绗笁鏂规帴鍙ｇ鐞�-淇敼")
@PutMapping("/thirdApp/update")
- public CommonResult updateThirdApp(@RequestBody UmsThirdApplications umsThirdApplications) {
- return CommonResult.success(umsThirdApplicationsService.updateById(umsThirdApplications));
+ public CommonResult updateThirdApp(@RequestBody ThirdApplications thirdApplications) {
+ return CommonResult.success(umsThirdApplicationsService.updateById(thirdApplications));
}
@ApiOperation("绗笁鏂规帴鍙ｇ鐞�-鏌ヨ")
@GetMapping("/thirdApp/search")
- public CommonResult searchThirdApp() {
- return CommonResult.success(umsThirdApplicationsService.list(new QueryWrapper<>()));
+ public CommonResult searchThirdApp(Page page) {
+ return CommonResult.success(umsThirdApplicationsService.page(page, new QueryWrapper<>()));
}
@ApiOperation("绗笁鏂规帴鍙ｇ鐞�-鏌ヨ閫氳繃id")
@GetMapping("/thirdApp/searchOne")
public CommonResult searchThirdApp(@RequestParam Integer id) {
- return CommonResult.success(umsThirdApplicationsService.getOne(new QueryWrapper<UmsThirdApplications>().eq("id", id)));
+ return CommonResult.success(umsThirdApplicationsService.getOne(new QueryWrapper<ThirdApplications>().eq("id", id)));
}
@ApiOperation("绗笁鏂规帴鍙ｇ鐞�-鍒犻櫎")
@@ -139,4 +177,29 @@
public CommonResult removeThirdApp(@RequestParam Integer id) {
return CommonResult.success(umsThirdApplicationsService.removeById(id));
}
+
+
+ @ApiOperation("澶栭儴閾炬帴鎺ュ彛绠＄悊-娣诲姞")
+ @PostMapping("/externalLink/add")
+ public CommonResult addExternalLink(@RequestBody @Validated ExternalLink externalLink) {
+ return CommonResult.success(externalLinkService.save(externalLink));
+ }
+
+ @ApiOperation("澶栭儴閾炬帴鎺ュ彛绠＄悊-淇敼")
+ @PutMapping("/externalLink/update")
+ public CommonResult updateExternalLink(@RequestBody ExternalLink externalLink) {
+ return CommonResult.success(externalLinkService.updateById(externalLink));
+ }
+
+ @ApiOperation("澶栭儴閾炬帴鎺ュ彛绠＄悊-鏌ヨ")
+ @GetMapping("/externalLink/search")
+ public CommonResult searchExternalLink() {
+ return CommonResult.success(externalLinkService.list(new QueryWrapper<>()));
+ }
+
+ @ApiOperation("澶栭儴閾炬帴鎺ュ彛绠＄悊-鍒犻櫎")
+ @DeleteMapping("/externalLink/delete")
+ public CommonResult removeExternalLink(@RequestParam Long id) {
+ return CommonResult.success(externalLinkService.removeById(id));
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0