From 94d5c174aa78399abff1c2acc38005815795f158 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 13 十二月 2023 11:47:35 +0800
Subject: [PATCH] 添加新群号：161281055
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
index 3185f41..9808842 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.system;
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;
@@ -13,13 +14,11 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictTypeService;
@@ -46,12 +45,12 @@
@Log(title = "字典类型", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:dict:export')")
- @GetMapping("/export")
- public AjaxResult export(SysDictType dictType)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysDictType dictType)
{
List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
- return util.exportExcel(list, "字典类型");
+ util.exportExcel(response, list, "字典类型");
}
/**
@@ -61,7 +60,7 @@
@GetMapping(value = "/{dictId}")
public AjaxResult getInfo(@PathVariable Long dictId)
{
- return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
+ return success(dictTypeService.selectDictTypeById(dictId));
}
/**
@@ -72,11 +71,11 @@
@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());
+ dict.setCreateBy(getUsername());
return toAjax(dictTypeService.insertDictType(dict));
}
@@ -88,11 +87,11 @@
@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());
+ dict.setUpdateBy(getUsername());
return toAjax(dictTypeService.updateDictType(dict));
}
@@ -117,7 +116,7 @@
public AjaxResult refreshCache()
{
dictTypeService.resetDictCache();
- return AjaxResult.success();
+ return success();
}
/**
@@ -127,6 +126,6 @@
public AjaxResult optionselect()
{
List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
- return AjaxResult.success(dictTypes);
+ return success(dictTypes);
}
}
--
Gitblit v1.9.2