From 0b077806196ceb8a68af93f00880ccc70aee50c2 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 07 七月 2022 18:08:14 +0800 Subject: [PATCH] add 整合 springdoc 移除 knife4j --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 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 060e980..a6ef304 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 @@ -4,17 +4,17 @@ import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.annotation.Log; 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.SysDictData; 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.ISysDictDataService; import com.ruoyi.system.service.ISysDictTypeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +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 +29,7 @@ * @author Lion Li */ @Validated -@Api(value = "鏁版嵁瀛楀吀淇℃伅鎺у埗鍣�", tags = {"鏁版嵁瀛楀吀淇℃伅绠$悊"}) +@Tag(name ="鏁版嵁瀛楀吀淇℃伅鎺у埗鍣�", description = "鏁版嵁瀛楀吀淇℃伅绠$悊") @RequiredArgsConstructor @RestController @RequestMapping("/system/dict/data") @@ -38,14 +38,14 @@ private final ISysDictDataService dictDataService; private final ISysDictTypeService dictTypeService; - @ApiOperation("鏌ヨ瀛楀吀鏁版嵁鍒楄〃") + @Operation(summary = "鏌ヨ瀛楀吀鏁版嵁鍒楄〃") @SaCheckPermission("system:dict:list") @GetMapping("/list") public TableDataInfo<SysDictData> list(SysDictData dictData, PageQuery pageQuery) { return dictDataService.selectPageDictDataList(dictData, pageQuery); } - @ApiOperation("瀵煎嚭瀛楀吀鏁版嵁鍒楄〃") + @Operation(summary = "瀵煎嚭瀛楀吀鏁版嵁鍒楄〃") @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.EXPORT) @SaCheckPermission("system:dict:export") @PostMapping("/export") @@ -57,19 +57,19 @@ /** * 鏌ヨ瀛楀吀鏁版嵁璇︾粏 */ - @ApiOperation("鏌ヨ瀛楀吀鏁版嵁璇︾粏") + @Operation(summary = "鏌ヨ瀛楀吀鏁版嵁璇︾粏") @SaCheckPermission("system:dict:query") @GetMapping(value = "/{dictCode}") - public R<SysDictData> getInfo(@ApiParam("瀛楀吀code") @PathVariable Long dictCode) { + public R<SysDictData> getInfo(@Parameter(name = "瀛楀吀code") @PathVariable Long dictCode) { return R.ok(dictDataService.selectDictDataById(dictCode)); } /** * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅 */ - @ApiOperation("鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅") + @Operation(summary = "鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅") @GetMapping(value = "/type/{dictType}") - public R<List<SysDictData>> dictType(@ApiParam("瀛楀吀绫诲瀷") @PathVariable String dictType) { + public R<List<SysDictData>> dictType(@Parameter(name = "瀛楀吀绫诲瀷") @PathVariable String dictType) { List<SysDictData> data = dictTypeService.selectDictDataByType(dictType); if (ObjectUtil.isNull(data)) { data = new ArrayList<>(); @@ -80,7 +80,7 @@ /** * 鏂板瀛楀吀绫诲瀷 */ - @ApiOperation("鏂板瀛楀吀绫诲瀷") + @Operation(summary = "鏂板瀛楀吀绫诲瀷") @SaCheckPermission("system:dict:add") @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT) @PostMapping @@ -91,7 +91,7 @@ /** * 淇敼淇濆瓨瀛楀吀绫诲瀷 */ - @ApiOperation("淇敼淇濆瓨瀛楀吀绫诲瀷") + @Operation(summary = "淇敼淇濆瓨瀛楀吀绫诲瀷") @SaCheckPermission("system:dict:edit") @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE) @PutMapping @@ -102,11 +102,11 @@ /** * 鍒犻櫎瀛楀吀绫诲瀷 */ - @ApiOperation("鍒犻櫎瀛楀吀绫诲瀷") + @Operation(summary = "鍒犻櫎瀛楀吀绫诲瀷") @SaCheckPermission("system:dict:remove") @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE) @DeleteMapping("/{dictCodes}") - public R<Void> remove(@ApiParam("瀛楀吀code涓�") @PathVariable Long[] dictCodes) { + public R<Void> remove(@Parameter(name = "瀛楀吀code涓�") @PathVariable Long[] dictCodes) { dictDataService.deleteDictDataByIds(dictCodes); return R.ok(); } -- Gitblit v1.9.3