From bca05a77fd9fe432382b03e3b1da1c5d8ba5ff8f Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 四月 2022 11:52:32 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 58b8d31..5d24770 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,13 +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.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.*;
@@ -23,10 +27,15 @@
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);
+ 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("娣诲姞鎴愬姛");
} else {
@@ -42,7 +51,7 @@
@PostMapping("/{bannerId}")
public ResponseVO<Object> updateBanner(@PathVariable Long bannerId, @Validated @RequestBody BannerParam bannerParam) {
- boolean result = contentBannerService.updateBanner(bannerId,bannerParam);
+ boolean result = contentBannerService.updateBanner(bannerId, bannerParam);
if (result) {
return ResponseUtil.success("鏇存柊鎴愬姛");
} else {
@@ -58,8 +67,16 @@
@GetMapping
public ResponseVO<Object> listMainBanner() {
- List<Banner> list = contentBannerService.listBanner();
- return ResponseUtil.success(list);
+ 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}")
--
Gitblit v1.9.3