From 17f0c20242c6ee3d35b9ee8f677d747ed012423c Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 02 九月 2022 16:30:20 +0800 Subject: [PATCH] remove 移除maven docker插件 过于老旧功能缺陷大 使用idea自带的docker插件替代 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 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 54e31e4..86840b7 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 @@ -4,16 +4,13 @@ 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.R; import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; 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.poi.ExcelUtil; 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.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -27,7 +24,6 @@ * @author Lion Li */ @Validated -@Api(value = "鏁版嵁瀛楀吀淇℃伅鎺у埗鍣�", tags = {"鏁版嵁瀛楀吀淇℃伅绠$悊"}) @RequiredArgsConstructor @RestController @RequestMapping("/system/dict/type") @@ -35,14 +31,18 @@ private final ISysDictTypeService dictTypeService; - @ApiOperation("鏌ヨ瀛楀吀绫诲瀷鍒楄〃") + /** + * 鏌ヨ瀛楀吀绫诲瀷鍒楄〃 + */ @SaCheckPermission("system:dict:list") @GetMapping("/list") public TableDataInfo<SysDictType> list(SysDictType dictType, PageQuery pageQuery) { return dictTypeService.selectPageDictTypeList(dictType, pageQuery); } - @ApiOperation("瀵煎嚭瀛楀吀绫诲瀷鍒楄〃") + /** + * 瀵煎嚭瀛楀吀绫诲瀷鍒楄〃 + */ @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.EXPORT) @SaCheckPermission("system:dict:export") @PostMapping("/export") @@ -53,18 +53,18 @@ /** * 鏌ヨ瀛楀吀绫诲瀷璇︾粏 + * + * @param dictId 瀛楀吀ID */ - @ApiOperation("鏌ヨ瀛楀吀绫诲瀷璇︾粏") @SaCheckPermission("system:dict:query") @GetMapping(value = "/{dictId}") - public R<SysDictType> getInfo(@ApiParam("瀛楀吀ID") @PathVariable Long dictId) { + public R<SysDictType> getInfo(@PathVariable Long dictId) { return R.ok(dictTypeService.selectDictTypeById(dictId)); } /** * 鏂板瀛楀吀绫诲瀷 */ - @ApiOperation("鏂板瀛楀吀绫诲瀷") @SaCheckPermission("system:dict:add") @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.INSERT) @PostMapping @@ -72,13 +72,13 @@ if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { return R.fail("鏂板瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪"); } - return toAjax(dictTypeService.insertDictType(dict)); + dictTypeService.insertDictType(dict); + return R.ok(); } /** * 淇敼瀛楀吀绫诲瀷 */ - @ApiOperation("淇敼瀛楀吀绫诲瀷") @SaCheckPermission("system:dict:edit") @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.UPDATE) @PutMapping @@ -86,25 +86,26 @@ if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { return R.fail("淇敼瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪"); } - return toAjax(dictTypeService.updateDictType(dict)); + dictTypeService.updateDictType(dict); + return R.ok(); } /** * 鍒犻櫎瀛楀吀绫诲瀷 + * + * @param dictIds 瀛楀吀ID涓� */ - @ApiOperation("鍒犻櫎瀛楀吀绫诲瀷") @SaCheckPermission("system:dict:remove") @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE) @DeleteMapping("/{dictIds}") - public R<Void> remove(@ApiParam("瀛楀吀ID涓�") @PathVariable Long[] dictIds) { + public R<Void> remove(@PathVariable Long[] dictIds) { dictTypeService.deleteDictTypeByIds(dictIds); - return success(); + return R.ok(); } /** * 鍒锋柊瀛楀吀缂撳瓨 */ - @ApiOperation("鍒锋柊瀛楀吀缂撳瓨") @SaCheckPermission("system:dict:remove") @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") @@ -116,7 +117,6 @@ /** * 鑾峰彇瀛楀吀閫夋嫨妗嗗垪琛� */ - @ApiOperation("鑾峰彇瀛楀吀閫夋嫨妗嗗垪琛�") @GetMapping("/optionselect") public R<List<SysDictType>> optionselect() { List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll(); -- Gitblit v1.9.3