From 1f42bd3d22c104aaa2d780c20a555b5e467858bf Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期一, 07 十一月 2022 22:10:52 +0800
Subject: [PATCH] !245 数据源由 Druid 修改为 Hikari * update 更新 dataSource 数据源, 由 druid 修改为 hikari, 更新相关配置 ;
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 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 c288347..54b30d6 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
@@ -1,17 +1,15 @@
package com.ruoyi.web.controller.system;
+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.PageQuery;
+import com.ruoyi.common.core.domain.R;
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 io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -21,8 +19,7 @@
* @author Lion Li
*/
@Validated
-@Api(value = "鍏憡淇℃伅鎺у埗鍣�", tags = {"鍏憡淇℃伅绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/notice")
public class SysNoticeController extends BaseController {
@@ -32,55 +29,52 @@
/**
* 鑾峰彇閫氱煡鍏憡鍒楄〃
*/
- @ApiOperation("鑾峰彇閫氱煡鍏憡鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:notice:list')")
+ @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);
}
/**
* 鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅
+ *
+ * @param noticeId 鍏憡ID
*/
- @ApiOperation("鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:notice:query')")
+ @SaCheckPermission("system:notice:query")
@GetMapping(value = "/{noticeId}")
- public AjaxResult<SysNotice> getInfo(@PathVariable Long noticeId) {
- return AjaxResult.success(noticeService.selectNoticeById(noticeId));
+ public R<SysNotice> getInfo(@PathVariable Long noticeId) {
+ return R.ok(noticeService.selectNoticeById(noticeId));
}
/**
* 鏂板閫氱煡鍏憡
*/
- @ApiOperation("鏂板閫氱煡鍏憡")
- @PreAuthorize("@ss.hasPermi('system:notice:add')")
+ @SaCheckPermission("system:notice:add")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult<Void> add(@Validated @RequestBody SysNotice notice) {
- notice.setCreateBy(getUsername());
+ public R<Void> add(@Validated @RequestBody SysNotice notice) {
return toAjax(noticeService.insertNotice(notice));
}
/**
* 淇敼閫氱煡鍏憡
*/
- @ApiOperation("淇敼閫氱煡鍏憡")
- @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+ @SaCheckPermission("system:notice:edit")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult<Void> edit(@Validated @RequestBody SysNotice notice) {
- notice.setUpdateBy(getUsername());
+ public R<Void> edit(@Validated @RequestBody SysNotice notice) {
return toAjax(noticeService.updateNotice(notice));
}
/**
* 鍒犻櫎閫氱煡鍏憡
+ *
+ * @param noticeIds 鍏憡ID涓�
*/
- @ApiOperation("鍒犻櫎閫氱煡鍏憡")
- @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+ @SaCheckPermission("system:notice:remove")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.DELETE)
@DeleteMapping("/{noticeIds}")
- public AjaxResult<Void> remove(@PathVariable Long[] noticeIds) {
+ public R<Void> remove(@PathVariable Long[] noticeIds) {
return toAjax(noticeService.deleteNoticeByIds(noticeIds));
}
}
--
Gitblit v1.9.3