From c82afc8c461956e45be0aa29ca2a7fe3f18ee6f7 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期二, 28 十二月 2021 11:23:33 +0800 Subject: [PATCH] update RedisUtils 迁移到 utils/redis 包下 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 16 ++++++++-------- 1 files changed, 8 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 fca1a20..07cb74e 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 @@ -3,6 +3,7 @@ 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.entity.SysDictData; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; @@ -12,6 +13,7 @@ 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.security.access.prepost.PreAuthorize; @@ -40,14 +42,14 @@ @ApiOperation("鏌ヨ瀛楀吀鏁版嵁鍒楄〃") @PreAuthorize("@ss.hasPermi('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") + @PostMapping("/export") public void export(SysDictData dictData, HttpServletResponse response) { List<SysDictData> list = dictDataService.selectDictDataList(dictData); ExcelUtil.exportExcel(list, "瀛楀吀鏁版嵁", SysDictData.class, response); @@ -59,7 +61,7 @@ @ApiOperation("鏌ヨ瀛楀吀鏁版嵁璇︾粏") @PreAuthorize("@ss.hasPermi('system:dict:query')") @GetMapping(value = "/{dictCode}") - public AjaxResult<SysDictData> getInfo(@PathVariable Long dictCode) { + public AjaxResult<SysDictData> getInfo(@ApiParam("瀛楀吀code") @PathVariable Long dictCode) { return AjaxResult.success(dictDataService.selectDictDataById(dictCode)); } @@ -68,7 +70,7 @@ */ @ApiOperation("鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅") @GetMapping(value = "/type/{dictType}") - public AjaxResult<List<SysDictData>> dictType(@PathVariable String dictType) { + public AjaxResult<List<SysDictData>> dictType(@ApiParam("瀛楀吀绫诲瀷") @PathVariable String dictType) { List<SysDictData> data = dictTypeService.selectDictDataByType(dictType); if (StringUtils.isNull(data)) { data = new ArrayList<>(); @@ -84,7 +86,6 @@ @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT) @PostMapping public AjaxResult<Void> add(@Validated @RequestBody SysDictData dict) { - dict.setCreateBy(getUsername()); return toAjax(dictDataService.insertDictData(dict)); } @@ -96,7 +97,6 @@ @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult<Void> edit(@Validated @RequestBody SysDictData dict) { - dict.setUpdateBy(getUsername()); return toAjax(dictDataService.updateDictData(dict)); } @@ -107,7 +107,7 @@ @PreAuthorize("@ss.hasPermi('system:dict:remove')") @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE) @DeleteMapping("/{dictCodes}") - public AjaxResult<Void> remove(@PathVariable Long[] dictCodes) { + public AjaxResult<Void> remove(@ApiParam("瀛楀吀code涓�") @PathVariable Long[] dictCodes) { dictDataService.deleteDictDataByIds(dictCodes); return success(); } -- Gitblit v1.9.3