From da52a1ba7e8fc2d8e633655484e7ff4abed319c8 Mon Sep 17 00:00:00 2001
From: 安瑾然 <107107765@qq.com>
Date: 星期二, 12 七月 2022 09:28:42 +0800
Subject: [PATCH] commit
---
src/main/java/com/example/jz/controller/AnnouncementController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/AnnouncementController.java b/src/main/java/com/example/jz/controller/AnnouncementController.java
index 8de6c43..4c09abe 100644
--- a/src/main/java/com/example/jz/controller/AnnouncementController.java
+++ b/src/main/java/com/example/jz/controller/AnnouncementController.java
@@ -2,11 +2,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
-import com.baomidou.mybatisplus.extension.api.R;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.example.jz.modle.entity.Announcement;
+import com.example.jz.modle.entity.R;
import com.example.jz.service.AnnouncementService;
-import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -36,8 +35,8 @@
* @return 鎵�鏈夋暟鎹�
*/
@GetMapping
- public ResponseEntity<Page<Announcement>> selectAll(Page<Announcement> page, Announcement announcement) {
- return ResponseEntity.ok(this.announcementService.page(page, new QueryWrapper<>(announcement)));
+ public R<Page<Announcement>> selectAll(Page<Announcement> page, Announcement announcement) {
+ return R.ok(this.announcementService.page(page, new QueryWrapper<>(announcement)));
}
/**
@@ -48,7 +47,7 @@
*/
@GetMapping("{id}")
public R selectOne(@PathVariable Serializable id) {
- return success(this.announcementService.getById(id));
+ return R.ok(this.announcementService.getById(id));
}
/**
@@ -59,7 +58,7 @@
*/
@PostMapping
public R insert(@RequestBody Announcement announcement) {
- return success(this.announcementService.save(announcement));
+ return R.ok(this.announcementService.save(announcement));
}
/**
@@ -70,7 +69,7 @@
*/
@PutMapping
public R update(@RequestBody Announcement announcement) {
- return success(this.announcementService.updateById(announcement));
+ return R.ok(this.announcementService.updateById(announcement));
}
/**
@@ -81,7 +80,7 @@
*/
@DeleteMapping
public R delete(@RequestParam("idList") List<Long> idList) {
- return success(this.announcementService.removeByIds(idList));
+ return R.ok(this.announcementService.removeByIds(idList));
}
}
--
Gitblit v1.8.0