From 5b04d19edea32888efa9ee4881395a21da348e3f Mon Sep 17 00:00:00 2001
From: 安瑾然 <107107765@qq.com>
Date: 星期四, 14 七月 2022 14:21:44 +0800
Subject: [PATCH] commit
---
src/main/java/com/example/jz/controller/AnnouncementController.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/AnnouncementController.java b/src/main/java/com/example/jz/controller/AnnouncementController.java
index 833c767..1a91dbb 100644
--- a/src/main/java/com/example/jz/controller/AnnouncementController.java
+++ b/src/main/java/com/example/jz/controller/AnnouncementController.java
@@ -1,12 +1,10 @@
package com.example.jz.controller;
-
-
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.R;
import com.example.jz.service.AnnouncementService;
import org.springframework.web.bind.annotation.*;
@@ -32,13 +30,13 @@
/**
* 鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�
*
- * @param page 鍒嗛〉瀵硅薄
+ * @param page 鍒嗛〉瀵硅薄
* @param announcement 鏌ヨ瀹炰綋
* @return 鎵�鏈夋暟鎹�
*/
@GetMapping
- public R selectAll(Page<Announcement> page, Announcement announcement) {
- return success(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)));
}
/**
@@ -49,7 +47,7 @@
*/
@GetMapping("{id}")
public R selectOne(@PathVariable Serializable id) {
- return success(this.announcementService.getById(id));
+ return R.ok(this.announcementService.getById(id));
}
/**
@@ -60,7 +58,7 @@
*/
@PostMapping
public R insert(@RequestBody Announcement announcement) {
- return success(this.announcementService.save(announcement));
+ return R.ok(this.announcementService.save(announcement));
}
/**
@@ -71,7 +69,7 @@
*/
@PutMapping
public R update(@RequestBody Announcement announcement) {
- return success(this.announcementService.updateById(announcement));
+ return R.ok(this.announcementService.updateById(announcement));
}
/**
@@ -82,7 +80,6 @@
*/
@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