From d9e54388e7fde2462e8b7e0165c5e7da3f202593 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 07 七月 2022 19:07:59 +0800
Subject: [PATCH] add 整合 springdoc-openapi-javadoc 基于代码注释生成文档

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java |   27 +++++++--------------------
 1 files changed, 7 insertions(+), 20 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 218227a..d8c405e 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
@@ -12,8 +12,7 @@
 import com.ruoyi.generator.domain.GenTable;
 import com.ruoyi.generator.domain.GenTableColumn;
 import com.ruoyi.generator.service.IGenTableService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -30,7 +29,7 @@
  * @author Lion Li
  */
 @Validated
-@Api(value = "浠ｇ爜鐢熸垚", tags = {"浠ｇ爜鐢熸垚绠＄悊"})
+@Tag(name = "浠ｇ爜鐢熸垚", description = "浠ｇ爜鐢熸垚绠＄悊")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/tool/gen")
@@ -41,7 +40,6 @@
     /**
      * 鏌ヨ浠ｇ爜鐢熸垚鍒楄〃
      */
-    @ApiOperation("鏌ヨ浠ｇ爜鐢熸垚鍒楄〃")
     @SaCheckPermission("tool:gen:list")
     @GetMapping("/list")
     public TableDataInfo<GenTable> genList(GenTable genTable, PageQuery pageQuery) {
@@ -51,13 +49,12 @@
     /**
      * 淇敼浠ｇ爜鐢熸垚涓氬姟
      */
-    @ApiOperation("淇敼浠ｇ爜鐢熸垚涓氬姟")
     @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 = genTableService.selectGenTableColumnListByTableId(talbleId);
+        List<GenTableColumn> list = genTableService.selectGenTableColumnListByTableId(tableId);
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("info", table);
         map.put("rows", list);
@@ -68,7 +65,6 @@
     /**
      * 鏌ヨ鏁版嵁搴撳垪琛�
      */
-    @ApiOperation("鏌ヨ鏁版嵁搴撳垪琛�")
     @SaCheckPermission("tool:gen:list")
     @GetMapping("/db/list")
     public TableDataInfo<GenTable> dataList(GenTable genTable, PageQuery pageQuery) {
@@ -78,9 +74,8 @@
     /**
      * 鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�
      */
-    @ApiOperation("鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�")
     @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 = genTableService.selectGenTableColumnListByTableId(tableId);
@@ -92,7 +87,6 @@
     /**
      * 瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�
      */
-    @ApiOperation("瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�")
     @SaCheckPermission("tool:gen:import")
     @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.IMPORT)
     @PostMapping("/importTable")
@@ -107,7 +101,6 @@
     /**
      * 淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟
      */
-    @ApiOperation("淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟")
     @SaCheckPermission("tool:gen:edit")
     @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -120,7 +113,6 @@
     /**
      * 鍒犻櫎浠ｇ爜鐢熸垚
      */
-    @ApiOperation("鍒犻櫎浠ｇ爜鐢熸垚")
     @SaCheckPermission("tool:gen:remove")
     @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tableIds}")
@@ -132,7 +124,6 @@
     /**
      * 棰勮浠ｇ爜
      */
-    @ApiOperation("棰勮浠ｇ爜")
     @SaCheckPermission("tool:gen:preview")
     @GetMapping("/preview/{tableId}")
     public R<Map<String, String>> preview(@PathVariable("tableId") Long tableId) throws IOException {
@@ -143,7 +134,6 @@
     /**
      * 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
      */
-    @ApiOperation("鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級")
     @SaCheckPermission("tool:gen:code")
     @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
     @GetMapping("/download/{tableName}")
@@ -155,7 +145,6 @@
     /**
      * 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
      */
-    @ApiOperation("鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�")
     @SaCheckPermission("tool:gen:code")
     @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
     @GetMapping("/genCode/{tableName}")
@@ -167,7 +156,6 @@
     /**
      * 鍚屾鏁版嵁搴�
      */
-    @ApiOperation("鍚屾鏁版嵁搴�")
     @SaCheckPermission("tool:gen:edit")
     @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
     @GetMapping("/synchDb/{tableName}")
@@ -179,7 +167,6 @@
     /**
      * 鎵归噺鐢熸垚浠ｇ爜
      */
-    @ApiOperation("鎵归噺鐢熸垚浠ｇ爜")
     @SaCheckPermission("tool:gen:code")
     @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
     @GetMapping("/batchGenCode")

--
Gitblit v1.9.3