From bc91619c854cc2dbb01b20d0c47d76c4881e9ee8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:52:21 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0.1' into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/BannerController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/BannerController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/BannerController.java
index 1881471..0ea689a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/BannerController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/BannerController.java
@@ -1,9 +1,11 @@
package com.panzhihua.sangeshenbian.api;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.sangeshenbian.annotation.SysLog;
import com.panzhihua.sangeshenbian.model.entity.Banner;
import com.panzhihua.sangeshenbian.model.entity.SystemUser;
import com.panzhihua.sangeshenbian.service.IBannerService;
@@ -49,12 +51,12 @@
@PostMapping("/add")
@ApiOperation(value = "添加banner", tags = {"三个身边后台-banner管理"})
- @OperLog(operModul = "三个身边后台",operType = 1, businessType = "添加banner")
+ @SysLog(operatorCategory = "添加banner",operId = 7)
public R<Banner> add(@RequestBody Banner banner){
Integer id = this.getLoginUserInfoSanGeShenBian().getId();
SystemUser systemUser = systemUserService.getById(id);
if(systemUser.getAccountLevel() != 1){
- return R.fail("添加失败");
+ return R.fail("添加失败，权限不足。");
}
banner.setDel(0);
banner.setCreateTime(LocalDateTime.now());
@@ -65,12 +67,12 @@
@PostMapping("/edit")
@ApiOperation(value = "编辑banner", tags = {"三个身边后台-banner管理"})
- @OperLog(operModul = "三个身边后台",operType = 2, businessType = "编辑banner")
+ @SysLog(operatorCategory = "编辑banner",operId = 7)
public R<Banner> edit(@RequestBody Banner banner){
Integer id = this.getLoginUserInfoSanGeShenBian().getId();
SystemUser systemUser = systemUserService.getById(id);
if(systemUser.getAccountLevel() != 1){
- return R.fail("编辑失败");
+ return R.fail("编辑失败，权限不足。");
}
bannerService.updateById(banner);
return R.ok(banner);
@@ -79,18 +81,16 @@
@DeleteMapping("/delete/{id}")
@ApiOperation(value = "删除banner", tags = {"三个身边后台-banner管理"})
- @OperLog(operModul = "三个身边后台",operType = 3, businessType = "删除banner")
+ @SysLog(operatorCategory = "删除banner",operId = 7)
public R delete(@PathVariable("id") Integer id){
Integer id1 = this.getLoginUserInfoSanGeShenBian().getId();
SystemUser systemUser = systemUserService.getById(id1);
if(systemUser.getAccountLevel() != 1){
- return R.fail("删除失败");
+ return R.fail("删除失败，权限不足。");
}
- Banner banner = new Banner();
- banner.setId(id);
- banner.setDel(1);
- bannerService.updateById(banner);
- return R.ok();
+ String name = bannerService.getById(id).getName();
+ bannerService.update(new UpdateWrapper<Banner>().eq("id", id).set("del", 1));
+ return R.ok(name);
}
@GetMapping("/getBannerInfo/{id}")
--
Gitblit v1.7.1