From ef2c3b3e0dbd683dfd75b55eb538914eecd2b6fa Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 22 七月 2023 16:52:19 +0800
Subject: [PATCH] 修复接口文档bug
---
ard-work/pom.xml | 11 -----------
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 4 +---
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 7 +++++++
ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java | 4 ++++
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/ard-work/pom.xml b/ard-work/pom.xml
index c686bad..6cf0bd8 100644
--- a/ard-work/pom.xml
+++ b/ard-work/pom.xml
@@ -80,17 +80,6 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>io.springfox</groupId>-->
-<!-- <artifactId>springfox-core</artifactId>-->
-<!-- <version>3.0.0</version>-->
-<!-- <scope>compile</scope>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>com.github.xiaoymin</groupId>-->
-<!-- <artifactId>knife4j-spring</artifactId>-->
-<!-- <version>2.0.9</version>-->
-<!-- </dependency>-->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-annotations</artifactId>
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
index 1eb5f3e..10529ba 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
@@ -2,6 +2,9 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -27,6 +30,7 @@
* @author ard
* @date 2023-07-22
*/
+@Api(tags = "app浠诲姟绠＄悊")
@RestController
@RequestMapping("/app/task")
public class ArdAppTaskController extends BaseController
@@ -37,6 +41,7 @@
/**
* 鏌ヨapp浠诲姟绠＄悊鍒楄〃
*/
+ @ApiOperation("鏌ヨapp浠诲姟绠＄悊鍒楄〃")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/list")
public TableDataInfo list(ArdAppTask ardAppTask)
@@ -62,6 +67,7 @@
/**
* 鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅
*/
+ @ApiOperation("鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('app:task:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
@@ -72,6 +78,7 @@
/**
* 鏂板app浠诲姟绠＄悊
*/
+ @ApiOperation("鏂板app浠诲姟绠＄悊")
@PreAuthorize("@ss.hasPermi('app:task:add')")
@Log(title = "app浠诲姟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java
index 65f7bed..3dfe20e 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java
@@ -1,6 +1,8 @@
package com.ruoyi.app.task.domain;
import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -39,12 +41,14 @@
@Excel(name = "鐢ㄦ埛ID")
private String userId;
/** app浠诲姟鍥剧墖淇℃伅 */
+ @ApiModelProperty(notes = "app浠诲姟鍥剧墖淇℃伅")
private List<ArdAppTaskPic> ardAppTaskPicList;
/** app浠诲姟鍏宠仈澶氱敤鎴� */
private List<String> userIds;
/** app浠诲姟璇︽儏淇℃伅 */
+ @ApiModelProperty(notes = "app浠诲姟璇︽儏淇℃伅")
private List<ArdAppTaskDetail> ardAppTaskDetailList;
public List<ArdAppTaskPic> getArdAppTaskPicList()
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index 0dfe7a0..aaccd72 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -48,12 +48,10 @@
/** 璇锋眰鍙傛暟 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
- @ApiModelProperty(value = "鍔ㄦ�佸弬鏁�", name = "params", notes = "鏍规嵁涓嶅悓鐨勬煡璇㈠瓧娈佃嚜鐢遍厤缃弬鏁�")
private Map<String, Object> params;
- @ApiModelProperty(value = "椤电爜", name = "pageNum", notes = "椤电爜", required = true)
private Integer pageNum;
- @ApiModelProperty(value = "椤靛ぇ灏�", name = "pageSize", notes = "椤靛ぇ灏�", required = true)
+
private Integer pageSize;
public Integer getPageNum() {
--
Gitblit v1.9.3