LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 字典 排序:最大为99999.99

Browse Source
This commit is contained in:
lijiarao
2021-08-25 15:05:52 +08:00
parent 86d0aa1b75
commit 419a74077b
4 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
+9 -7
View File
@@ -37,6 +37,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
@@ -46,6 +47,7 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.*;
/**
@@ -338,7 +340,7 @@ public class SysDictController {
@ApiOperation(value = "字典控制器-新增字典", notes = "字典控制器-新增字典")
@RequiresRoles({"admin"})
@RequestMapping(value = "/add", method = RequestMethod.POST)
public Result<SysDict> add(@RequestBody SysDict sysDict) {
public Result<SysDict> add(@RequestBody @Valid SysDict sysDict) {
Result<SysDict> result = new Result<SysDict>();
try {
sysDict.setCreateTime(new Date());
@@ -362,8 +364,8 @@ public class SysDictController {
@RequiresPermissions("sys:dict:edit")
@ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典")
@RequiresRoles({"admin"})
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
public Result<SysDict> edit(@RequestBody SysDict sysDict) {
@RequestMapping(value = "/edit", method = RequestMethod.POST)
public Result<SysDict> edit(@RequestBody @Valid SysDict sysDict) {
Result<SysDict> result = new Result<SysDict>();
SysDict sysdict = sysDictService.getById(sysDict.getId());
if(sysdict==null) {
@@ -388,7 +390,7 @@ public class SysDictController {
@RequiresPermissions("sys:dict:del")
@ApiOperation(value = "字典控制器-删除字典", notes = "字典控制器-删除字典")
@RequiresRoles({"admin"})
@DeleteMapping(value = "/delete")
@GetMapping(value = "/delete")
@CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
public Result<SysDict> delete(@RequestParam(name="id",required=true) String id) {
Result<SysDict> result = new Result<SysDict>();
@@ -408,7 +410,7 @@ public class SysDictController {
*/
@RequiresPermissions("sys:dict:del")
@ApiOperation(value = "字典控制器-批量字典", notes = "字典控制器-批量字典")
@DeleteMapping(value = "/deleteBatch")
@GetMapping(value = "/deleteBatch")
@CacheEvict(value= CacheConstant.SYS_DICT_CACHE, allEntries=true)
public Result<SysDict> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
Result<SysDict> result = new Result<SysDict>();
@@ -554,7 +556,7 @@ public class SysDictController {
* @return
*/
@RequiresPermissions("sys:dict:list")
@DeleteMapping(value = "/deletePhysic/{id}")
@GetMapping(value = "/deletePhysic/{id}")
public Result<?> deletePhysic(@PathVariable String id) {
try {
sysDictService.deleteOneDictPhysically(id);
@@ -571,7 +573,7 @@ public class SysDictController {
* @return
*/
@RequiresPermissions("sys:dict:list")
@PutMapping(value = "/back/{id}")
@PostMapping(value = "/back/{id}")
public Result<?> back(@PathVariable String id) {
try {
sysDictService.updateDictDelFlag(0,id);
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+6 -5
View File
@@ -5,6 +5,7 @@ import java.util.Arrays;
import java.util.Date;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.annotations.ApiOperation;
@@ -77,7 +78,7 @@ public class SysDictItemController {
@RequiresPermissions("sys:dict:list")
@RequestMapping(value = "/add", method = RequestMethod.POST)
@CacheEvict(value= CacheConstant.SYS_DICT_CACHE, allEntries=true)
public Result<SysDictItem> add(@RequestBody SysDictItem sysDictItem) {
public Result<SysDictItem> add(@RequestBody @Valid SysDictItem sysDictItem) {
Result<SysDictItem> result = new Result<SysDictItem>();
try {
sysDictItem.setCreateTime(new Date());
@@ -97,9 +98,9 @@ public class SysDictItemController {
*/
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:dict:list")
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
@RequestMapping(value = "/edit", method = RequestMethod.POST)
@CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
public Result<SysDictItem> edit(@RequestBody SysDictItem sysDictItem) {
public Result<SysDictItem> edit(@RequestBody @Valid SysDictItem sysDictItem) {
Result<SysDictItem> result = new Result<SysDictItem>();
SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId());
if(sysdict==null) {
@@ -122,7 +123,7 @@ public class SysDictItemController {
*/
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:dict:list")
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@RequestMapping(value = "/delete", method = RequestMethod.GET)
@CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
public Result<SysDictItem> delete(@RequestParam(name="id",required=true) String id) {
Result<SysDictItem> result = new Result<SysDictItem>();
@@ -145,7 +146,7 @@ public class SysDictItemController {
*/
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:dict:list")
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@RequestMapping(value = "/deleteBatch", method = RequestMethod.GET)
@CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
public Result<SysDictItem> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
Result<SysDictItem> result = new Result<SysDictItem>();
jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java
+5
View File
@@ -11,6 +11,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.Size;
/**
* <p>
* 字典表
@@ -43,16 +45,19 @@ public class SysDict implements Serializable {
/**
* 字典名称
*/
@Size(min = 1,max = 50,message = "字典名称要在1-50个字符之中")
private String dictName;
/**
* 字典编码
*/
@Size(min = 1,max = 50,message = "字典编码要在1-50个字符之中")
private String dictCode;
/**
* 描述
*/
@Size(max = 200,message = "字典内容不得超过200个字符")
private String description;
/**
jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java
+4 -1
View File
@@ -13,6 +13,8 @@ import lombok.experimental.Accessors;
import com.jero.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import javax.validation.constraints.Digits;
/**
* <p>
*
@@ -61,7 +63,8 @@ public class SysDictItem implements Serializable {
* 排序
*/
@Excel(name = "排序", width = 15,type=4)
private Integer sortOrder;
@Digits(integer = 5,fraction = 2, message = "排序:最大为99999.99")
private BigDecimal sortOrder;
/**