From f5ee8e7afb178179c1d1d078cf42fe33dc7607f9 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 20 五月 2026 16:02:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
index 8fe67d0..e3ef9b6 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
@@ -9,10 +9,10 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.project.system.service.ISysNoticeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,7 @@
@RestController
@AllArgsConstructor
-@Api(tags = "閫氱煡鍏憡")
+@Tag(name = "閫氱煡鍏憡")
@RequestMapping("/collaborativeApproval/notice")
public class NoticeController extends BaseController {
@@ -31,28 +31,28 @@
@GetMapping("/page")
@Log(title = "鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation("鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, NoticeDTO noticeDTO){
- return AjaxResult.success(noticeService.listPage(page, noticeDTO));
+ @Operation(summary = "鍒嗛〉鏌ヨ")
+ public R<?> listPage(Page page, NoticeDTO noticeDTO){
+ return R.ok(noticeService.listPage(page, noticeDTO));
}
@PostMapping("/add")
@Log(title = "鏂板", businessType = BusinessType.INSERT)
- @ApiOperation("鏂板")
- public AjaxResult add(@RequestBody NoticeDTO noticeDTO){
+ @Operation(summary = "鏂板")
+ public R<?> add(@RequestBody NoticeDTO noticeDTO){
if (noticeDTO.getStatus()==1){
//姝ｅ紡鍙戝竷閫氱煡鎵�鏈変汉鐨勬秷鎭�氱煡
sysNoticeService.simpleNoticeAll("閫氱煡鍏憡",
noticeDTO.getTitle(),
"/collaborativeApproval/noticeManagement?type="+noticeDTO.getType());
}
- return AjaxResult.success(noticeService.save(noticeDTO));
+ return R.ok(noticeService.save(noticeDTO));
}
@PutMapping("/update")
@Log(title = "淇敼", businessType = BusinessType.UPDATE)
- @ApiOperation("淇敼")
- public AjaxResult update(@RequestBody NoticeDTO noticeDTO){
+ @Operation(summary = "淇敼")
+ public R<?> update(@RequestBody NoticeDTO noticeDTO){
if (ObjectUtils.isNotNull(noticeDTO.getStatus()) && noticeDTO.getStatus()==1){
Notice notice = noticeService.getById(noticeDTO.getId());
//姝ｅ紡鍙戝竷閫氱煡鎵�鏈変汉鐨勬秷鎭�氱煡
@@ -60,23 +60,23 @@
notice.getTitle(),
"/collaborativeApproval/noticeManagement?type="+notice.getType());
}
- return AjaxResult.success(noticeService.updateById(noticeDTO));
+ return R.ok(noticeService.updateById(noticeDTO));
}
@DeleteMapping("/{ids}")
@Log(title = "鍒犻櫎", businessType = BusinessType.DELETE)
- @ApiOperation("鍒犻櫎")
- public AjaxResult delete(@PathVariable("ids") List<Long> ids){
+ @Operation(summary = "鍒犻櫎")
+ public R<?> delete(@PathVariable("ids") List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return AjaxResult.success(noticeService.removeBatchByIds(ids));
+ return R.ok(noticeService.removeBatchByIds(ids));
}
@GetMapping("/count")
@Log(title = "鑾峰彇鍏憡鏁伴噺", businessType = BusinessType.OTHER)
- @ApiOperation("鑾峰彇鍏憡鏁伴噺")
- public AjaxResult count(){
- return AjaxResult.success(noticeService.selectCount());
+ @Operation(summary = "鑾峰彇鍏憡鏁伴噺")
+ public R<?> count(){
+ return R.ok(noticeService.selectCount());
}
}
--
Gitblit v1.9.3