From 5a5b01fa9824a42e3eb033088a20e24c32b30dda Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 17 八月 2024 16:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 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 ee4dcb9..06838a6 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,9 +1,17 @@
package com.ruoyi.other.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.other.api.domain.TNotice;
+import com.ruoyi.other.api.dto.NoticeQueryDto;
+import com.ruoyi.other.mapper.SysNoticeMapper;
+import com.ruoyi.other.service.TNoticeService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
/**
* <p>
@@ -16,6 +24,49 @@
@RestController
@RequestMapping("/t-notice")
public class TNoticeController {
+ @Resource
+ private TNoticeService noticeService;
+
+ @ApiOperation(tags = {"后台-内容设置-公告管理"},value = "新增修改")
+ @PostMapping(value = "/saveOrUpdate")
+ public AjaxResult saveOrUpdate(@RequestBody TNotice notice) {
+ noticeService.saveOrUpdate(notice);
+ return AjaxResult.success();
+ }
+
+ @ApiOperation(tags = {"后台-内容设置-公告管理"},value = "删除")
+ @PostMapping(value = "/deleteById/{id}")
+ public AjaxResult deleteById(@PathVariable Integer id) {
+ noticeService.removeById(id);
+ return AjaxResult.success();
+ }
+
+ @ApiOperation(tags = {"后台-内容设置-公告管理"},value = "查询")
+ @PostMapping(value = "/pageList")
+ public AjaxResult<Page<TNotice>> authPageList(@RequestBody NoticeQueryDto query) {
+ if (query.getStatus()==0){
+ return AjaxResult.success(noticeService.lambdaQuery()
+ .le(TNotice::getStartTime, LocalDateTime.now())
+ .like(query.getContent()!=null&&query.getContent()!="",TNotice::getContent,query.getContent())
+ .page(Page.of(query.getPageCurr(),query.getPageSize())));
+ }else if (query.getStatus()==1){
+ return AjaxResult.success(noticeService.lambdaQuery()
+ .ge(TNotice::getStartTime, LocalDateTime.now()).le(TNotice::getEndTime,LocalDateTime.now())
+ .like(query.getContent()!=null&&query.getContent()!="",TNotice::getContent,query.getContent())
+ .page(Page.of(query.getPageCurr(),query.getPageSize())));
+ }else if (query.getStatus()==2){
+ return AjaxResult.success(noticeService.lambdaQuery()
+ .ge(TNotice::getEndTime, LocalDateTime.now())
+ .like(query.getContent()!=null&&query.getContent()!="",TNotice::getContent,query.getContent())
+ .page(Page.of(query.getPageCurr(),query.getPageSize())));
+ }else{
+ return AjaxResult.success(noticeService.lambdaQuery()
+ .like(query.getContent()!=null&&query.getContent()!="",TNotice::getContent,query.getContent())
+ .page(Page.of(query.getPageCurr(),query.getPageSize())));
+ }
+
+
+ }
}
--
Gitblit v1.7.1