From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java | 69 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 21 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java
index 5ee4a5c..d5fad78 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java
@@ -1,14 +1,17 @@
package com.sandu.ximon.admin.controller;
-import com.github.pagehelper.PageHelper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.domain.ResponseVO;
-import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.BannerDto;
-import com.sandu.ximon.admin.dto.BannerPositionDto;
import com.sandu.ximon.admin.param.BannerParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
+import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.BannerService;
+import com.sandu.ximon.admin.service.ClientService;
import com.sandu.ximon.dao.domain.Banner;
+import com.sandu.ximon.dao.domain.Client;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -24,53 +27,77 @@
public class BannerController {
private final BannerService contentBannerService;
+ private final ClientService clientService;
+ private PermissionConfig permissionConfig;
@PostMapping("/addbanner")
public ResponseVO<Object> addBanner(@Validated @RequestBody BannerParam bannerParam) {
- boolean result = contentBannerService.addBanner(bannerParam);
+ if (!permissionConfig.check(MenuEnum.BANNER_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ Client client = clientService.getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, bannerParam.getBinding_author()));
+
+ boolean result = contentBannerService.addBanner(bannerParam, client);
if (result) {
- return ResponseUtil.success(null);
+ return ResponseUtil.success("娣诲姞鎴愬姛");
} else {
return ResponseUtil.fail("娣诲姞澶辫触");
}
}
- @GetMapping("/category")
- public ResponseVO<Object> listPosition() {
- List<BannerPositionDto> bannerPositionDtos = contentBannerService.listPosition();
- return ResponseUtil.success(bannerPositionDtos);
- }
+// @GetMapping("/category")
+// public ResponseVO<Object> listPosition() {
+// List<BannerPositionDto> bannerPositionDtos = contentBannerService.listPosition();
+// return ResponseUtil.success(bannerPositionDtos);
+// }
- @PostMapping("{bannerId}")
+ @PostMapping("/{bannerId}")
public ResponseVO<Object> updateBanner(@PathVariable Long bannerId, @Validated @RequestBody BannerParam bannerParam) {
- boolean result = contentBannerService.updateBanner(bannerId,bannerParam);
+ if (!permissionConfig.check(MenuEnum.BANNER_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ boolean result = contentBannerService.updateBanner(bannerId, bannerParam);
if (result) {
- return ResponseUtil.success(null);
+ return ResponseUtil.success("鏇存柊鎴愬姛");
} else {
- return ResponseUtil.fail("娣诲姞澶辫触");
+ return ResponseUtil.fail("鏇存柊澶辫触");
}
}
- @GetMapping("{bannerId}")
+ //鍓嶇骞舵湭璋冪敤
+ @GetMapping("/{bannerId}")
public ResponseVO<Object> detailBanner(@PathVariable Long bannerId) {
+ if (!permissionConfig.check(MenuEnum.BANNER_DETAIL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
BannerDto result = contentBannerService.detailBanner(bannerId);
return ResponseUtil.success(result);
}
@GetMapping
- public ResponseVO<Object> listMainBanner(BaseConditionVO conditionVO) {
- PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize());
- List<Banner> list = contentBannerService.listBanner();
- return ResponseUtil.successPage(list);
+ public ResponseVO<Object> listMainBanner() {
+ if (!permissionConfig.check(MenuEnum.BANNER.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ if (SecurityUtils.getClientId() != null) {
+ List<Banner> list = contentBannerService.listBanner();
+ return ResponseUtil.success(list);
+ } else {
+ return ResponseUtil.success(contentBannerService.list());
+ }
+
}
@PostMapping("/delete/{bannerId}")
public ResponseVO<Object> deleteBanner(@PathVariable Long bannerId) {
+ if (!permissionConfig.check(MenuEnum.BANNER_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = contentBannerService.deleteBanner(bannerId);
if (result) {
- return ResponseUtil.success(null);
+ return ResponseUtil.success("鍒犻櫎鎴愬姛");
} else {
- return ResponseUtil.fail("鎿嶄綔澶辫触");
+ return ResponseUtil.fail("鍒犻櫎澶辫触");
}
}
--
Gitblit v1.9.3