From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java b/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java
index e3ac566..2749dcf 100644
--- a/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java
+++ b/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java
@@ -8,7 +8,8 @@
import com.ruoyi.approve.pojo.NotificationManagement;
import com.ruoyi.approve.pojo.OnlineMeeting;
import com.ruoyi.approve.service.NotificationManagementService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -18,47 +19,44 @@
@RestController
@RequestMapping("/notificationManagement")
@AllArgsConstructor
-public class NotificationManagementController {
- @Autowired
+public class NotificationManagementController extends BaseController {
private NotificationManagementService notificationManagementService ;
- @Autowired
private OnlineMeetingMapper onlineMeetingMapper;
- @Autowired
private FileSharingMapper fileSharingMapper;
/**銆�
* 鑾峰彇鍒楄〃
* @return
*/
@GetMapping("/getList")
- public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
+ public R<?> getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, NotificationManagement notificationManagement) {
Page page = new Page(current, size);
- return AjaxResult.success(notificationManagementService.listpage(page,notificationManagement));
+ return R.ok(notificationManagementService.listpage(page,notificationManagement));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody NotificationManagement notificationManagement){
- return AjaxResult.success(notificationManagementService.save(notificationManagement));
+ public R<?> add(@RequestBody NotificationManagement notificationManagement){
+ return R.ok(notificationManagementService.save(notificationManagement));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody NotificationManagement notificationManagement){
- return AjaxResult.success(notificationManagementService.updateById(notificationManagement));
+ public R<?> update(@RequestBody NotificationManagement notificationManagement){
+ return R.ok(notificationManagementService.updateById(notificationManagement));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public AjaxResult delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(notificationManagementService.removeByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(notificationManagementService.removeByIds(ids));
}
/**
*鏂板浼氳
@@ -66,16 +64,16 @@
* @return
*/
@PostMapping("/addOnlineMeeting")
- public AjaxResult addOnlineMeeting(@RequestBody OnlineMeeting onlineMeeting){
- return AjaxResult.success(onlineMeetingMapper.insert(onlineMeeting));
+ public R<?> addOnlineMeeting(@RequestBody OnlineMeeting onlineMeeting){
+ return R.ok(onlineMeetingMapper.insert(onlineMeeting));
}
/**
*鏂板鏂囦欢鍏变韩
*
*/
@PostMapping("/addFileSharing")
- public AjaxResult addFileSharing(@RequestBody FileSharing fileSharing){
- return AjaxResult.success(fileSharingMapper.insert(fileSharing));
+ public R<?> addFileSharing(@RequestBody FileSharing fileSharing){
+ return R.ok(fileSharingMapper.insert(fileSharing));
}
}
--
Gitblit v1.9.3