From 9d7e32fb073842eb9d346878b49ce5bacfa3b51c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 25 六月 2022 09:39:39 +0800
Subject: [PATCH] 新增缓存列表菜单功能
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 58cf43d..eea89fd 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,6 +1,8 @@
package com.ruoyi.web.controller.system;
+import java.util.ArrayList;
import java.util.List;
+import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -18,7 +20,7 @@
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.SecurityUtils;
+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;
@@ -49,12 +51,12 @@
@Log(title = "字典数据", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:dict:export')")
- @GetMapping("/export")
- public AjaxResult export(SysDictData dictData)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysDictData dictData)
{
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
- return util.exportExcel(list, "字典数据");
+ util.exportExcel(response, list, "字典数据");
}
/**
@@ -73,7 +75,12 @@
@GetMapping(value = "/type/{dictType}")
public AjaxResult dictType(@PathVariable String dictType)
{
- return AjaxResult.success(dictTypeService.selectDictDataByType(dictType));
+ List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+ if (StringUtils.isNull(data))
+ {
+ data = new ArrayList<SysDictData>();
+ }
+ return AjaxResult.success(data);
}
/**
@@ -84,7 +91,7 @@
@PostMapping
public AjaxResult add(@Validated @RequestBody SysDictData dict)
{
- dict.setCreateBy(SecurityUtils.getUsername());
+ dict.setCreateBy(getUsername());
return toAjax(dictDataService.insertDictData(dict));
}
@@ -96,7 +103,7 @@
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysDictData dict)
{
- dict.setUpdateBy(SecurityUtils.getUsername());
+ dict.setUpdateBy(getUsername());
return toAjax(dictDataService.updateDictData(dict));
}
@@ -108,6 +115,7 @@
@DeleteMapping("/{dictCodes}")
public AjaxResult remove(@PathVariable Long[] dictCodes)
{
- return toAjax(dictDataService.deleteDictDataByIds(dictCodes));
+ dictDataService.deleteDictDataByIds(dictCodes);
+ return success();
}
}
--
Gitblit v1.9.2