From aa638475e955207a5d5f76f9ec99415b5a18f5db Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 25 八月 2022 12:30:32 +0800 Subject: [PATCH] update 同步 ruoyi 新功能 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index a6ef304..01613db 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -12,9 +12,6 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictTypeService; -import io.swagger.v3.oas.annotations.Operation; -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.*; @@ -29,7 +26,6 @@ * @author Lion Li */ @Validated -@Tag(name ="鏁版嵁瀛楀吀淇℃伅鎺у埗鍣�", description = "鏁版嵁瀛楀吀淇℃伅绠$悊") @RequiredArgsConstructor @RestController @RequestMapping("/system/dict/data") @@ -38,14 +34,18 @@ private final ISysDictDataService dictDataService; private final ISysDictTypeService dictTypeService; - @Operation(summary = "鏌ヨ瀛楀吀鏁版嵁鍒楄〃") + /** + * 鏌ヨ瀛楀吀鏁版嵁鍒楄〃 + */ @SaCheckPermission("system:dict:list") @GetMapping("/list") public TableDataInfo<SysDictData> list(SysDictData dictData, PageQuery pageQuery) { return dictDataService.selectPageDictDataList(dictData, pageQuery); } - @Operation(summary = "瀵煎嚭瀛楀吀鏁版嵁鍒楄〃") + /** + * 瀵煎嚭瀛楀吀鏁版嵁鍒楄〃 + */ @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.EXPORT) @SaCheckPermission("system:dict:export") @PostMapping("/export") @@ -56,20 +56,22 @@ /** * 鏌ヨ瀛楀吀鏁版嵁璇︾粏 + * + * @param dictCode 瀛楀吀code */ - @Operation(summary = "鏌ヨ瀛楀吀鏁版嵁璇︾粏") @SaCheckPermission("system:dict:query") @GetMapping(value = "/{dictCode}") - public R<SysDictData> getInfo(@Parameter(name = "瀛楀吀code") @PathVariable Long dictCode) { + public R<SysDictData> getInfo(@PathVariable Long dictCode) { return R.ok(dictDataService.selectDictDataById(dictCode)); } /** * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅 + * + * @param dictType 瀛楀吀绫诲瀷 */ - @Operation(summary = "鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅") @GetMapping(value = "/type/{dictType}") - public R<List<SysDictData>> dictType(@Parameter(name = "瀛楀吀绫诲瀷") @PathVariable String dictType) { + public R<List<SysDictData>> dictType(@PathVariable String dictType) { List<SysDictData> data = dictTypeService.selectDictDataByType(dictType); if (ObjectUtil.isNull(data)) { data = new ArrayList<>(); @@ -80,33 +82,34 @@ /** * 鏂板瀛楀吀绫诲瀷 */ - @Operation(summary = "鏂板瀛楀吀绫诲瀷") @SaCheckPermission("system:dict:add") @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT) @PostMapping public R<Void> add(@Validated @RequestBody SysDictData dict) { - return toAjax(dictDataService.insertDictData(dict)); + dictDataService.insertDictData(dict); + return R.ok(); } /** * 淇敼淇濆瓨瀛楀吀绫诲瀷 */ - @Operation(summary = "淇敼淇濆瓨瀛楀吀绫诲瀷") @SaCheckPermission("system:dict:edit") @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE) @PutMapping public R<Void> edit(@Validated @RequestBody SysDictData dict) { - return toAjax(dictDataService.updateDictData(dict)); + dictDataService.updateDictData(dict); + return R.ok(); } /** * 鍒犻櫎瀛楀吀绫诲瀷 + * + * @param dictCodes 瀛楀吀code涓� */ - @Operation(summary = "鍒犻櫎瀛楀吀绫诲瀷") @SaCheckPermission("system:dict:remove") @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE) @DeleteMapping("/{dictCodes}") - public R<Void> remove(@Parameter(name = "瀛楀吀code涓�") @PathVariable Long[] dictCodes) { + public R<Void> remove(@PathVariable Long[] dictCodes) { dictDataService.deleteDictDataByIds(dictCodes); return R.ok(); } -- Gitblit v1.9.3