From af6a08398e2bc22f3c8a3a615cbd9e23190be906 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 12 五月 2022 10:55:44 +0800
Subject: [PATCH] update 优化 文件与图片上传组件 使用id存储回显
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 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 dafd666..060e980 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,21 @@
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.R;
+import com.ruoyi.common.core.domain.PageQuery;
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 io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -29,7 +30,7 @@
*/
@Validated
@Api(value = "鏁版嵁瀛楀吀淇℃伅鎺у埗鍣�", tags = {"鏁版嵁瀛楀吀淇℃伅绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/dict/data")
public class SysDictDataController extends BaseController {
@@ -40,14 +41,14 @@
@ApiOperation("鏌ヨ瀛楀吀鏁版嵁鍒楄〃")
@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)
@SaCheckPermission("system:dict:export")
- @GetMapping("/export")
+ @PostMapping("/export")
public void export(SysDictData dictData, HttpServletResponse response) {
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
ExcelUtil.exportExcel(list, "瀛楀吀鏁版嵁", SysDictData.class, response);
@@ -59,8 +60,8 @@
@ApiOperation("鏌ヨ瀛楀吀鏁版嵁璇︾粏")
@SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictCode}")
- public AjaxResult<SysDictData> getInfo(@PathVariable Long dictCode) {
- return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
+ public R<SysDictData> getInfo(@ApiParam("瀛楀吀code") @PathVariable Long dictCode) {
+ return R.ok(dictDataService.selectDictDataById(dictCode));
}
/**
@@ -68,12 +69,12 @@
*/
@ApiOperation("鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅")
@GetMapping(value = "/type/{dictType}")
- public AjaxResult<List<SysDictData>> dictType(@PathVariable String dictType) {
+ public R<List<SysDictData>> dictType(@ApiParam("瀛楀吀绫诲瀷") @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);
}
/**
@@ -83,7 +84,7 @@
@SaCheckPermission("system:dict:add")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult<Void> add(@Validated @RequestBody SysDictData dict) {
+ public R<Void> add(@Validated @RequestBody SysDictData dict) {
return toAjax(dictDataService.insertDictData(dict));
}
@@ -94,7 +95,7 @@
@SaCheckPermission("system:dict:edit")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult<Void> edit(@Validated @RequestBody SysDictData dict) {
+ public R<Void> edit(@Validated @RequestBody SysDictData dict) {
return toAjax(dictDataService.updateDictData(dict));
}
@@ -105,8 +106,8 @@
@SaCheckPermission("system:dict:remove")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictCodes}")
- public AjaxResult<Void> remove(@PathVariable Long[] dictCodes) {
+ public R<Void> remove(@ApiParam("瀛楀吀code涓�") @PathVariable Long[] dictCodes) {
dictDataService.deleteDictDataByIds(dictCodes);
- return success();
+ return R.ok();
}
}
--
Gitblit v1.9.3