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 | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 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 5cabe85..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 @@ -11,8 +11,6 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.service.ISysDictTypeService; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -26,7 +24,6 @@ * @author Lion Li */ @Validated -@Tag(name ="鏁版嵁瀛楀吀淇℃伅鎺у埗鍣�", description = "鏁版嵁瀛楀吀淇℃伅绠$悊") @RequiredArgsConstructor @RestController @RequestMapping("/system/dict/type") @@ -34,12 +31,18 @@ private final ISysDictTypeService dictTypeService; + /** + * 鏌ヨ瀛楀吀绫诲瀷鍒楄〃 + */ @SaCheckPermission("system:dict:list") @GetMapping("/list") public TableDataInfo<SysDictType> list(SysDictType dictType, PageQuery pageQuery) { return dictTypeService.selectPageDictTypeList(dictType, pageQuery); } + /** + * 瀵煎嚭瀛楀吀绫诲瀷鍒楄〃 + */ @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.EXPORT) @SaCheckPermission("system:dict:export") @PostMapping("/export") @@ -50,10 +53,12 @@ /** * 鏌ヨ瀛楀吀绫诲瀷璇︾粏 + * + * @param dictId 瀛楀吀ID */ @SaCheckPermission("system:dict:query") @GetMapping(value = "/{dictId}") - public R<SysDictType> getInfo(@Parameter(name = "瀛楀吀ID") @PathVariable Long dictId) { + public R<SysDictType> getInfo(@PathVariable Long dictId) { return R.ok(dictTypeService.selectDictTypeById(dictId)); } @@ -67,7 +72,8 @@ if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { return R.fail("鏂板瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪"); } - return toAjax(dictTypeService.insertDictType(dict)); + dictTypeService.insertDictType(dict); + return R.ok(); } /** @@ -80,16 +86,19 @@ 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涓� */ @SaCheckPermission("system:dict:remove") @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE) @DeleteMapping("/{dictIds}") - public R<Void> remove(@Parameter(name = "瀛楀吀ID涓�") @PathVariable Long[] dictIds) { + public R<Void> remove(@PathVariable Long[] dictIds) { dictTypeService.deleteDictTypeByIds(dictIds); return R.ok(); } -- Gitblit v1.9.3