From 4cb8e239ae86c525c2087eaef8b8381c6b6663de Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 13 六月 2022 17:31:45 +0800
Subject: [PATCH] !186 fix: 修复用户注销时，没有记录注销日志 Merge pull request !186 from 沫离/dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 9414e5d..6febd3e 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
@@ -3,17 +3,18 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
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.R;
+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;
import com.ruoyi.system.service.ISysNoticeService;
-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;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
/**
* 鍏憡 淇℃伅鎿嶄綔澶勭悊
@@ -22,7 +23,7 @@
*/
@Validated
@Api(value = "鍏憡淇℃伅鎺у埗鍣�", tags = {"鍏憡淇℃伅绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/notice")
public class SysNoticeController extends BaseController {
@@ -35,8 +36,8 @@
@ApiOperation("鑾峰彇閫氱煡鍏憡鍒楄〃")
@SaCheckPermission("system:notice:list")
@GetMapping("/list")
- public TableDataInfo<SysNotice> list(SysNotice notice) {
- return noticeService.selectPageNoticeList(notice);
+ public TableDataInfo<SysNotice> list(SysNotice notice, PageQuery pageQuery) {
+ return noticeService.selectPageNoticeList(notice, pageQuery);
}
/**
@@ -45,8 +46,8 @@
@ApiOperation("鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅")
@SaCheckPermission("system:notice:query")
@GetMapping(value = "/{noticeId}")
- public AjaxResult<SysNotice> getInfo(@PathVariable Long noticeId) {
- return AjaxResult.success(noticeService.selectNoticeById(noticeId));
+ public R<SysNotice> getInfo(@ApiParam("鍏憡ID") @PathVariable Long noticeId) {
+ return R.ok(noticeService.selectNoticeById(noticeId));
}
/**
@@ -56,7 +57,7 @@
@SaCheckPermission("system:notice:add")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult<Void> add(@Validated @RequestBody SysNotice notice) {
+ public R<Void> add(@Validated @RequestBody SysNotice notice) {
return toAjax(noticeService.insertNotice(notice));
}
@@ -67,7 +68,7 @@
@SaCheckPermission("system:notice:edit")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult<Void> edit(@Validated @RequestBody SysNotice notice) {
+ public R<Void> edit(@Validated @RequestBody SysNotice notice) {
return toAjax(noticeService.updateNotice(notice));
}
@@ -78,7 +79,7 @@
@SaCheckPermission("system:notice:remove")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.DELETE)
@DeleteMapping("/{noticeIds}")
- public AjaxResult<Void> remove(@PathVariable Long[] noticeIds) {
+ public R<Void> remove(@ApiParam("鍏憡ID涓�") @PathVariable Long[] noticeIds) {
return toAjax(noticeService.deleteNoticeByIds(noticeIds));
}
}
--
Gitblit v1.9.3