From d30a6450c9a3ddfa4886e840939d37daab766a9b Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Thu, 12 Mar 2026 22:22:10 +0800
Subject: [PATCH] !450 update docker image version for master branch Merge pull request !450 from magic/fix/docker
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java
index fffe6b3..5a4d3ec 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java
@@ -1,8 +1,7 @@
package com.ruoyi.system.controller;
-import java.io.IOException;
import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -13,16 +12,15 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.PreAuthorize;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.domain.SysDictType;
+import com.ruoyi.system.api.domain.SysDictType;
import com.ruoyi.system.service.ISysDictTypeService;
/**
@@ -37,7 +35,7 @@
@Autowired
private ISysDictTypeService dictTypeService;
- @PreAuthorize(hasPermi = "system:dict:list")
+ @RequiresPermissions("system:dict:list")
@GetMapping("/list")
public TableDataInfo list(SysDictType dictType)
{
@@ -47,9 +45,9 @@
}
@Log(title = "字典类型", businessType = BusinessType.EXPORT)
- @PreAuthorize(hasPermi = "system:dict:export")
+ @RequiresPermissions("system:dict:export")
@PostMapping("/export")
- public void export(HttpServletResponse response, SysDictType dictType) throws IOException
+ public void export(HttpServletResponse response, SysDictType dictType)
{
List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
@@ -59,24 +57,24 @@
/**
* 查询字典类型详细
*/
- @PreAuthorize(hasPermi = "system:dict:query")
+ @RequiresPermissions("system:dict:query")
@GetMapping(value = "/{dictId}")
public AjaxResult getInfo(@PathVariable Long dictId)
{
- return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
+ return success(dictTypeService.selectDictTypeById(dictId));
}
/**
* 新增字典类型
*/
- @PreAuthorize(hasPermi = "system:dict:add")
+ @RequiresPermissions("system:dict:add")
@Log(title = "字典类型", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysDictType dict)
{
- if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
+ if (!dictTypeService.checkDictTypeUnique(dict))
{
- return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
+ return error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
}
dict.setCreateBy(SecurityUtils.getUsername());
return toAjax(dictTypeService.insertDictType(dict));
@@ -85,14 +83,14 @@
/**
* 修改字典类型
*/
- @PreAuthorize(hasPermi = "system:dict:edit")
+ @RequiresPermissions("system:dict:edit")
@Log(title = "字典类型", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysDictType dict)
{
- if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
+ if (!dictTypeService.checkDictTypeUnique(dict))
{
- return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
+ return error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
}
dict.setUpdateBy(SecurityUtils.getUsername());
return toAjax(dictTypeService.updateDictType(dict));
@@ -101,24 +99,25 @@
/**
* 删除字典类型
*/
- @PreAuthorize(hasPermi = "system:dict:remove")
+ @RequiresPermissions("system:dict:remove")
@Log(title = "字典类型", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictIds}")
public AjaxResult remove(@PathVariable Long[] dictIds)
{
- return toAjax(dictTypeService.deleteDictTypeByIds(dictIds));
+ dictTypeService.deleteDictTypeByIds(dictIds);
+ return success();
}
/**
- * 清空缓存
+ * 刷新字典缓存
*/
- @PreAuthorize(hasPermi = "system:dict:remove")
+ @RequiresPermissions("system:dict:remove")
@Log(title = "字典类型", businessType = BusinessType.CLEAN)
- @DeleteMapping("/clearCache")
- public AjaxResult clearCache()
+ @DeleteMapping("/refreshCache")
+ public AjaxResult refreshCache()
{
- dictTypeService.clearCache();
- return AjaxResult.success();
+ dictTypeService.resetDictCache();
+ return success();
}
/**
@@ -128,6 +127,6 @@
public AjaxResult optionselect()
{
List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
- return AjaxResult.success(dictTypes);
+ return success(dictTypes);
}
}
--
Gitblit v1.9.3