commit

安瑾然

2022-07-12 fe55254e84cce4f92062f48fc4d1840dfdfdc02a

 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));
    }
}