diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 50dbecc8..0d2e3d53 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -19,11 +19,7 @@ import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -46,7 +42,7 @@ public class SysDictItemController { @Autowired private ISysDictItemService sysDictItemService; - + /** * @功能:查询字典数据 * @param sysDictItem @@ -56,26 +52,28 @@ public class SysDictItemController { * @return */ @RequiresPermissions("sys:dict:list") - @RequestMapping(value = "/page", method = RequestMethod.GET) +// @RequestMapping(value = "/page", method = RequestMethod.GET) + @GetMapping("/page") public Result> queryPageList(SysDictItem sysDictItem,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { - Result> result = new Result>(); + Result> result = new Result<>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap()); queryWrapper.orderByAsc("sort_order"); - Page page = new Page(pageNo, pageSize); + Page page = new Page<>(pageNo, pageSize); IPage pageList = sysDictItemService.page(page, queryWrapper); result.setSuccess(true); result.setResult(pageList); return result; } - + /** * @功能:新增 * @return */ //@RequiresRoles({"admin"}) @RequiresPermissions("sys:dict:list") - @RequestMapping(value = "/add", method = RequestMethod.POST) +// @RequestMapping(value = "/add", method = RequestMethod.POST) + @PostMapping("/add") @CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) public Result add(@RequestBody SysDictItem sysDictItem) { try { @@ -87,7 +85,7 @@ public class SysDictItemController { return Result.error("操作失败"); } } - + /** * @功能:编辑 * @param sysDictItem @@ -95,7 +93,8 @@ public class SysDictItemController { */ //@RequiresRoles({"admin"}) @RequiresPermissions("sys:dict:list") - @RequestMapping(value = "/edit", method = RequestMethod.PUT) +// @RequestMapping(value = "/edit", method = RequestMethod.PUT) + @PutMapping("/edit") @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) public Result edit(@RequestBody SysDictItem sysDictItem) { SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId()); @@ -110,7 +109,7 @@ public class SysDictItemController { } return Result.OK(); } - + /** * @功能:删除字典数据 * @param id @@ -118,7 +117,8 @@ public class SysDictItemController { */ //@RequiresRoles({"admin"}) @RequiresPermissions("sys:dict:list") - @RequestMapping(value = "/delete", method = RequestMethod.DELETE) +// @RequestMapping(value = "/delete", method = RequestMethod.DELETE) + @DeleteMapping("/delete") @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) public Result delete(@RequestParam(name="id",required=true) String id) { SysDictItem joinSystem = sysDictItemService.getById(id); @@ -132,7 +132,7 @@ public class SysDictItemController { } return Result.OK(); } - + /** * @功能:批量删除字典数据 * @param ids @@ -140,7 +140,8 @@ public class SysDictItemController { */ //@RequiresRoles({"admin"}) @RequiresPermissions("sys:dict:list") - @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) +// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) + @DeleteMapping("/deleteBatch") @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { @@ -158,11 +159,12 @@ public class SysDictItemController { * @return */ @RequiresPermissions("sys:dict:list") - @RequestMapping(value = "/dictItemCheck", method = RequestMethod.GET) +// @RequestMapping(value = "/dictItemCheck", method = RequestMethod.GET) + @GetMapping("/dictItemCheck") @ApiOperation("字典重复校验接口") public Result doDictItemCheck(SysDictItem sysDictItem, HttpServletRequest request) { int num = 0; - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SysDictItem::getItemValue,sysDictItem.getItemValue()); queryWrapper.eq(SysDictItem::getDictId,sysDictItem.getDictId()); if (StringUtils.isNotBlank(sysDictItem.getId())) { @@ -179,5 +181,5 @@ public class SysDictItemController { return Result.error("该值不可用,系统中已存在!"); } } - + }