From 6ca853516671882e8e54d9630a4299f12fbcf9aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:14:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
index 58fa908..23e8593 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.SysNotice;
@@ -11,69 +12,75 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
/**
* 鍏憡 淇℃伅鎿嶄綔澶勭悊
*
- * @author ruoyi
+ * @author Lion Li
*/
+@Validated
+@Api(value = "鍏憡淇℃伅鎺у埗鍣�", tags = {"鍏憡淇℃伅绠＄悊"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/system/notice")
-public class SysNoticeController extends BaseController
-{
- @Autowired
- private ISysNoticeService noticeService;
+public class SysNoticeController extends BaseController {
+
+ private final ISysNoticeService noticeService;
/**
* 鑾峰彇閫氱煡鍏憡鍒楄〃
*/
+ @ApiOperation("鑾峰彇閫氱煡鍏憡鍒楄〃")
@SaCheckPermission("system:notice:list")
@GetMapping("/list")
- public TableDataInfo list(SysNotice notice)
- {
- return noticeService.selectPageNoticeList(notice);
+ public TableDataInfo<SysNotice> list(SysNotice notice, PageQuery pageQuery) {
+ return noticeService.selectPageNoticeList(notice, pageQuery);
}
/**
* 鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅
*/
+ @ApiOperation("鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅")
@SaCheckPermission("system:notice:query")
@GetMapping(value = "/{noticeId}")
- public AjaxResult getInfo(@PathVariable Long noticeId)
- {
+ public AjaxResult<SysNotice> getInfo(@ApiParam("鍏憡ID") @PathVariable Long noticeId) {
return AjaxResult.success(noticeService.selectNoticeById(noticeId));
}
/**
* 鏂板閫氱煡鍏憡
*/
+ @ApiOperation("鏂板閫氱煡鍏憡")
@SaCheckPermission("system:notice:add")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@Validated @RequestBody SysNotice notice)
- {
+ public AjaxResult<Void> add(@Validated @RequestBody SysNotice notice) {
return toAjax(noticeService.insertNotice(notice));
}
/**
* 淇敼閫氱煡鍏憡
*/
+ @ApiOperation("淇敼閫氱煡鍏憡")
@SaCheckPermission("system:notice:edit")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@Validated @RequestBody SysNotice notice)
- {
+ public AjaxResult<Void> edit(@Validated @RequestBody SysNotice notice) {
return toAjax(noticeService.updateNotice(notice));
}
/**
* 鍒犻櫎閫氱煡鍏憡
*/
+ @ApiOperation("鍒犻櫎閫氱煡鍏憡")
@SaCheckPermission("system:notice:remove")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.DELETE)
@DeleteMapping("/{noticeIds}")
- public AjaxResult remove(@PathVariable Long[] noticeIds)
- {
+ public AjaxResult<Void> remove(@ApiParam("鍏憡ID涓�") @PathVariable Long[] noticeIds) {
return toAjax(noticeService.deleteNoticeByIds(noticeIds));
}
}
--
Gitblit v1.9.3