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/SysDictDataController.java | 76 +++++++++++++++++++------------------
1 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
index fca1a20..01613db 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@@ -1,20 +1,18 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
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.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysDictTypeService;
-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.*;
@@ -28,8 +26,7 @@
* @author Lion Li
*/
@Validated
-@Api(value = "鏁版嵁瀛楀吀淇℃伅鎺у埗鍣�", tags = {"鏁版嵁瀛楀吀淇℃伅绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/dict/data")
public class SysDictDataController extends BaseController {
@@ -37,17 +34,21 @@
private final ISysDictDataService dictDataService;
private final ISysDictTypeService dictTypeService;
- @ApiOperation("鏌ヨ瀛楀吀鏁版嵁鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:dict:list')")
+ /**
+ * 鏌ヨ瀛楀吀鏁版嵁鍒楄〃
+ */
+ @SaCheckPermission("system:dict:list")
@GetMapping("/list")
- public TableDataInfo<SysDictData> list(SysDictData dictData) {
- return dictDataService.selectPageDictDataList(dictData);
+ public TableDataInfo<SysDictData> list(SysDictData dictData, PageQuery pageQuery) {
+ return dictDataService.selectPageDictDataList(dictData, pageQuery);
}
- @ApiOperation("瀵煎嚭瀛楀吀鏁版嵁鍒楄〃")
+ /**
+ * 瀵煎嚭瀛楀吀鏁版嵁鍒楄〃
+ */
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:dict:export')")
- @GetMapping("/export")
+ @SaCheckPermission("system:dict:export")
+ @PostMapping("/export")
public void export(SysDictData dictData, HttpServletResponse response) {
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
ExcelUtil.exportExcel(list, "瀛楀吀鏁版嵁", SysDictData.class, response);
@@ -55,60 +56,61 @@
/**
* 鏌ヨ瀛楀吀鏁版嵁璇︾粏
+ *
+ * @param dictCode 瀛楀吀code
*/
- @ApiOperation("鏌ヨ瀛楀吀鏁版嵁璇︾粏")
- @PreAuthorize("@ss.hasPermi('system:dict:query')")
+ @SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictCode}")
- public AjaxResult<SysDictData> getInfo(@PathVariable Long dictCode) {
- return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
+ public R<SysDictData> getInfo(@PathVariable Long dictCode) {
+ return R.ok(dictDataService.selectDictDataById(dictCode));
}
/**
* 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅
+ *
+ * @param dictType 瀛楀吀绫诲瀷
*/
- @ApiOperation("鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅")
@GetMapping(value = "/type/{dictType}")
- public AjaxResult<List<SysDictData>> dictType(@PathVariable String dictType) {
+ public R<List<SysDictData>> dictType(@PathVariable String dictType) {
List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
- if (StringUtils.isNull(data)) {
+ if (ObjectUtil.isNull(data)) {
data = new ArrayList<>();
}
- return AjaxResult.success(data);
+ return R.ok(data);
}
/**
* 鏂板瀛楀吀绫诲瀷
*/
- @ApiOperation("鏂板瀛楀吀绫诲瀷")
- @PreAuthorize("@ss.hasPermi('system:dict:add')")
+ @SaCheckPermission("system:dict:add")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult<Void> add(@Validated @RequestBody SysDictData dict) {
- dict.setCreateBy(getUsername());
- return toAjax(dictDataService.insertDictData(dict));
+ public R<Void> add(@Validated @RequestBody SysDictData dict) {
+ dictDataService.insertDictData(dict);
+ return R.ok();
}
/**
* 淇敼淇濆瓨瀛楀吀绫诲瀷
*/
- @ApiOperation("淇敼淇濆瓨瀛楀吀绫诲瀷")
- @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+ @SaCheckPermission("system:dict:edit")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult<Void> edit(@Validated @RequestBody SysDictData dict) {
- dict.setUpdateBy(getUsername());
- return toAjax(dictDataService.updateDictData(dict));
+ public R<Void> edit(@Validated @RequestBody SysDictData dict) {
+ dictDataService.updateDictData(dict);
+ return R.ok();
}
/**
* 鍒犻櫎瀛楀吀绫诲瀷
+ *
+ * @param dictCodes 瀛楀吀code涓�
*/
- @ApiOperation("鍒犻櫎瀛楀吀绫诲瀷")
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+ @SaCheckPermission("system:dict:remove")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictCodes}")
- public AjaxResult<Void> remove(@PathVariable Long[] dictCodes) {
+ public R<Void> remove(@PathVariable Long[] dictCodes) {
dictDataService.deleteDictDataByIds(dictCodes);
- return success();
+ return R.ok();
}
}
--
Gitblit v1.9.3