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 |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 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 de7171d..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
@@ -1,8 +1,14 @@
 package com.ruoyi.other.controller;
 
 
+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;
@@ -11,7 +17,9 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -26,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) {
@@ -44,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) {
@@ -79,6 +95,16 @@
 
 
     }
+    
+    
+    @ApiOperation(tags = {"小程序-首页-公告管理"},value = "查询")
+    @GetMapping(value = "/list")
+    public AjaxResult<List<TNotice>> list() {
+        return AjaxResult.success(noticeService.list(Wrappers.lambdaQuery(TNotice.class)
+                .le(TNotice::getStartTime, LocalDate.now())
+                .ge(TNotice::getEndTime,LocalDate.now())));
+
+    }
 
 }
 

--
Gitblit v1.7.1