From 67d06a785d5fc4524639ace27651c01ff05a4b58 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期四, 29 五月 2025 22:31:33 +0800 Subject: [PATCH] 修改bug --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java index 06ecd0f..9000e6e 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java @@ -4,6 +4,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.log.enums.OperatorType; +import com.ruoyi.common.security.annotation.Logical; +import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.other.api.domain.TNotice; import com.ruoyi.other.api.dto.NoticeQueryDto; import com.ruoyi.other.mapper.SysNoticeMapper; @@ -12,6 +17,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; @@ -28,16 +34,22 @@ public class TNoticeController { @Resource private TNoticeService noticeService; - + + + @RequiresPermissions(value = {"/publicAnnouncementManagement/add", "/publicAnnouncementManagement/update"}, logical = Logical.OR) @ApiOperation(tags = {"后台-内容设置-公告管理"},value = "新增修改") @PostMapping(value = "/saveOrUpdate") + @Log(title = "【公告管理】新增修改公告", businessType = BusinessType.INSERT) public AjaxResult saveOrUpdate(@RequestBody TNotice notice) { noticeService.saveOrUpdate(notice); return AjaxResult.success(); } - + + + @RequiresPermissions(value = {"/publicAnnouncementManagement/del"}, logical = Logical.OR) @ApiOperation(tags = {"后台-内容设置-公告管理"},value = "删除") @DeleteMapping(value = "/deleteById") + @Log(title = "【公告管理】删除公告", businessType = BusinessType.DELETE) public AjaxResult deleteById(String ids) { String[] split = ids.split(","); for (String id : split) { @@ -46,7 +58,9 @@ return AjaxResult.success(); } - + + + @RequiresPermissions(value = {"/publicAnnouncementManagement"}, logical = Logical.OR) @ApiOperation(tags = {"后台-内容设置-公告管理"},value = "查询") @PostMapping(value = "/pageList") public AjaxResult<Page<TNotice>> authPageList(@RequestBody NoticeQueryDto query) { @@ -81,13 +95,14 @@ } - + + @ApiOperation(tags = {"小程序-首页-公告管理"},value = "查询") @GetMapping(value = "/list") public AjaxResult<List<TNotice>> list() { return AjaxResult.success(noticeService.list(Wrappers.lambdaQuery(TNotice.class) - .ge(TNotice::getStartTime, LocalDateTime.now()) - .le(TNotice::getEndTime,LocalDateTime.now()))); + .le(TNotice::getStartTime, LocalDate.now()) + .ge(TNotice::getEndTime,LocalDate.now()))); } -- Gitblit v1.7.1