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-generator/src/main/java/com/ruoyi/generator/controller/GenController.java | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
index 09bf1ae..d003ca8 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
@@ -5,16 +5,15 @@
import cn.hutool.core.io.IoUtil;
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.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
-import com.ruoyi.generator.service.IGenTableColumnService;
import com.ruoyi.generator.service.IGenTableService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -31,19 +30,18 @@
* @author Lion Li
*/
@Validated
-@Api(value = "浠ｇ爜鐢熸垚", tags = {"浠ｇ爜鐢熸垚绠＄悊"})
+@Tag(name = "浠ｇ爜鐢熸垚", description = "浠ｇ爜鐢熸垚绠＄悊")
@RequiredArgsConstructor
@RestController
@RequestMapping("/tool/gen")
public class GenController extends BaseController {
private final IGenTableService genTableService;
- private final IGenTableColumnService genTableColumnService;
/**
* 鏌ヨ浠ｇ爜鐢熸垚鍒楄〃
*/
- @ApiOperation("鏌ヨ浠ｇ爜鐢熸垚鍒楄〃")
+ @Operation(summary = "鏌ヨ浠ｇ爜鐢熸垚鍒楄〃")
@SaCheckPermission("tool:gen:list")
@GetMapping("/list")
public TableDataInfo<GenTable> genList(GenTable genTable, PageQuery pageQuery) {
@@ -53,13 +51,13 @@
/**
* 淇敼浠ｇ爜鐢熸垚涓氬姟
*/
- @ApiOperation("淇敼浠ｇ爜鐢熸垚涓氬姟")
+ @Operation(summary = "淇敼浠ｇ爜鐢熸垚涓氬姟")
@SaCheckPermission("tool:gen:query")
- @GetMapping(value = "/{talbleId}")
- public R<Map<String, Object>> getInfo(@PathVariable Long talbleId) {
- GenTable table = genTableService.selectGenTableById(talbleId);
+ @GetMapping(value = "/{tableId}")
+ public R<Map<String, Object>> getInfo(@PathVariable Long tableId) {
+ GenTable table = genTableService.selectGenTableById(tableId);
List<GenTable> tables = genTableService.selectGenTableAll();
- List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);
+ List<GenTableColumn> list = genTableService.selectGenTableColumnListByTableId(tableId);
Map<String, Object> map = new HashMap<String, Object>();
map.put("info", table);
map.put("rows", list);
@@ -70,7 +68,7 @@
/**
* 鏌ヨ鏁版嵁搴撳垪琛�
*/
- @ApiOperation("鏌ヨ鏁版嵁搴撳垪琛�")
+ @Operation(summary = "鏌ヨ鏁版嵁搴撳垪琛�")
@SaCheckPermission("tool:gen:list")
@GetMapping("/db/list")
public TableDataInfo<GenTable> dataList(GenTable genTable, PageQuery pageQuery) {
@@ -80,12 +78,12 @@
/**
* 鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�
*/
- @ApiOperation("鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�")
+ @Operation(summary = "鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�")
@SaCheckPermission("tool:gen:list")
- @GetMapping(value = "/column/{talbleId}")
+ @GetMapping(value = "/column/{tableId}")
public TableDataInfo<GenTableColumn> columnList(Long tableId) {
TableDataInfo<GenTableColumn> dataInfo = new TableDataInfo<>();
- List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
+ List<GenTableColumn> list = genTableService.selectGenTableColumnListByTableId(tableId);
dataInfo.setRows(list);
dataInfo.setTotal(list.size());
return dataInfo;
@@ -94,7 +92,7 @@
/**
* 瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�
*/
- @ApiOperation("瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�")
+ @Operation(summary = "瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�")
@SaCheckPermission("tool:gen:import")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.IMPORT)
@PostMapping("/importTable")
@@ -109,7 +107,7 @@
/**
* 淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟
*/
- @ApiOperation("淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟")
+ @Operation(summary = "淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟")
@SaCheckPermission("tool:gen:edit")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
@PutMapping
@@ -122,7 +120,7 @@
/**
* 鍒犻櫎浠ｇ爜鐢熸垚
*/
- @ApiOperation("鍒犻櫎浠ｇ爜鐢熸垚")
+ @Operation(summary = "鍒犻櫎浠ｇ爜鐢熸垚")
@SaCheckPermission("tool:gen:remove")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.DELETE)
@DeleteMapping("/{tableIds}")
@@ -134,7 +132,7 @@
/**
* 棰勮浠ｇ爜
*/
- @ApiOperation("棰勮浠ｇ爜")
+ @Operation(summary = "棰勮浠ｇ爜")
@SaCheckPermission("tool:gen:preview")
@GetMapping("/preview/{tableId}")
public R<Map<String, String>> preview(@PathVariable("tableId") Long tableId) throws IOException {
@@ -145,7 +143,7 @@
/**
* 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
*/
- @ApiOperation("鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級")
+ @Operation(summary = "鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級")
@SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/download/{tableName}")
@@ -157,7 +155,7 @@
/**
* 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
*/
- @ApiOperation("鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�")
+ @Operation(summary = "鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�")
@SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/genCode/{tableName}")
@@ -169,7 +167,7 @@
/**
* 鍚屾鏁版嵁搴�
*/
- @ApiOperation("鍚屾鏁版嵁搴�")
+ @Operation(summary = "鍚屾鏁版嵁搴�")
@SaCheckPermission("tool:gen:edit")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
@GetMapping("/synchDb/{tableName}")
@@ -181,7 +179,7 @@
/**
* 鎵归噺鐢熸垚浠ｇ爜
*/
- @ApiOperation("鎵归噺鐢熸垚浠ｇ爜")
+ @Operation(summary = "鎵归噺鐢熸垚浠ｇ爜")
@SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/batchGenCode")
--
Gitblit v1.9.3