From 35f6bd0e69018621c2293b96ddcde55b2bc58d36 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 30 九月 2022 16:31:23 +0800
Subject: [PATCH] 结案 暂不处理 我的待办 功能实现
---
ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 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..d8a7d90 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,14 +1,15 @@
package com.ycl.controller.portal;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.entity.portal.ThirdApplications;
+import com.ycl.entity.portal.WebsiteLogo;
+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.UmsMenuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
@@ -33,26 +34,26 @@
@ApiOperation("logo绠＄悊-娣诲姞logo")
@PostMapping("/logo/add")
- public CommonResult addLogo(@RequestBody @Validated UmsWebsiteLogo umsWebsiteLogo) {
- return CommonResult.success(umsWebsiteLogoService.save(umsWebsiteLogo));
+ 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));
+ 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")
@@ -63,15 +64,16 @@
@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 +97,14 @@
item.setMenuVoArrayList(secondMenuListVos);
});
}
- return CommonResult.success(umsMenuVoList);
+ menus.setRecords(umsMenuVoList);
+ return CommonResult.success(menus);
}
@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 +115,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("绗笁鏂规帴鍙ｇ鐞�-鍒犻櫎")
--
Gitblit v1.8.0