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/resources/vm/java/controller.java.vm |   43 +++++++++++++++++++++----------------------
 1 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index be09599..9ea772f 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -14,7 +14,7 @@
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
@@ -27,9 +27,8 @@
 import com.ruoyi.common.core.page.TableDataInfo;
 #elseif($table.tree)
 #end
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 /**
  * ${functionName}Controller
@@ -38,7 +37,7 @@
  * @date ${datetime}
  */
 @Validated
-@Api(value = "${functionName}鎺у埗鍣�", tags = {"${functionName}绠＄悊"})
+@Tag(name ="${functionName}鎺у埗鍣�", description = "${functionName}绠＄悊")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/${moduleName}/${businessName}")
@@ -49,28 +48,28 @@
     /**
      * 鏌ヨ${functionName}鍒楄〃
      */
-    @ApiOperation("鏌ヨ${functionName}鍒楄〃")
+    @Operation(summary = "鏌ヨ${functionName}鍒楄〃")
     @SaCheckPermission("${permissionPrefix}:list")
     @GetMapping("/list")
 #if($table.crud || $table.sub)
-    public TableDataInfo<${ClassName}Vo> list(@Validated(QueryGroup.class) ${ClassName}Bo bo, PageQuery pageQuery) {
+    public TableDataInfo<${ClassName}Vo> list(${ClassName}Bo bo, PageQuery pageQuery) {
         return i${ClassName}Service.queryPageList(bo, pageQuery);
     }
 #elseif($table.tree)
-    public AjaxResult<List<${ClassName}Vo>> list(@Validated(QueryGroup.class) ${ClassName}Bo bo) {
+    public R<List<${ClassName}Vo>> list(${ClassName}Bo bo) {
         List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 #end
 
     /**
      * 瀵煎嚭${functionName}鍒楄〃
      */
-    @ApiOperation("瀵煎嚭${functionName}鍒楄〃")
+    @Operation(summary = "瀵煎嚭${functionName}鍒楄〃")
     @SaCheckPermission("${permissionPrefix}:export")
     @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(@Validated ${ClassName}Bo bo, HttpServletResponse response) {
+    public void export(${ClassName}Bo bo, HttpServletResponse response) {
         List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
         ExcelUtil.exportExcel(list, "${functionName}", ${ClassName}Vo.class, response);
     }
@@ -78,47 +77,47 @@
     /**
      * 鑾峰彇${functionName}璇︾粏淇℃伅
      */
-    @ApiOperation("鑾峰彇${functionName}璇︾粏淇℃伅")
+    @Operation(summary = "鑾峰彇${functionName}璇︾粏淇℃伅")
     @SaCheckPermission("${permissionPrefix}:query")
     @GetMapping("/{${pkColumn.javaField}}")
-    public AjaxResult<${ClassName}Vo> getInfo(@ApiParam("涓婚敭")
-                                                  @NotNull(message = "涓婚敭涓嶈兘涓虹┖")
-                                                  @PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
-        return AjaxResult.success(i${ClassName}Service.queryById(${pkColumn.javaField}));
+    public R<${ClassName}Vo> getInfo(@Parameter(name = "涓婚敭")
+                                     @NotNull(message = "涓婚敭涓嶈兘涓虹┖")
+                                     @PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
+        return R.ok(i${ClassName}Service.queryById(${pkColumn.javaField}));
     }
 
     /**
      * 鏂板${functionName}
      */
-    @ApiOperation("鏂板${functionName}")
+    @Operation(summary = "鏂板${functionName}")
     @SaCheckPermission("${permissionPrefix}:add")
     @Log(title = "${functionName}", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) {
         return toAjax(i${ClassName}Service.insertByBo(bo) ? 1 : 0);
     }
 
     /**
      * 淇敼${functionName}
      */
-    @ApiOperation("淇敼${functionName}")
+    @Operation(summary = "淇敼${functionName}")
     @SaCheckPermission("${permissionPrefix}:edit")
     @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) {
         return toAjax(i${ClassName}Service.updateByBo(bo) ? 1 : 0);
     }
 
     /**
      * 鍒犻櫎${functionName}
      */
-    @ApiOperation("鍒犻櫎${functionName}")
+    @Operation(summary = "鍒犻櫎${functionName}")
     @SaCheckPermission("${permissionPrefix}:remove")
     @Log(title = "${functionName}", businessType = BusinessType.DELETE)
     @DeleteMapping("/{${pkColumn.javaField}s}")
-    public AjaxResult<Void> remove(@ApiParam("涓婚敭涓�")
+    public R<Void> remove(@Parameter(name = "涓婚敭涓�")
                                        @NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
                                        @PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
         return toAjax(i${ClassName}Service.deleteWithValidByIds(Arrays.asList(${pkColumn.javaField}s), true) ? 1 : 0);

--
Gitblit v1.9.3