From ccb88dea3ea2f4330b1790050c14812eac4ad61b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 15 六月 2023 16:59:09 +0800
Subject: [PATCH] swagger修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagcategoryController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivetagController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 5 -
smartor/src/main/java/com/smartor/domain/SvyLibTopic.java | 28 ++++----
smartor/src/main/java/com/smartor/domain/BaseTag.java | 108 ++++++------------------------------
7 files changed, 39 insertions(+), 110 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java
index dc4780f..cdb8c60 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java
@@ -32,7 +32,7 @@
* @author ruoyi
* @date 2023-06-06
*/
-@Api("鏍囩")
+@Api(description = "鏍囩")
@RestController
@RequestMapping("/base/tag")
public class BaseTagController extends BaseController {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagcategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagcategoryController.java
index 55ab4f1..ca41db4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagcategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagcategoryController.java
@@ -8,6 +8,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.BaseTagcategory;
import com.smartor.service.IBaseTagcategoryService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -22,6 +23,7 @@
* @author ruoyi
* @date 2023-06-15
*/
+@Api(description = "鏍囩鍒嗙被")
@RestController
@RequestMapping("/system/tagcategory")
public class BaseTagcategoryController extends BaseController {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
index aef35aa..914d3da 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
@@ -18,12 +18,9 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -35,7 +32,7 @@
* @author smartor
* @date 2023-03-04
*/
-@Api("鎮ｈ�呮。妗�")
+@Api(description = "鎮ｈ�呮。妗�")
@RestController
@RequestMapping("/smartor/patarchive")
public class PatArchiveController extends BaseController {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivetagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivetagController.java
index 6535ca2..8d113a5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivetagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivetagController.java
@@ -5,6 +5,7 @@
import com.smartor.domain.PatArchivetag;
import com.smartor.service.IPatArchivetagService;
+import io.swagger.annotations.Api;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -28,6 +29,7 @@
* @author ruoyi
* @date 2023-06-13
*/
+@Api(description = "鎮ｈ�呮。妗堟爣绛�")
@RestController
@RequestMapping("/system/archivetag")
public class PatArchivetagController extends BaseController {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java
index d309d69..7661d42 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java
@@ -36,7 +36,7 @@
* @author ruoyi
* @date 2023-03-03
*/
-@Api("闂嵎棰樼洰")
+@Api(description = "闂嵎棰樼洰")
@RestController
@RequestMapping("/smartor/svytopic")
public class SvyLibTopicController extends BaseController {
diff --git a/smartor/src/main/java/com/smartor/domain/BaseTag.java b/smartor/src/main/java/com/smartor/domain/BaseTag.java
index ac31b31..b40ea7e 100644
--- a/smartor/src/main/java/com/smartor/domain/BaseTag.java
+++ b/smartor/src/main/java/com/smartor/domain/BaseTag.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -16,140 +17,67 @@
* @author ruoyi
* @date 2023-06-02
*/
+
@ApiModel(value = "BaseTag", description = "鏍囩瀵硅薄")
+@Data
public class BaseTag extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 鑷ID
*/
- @ApiModelProperty(name = "鑷ID")
+ @ApiModelProperty("鑷ID")
+ @Excel(name = " 鑷ID ")
private Long tagid;
/**
* 鏍囩鍒嗙被ID
*/
- @ApiModelProperty(name = "鏍囩鍒嗙被ID")
+ @ApiModelProperty("鏍囩鍒嗙被ID")
+ @Excel(name = " 鏍囩鍒嗙被ID ")
private Long tagcategoryid;
/**
* 鏍囩鍚嶇О
*/
- @ApiModelProperty(name = "鏍囩鍚嶇О")
+ @ApiModelProperty("鏍囩鍚嶇О")
+ @Excel(name = " 鏍囩鍚嶇О ")
private String tagname;
/**
* 鏍囩鎻忚堪
*/
- @ApiModelProperty(name = "鏍囩鎻忚堪")
+ @ApiModelProperty("鏍囩鎻忚堪")
+ @Excel(name = " 鏍囩鎻忚堪 ")
private String tagdescription;
/**
* 鏈烘瀯ID
*/
- @ApiModelProperty(name = "鏈烘瀯ID")
+ @ApiModelProperty("鏈烘瀯ID")
+ @Excel(name = " 鏈烘瀯ID ")
private String orgid;
/**
* 鍒犻櫎鏍囪
*/
- @ApiModelProperty(name = "鍒犻櫎鏍囪")
+ @ApiModelProperty("鍒犻櫎鏍囪")
+ @Excel(name = " 鍒犻櫎鏍囪 ")
private String delFlag;
/**
* 涓婁紶鏍囪
*/
- @ApiModelProperty(name = "涓婁紶鏍囪")
+ @ApiModelProperty("涓婁紶鏍囪")
+ @Excel(name = " 涓婁紶鏍囪 ")
private Long isupload;
/**
* 涓婁紶鏃堕棿
*/
- @ApiModelProperty(name = "涓婁紶鏃堕棿")
+ @ApiModelProperty("涓婁紶鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
private Date uploadTime;
- /**
- * 鏄惁寮�鍚�
- */
- @ApiModelProperty(name = "鏄惁寮�鍚�")
- private Long isenable;
-
- public void setTagid(Long tagid) {
- this.tagid = tagid;
- }
-
- public Long getTagid() {
- return tagid;
- }
-
- public void setTagcategoryid(Long tagcategoryid) {
- this.tagcategoryid = tagcategoryid;
- }
-
- public Long getTagcategoryid() {
- return tagcategoryid;
- }
-
- public void setTagname(String tagname) {
- this.tagname = tagname;
- }
-
- public String getTagname() {
- return tagname;
- }
-
- public void setTagdescription(String tagdescription) {
- this.tagdescription = tagdescription;
- }
-
- public String getTagdescription() {
- return tagdescription;
- }
-
- public void setOrgid(String orgid) {
- this.orgid = orgid;
- }
-
- public String getOrgid() {
- return orgid;
- }
-
- public void setDelFlag(String delFlag) {
- this.delFlag = delFlag;
- }
-
- public String getDelFlag() {
- return delFlag;
- }
-
- public void setIsupload(Long isupload) {
- this.isupload = isupload;
- }
-
- public Long getIsupload() {
- return isupload;
- }
-
- public void setUploadTime(Date uploadTime) {
- this.uploadTime = uploadTime;
- }
-
- public Date getUploadTime() {
- return uploadTime;
- }
-
- public void setIsenable(Long isenable) {
- this.isenable = isenable;
- }
-
- public Long getIsenable() {
- return isenable;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("tagid", getTagid()).append("tagcategoryid", getTagcategoryid()).append("tagname", getTagname()).append("tagdescription", getTagdescription()).append("orgid", getOrgid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).append("isenable", getIsenable()).toString();
- }
}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTopic.java b/smartor/src/main/java/com/smartor/domain/SvyLibTopic.java
index 18ea98a..34e3da8 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTopic.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTopic.java
@@ -25,91 +25,91 @@
/**
* 鑷ID
*/
- @ApiModelProperty(name = "鑷ID")
+ @ApiModelProperty("鑷ID")
private Long topicid;
/**
* 鑰佺増鏈琁D
*/
- @ApiModelProperty(name = "鑰佺増鏈琁D")
+ @ApiModelProperty("鑰佺増鏈琁D")
private Long oldid;
/**
* 闂嵎ID
*/
@Excel(name = " 闂嵎ID ")
- @ApiModelProperty(name = "闂嵎ID")
+ @ApiModelProperty("闂嵎ID")
private Long svyid;
/**
* 棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖
*/
@Excel(name = " 棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖ ")
- @ApiModelProperty(name = "棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖")
+ @ApiModelProperty("棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖")
private Long topictype;
/**
* 棰樼洰Code
*/
- @ApiModelProperty(name = "棰樼洰Code")
+ @ApiModelProperty("棰樼洰Code")
private String topiccode;
/**
* 棰樼洰
*/
@Excel(name = " 棰樼洰 ")
- @ApiModelProperty(name = "棰樼洰")
+ @ApiModelProperty("棰樼洰")
private String topic;
/**
* 鎺掑簭
*/
@Excel(name = " 鎺掑簭 ")
- @ApiModelProperty(name = "鎺掑簭")
+ @ApiModelProperty("鎺掑簭")
private Long sort;
/**
* 鏄惁蹇呭～
*/
- @ApiModelProperty(name = "鏄惁蹇呭～")
+ @ApiModelProperty("鏄惁蹇呭～")
private Long ismandatory;
/**
* 鏄惁闅愯棌
*/
@Excel(name = " 鏄惁闅愯棌 ")
- @ApiModelProperty(name = "鏄惁闅愯棌")
+ @ApiModelProperty("鏄惁闅愯棌")
private Long ishide;
/**
* 鍒犻櫎鏍囪
*/
- @ApiModelProperty(name = "鍒犻櫎鏍囪")
+ @ApiModelProperty("鍒犻櫎鏍囪")
private String delFlag;
/**
* 鏈烘瀯ID
*/
@Excel(name = " 鏈烘瀯ID ")
- @ApiModelProperty(name = "鏈烘瀯ID")
+ @ApiModelProperty("鏈烘瀯ID")
private String orgid;
/**
* 涓婁紶鏍囪
*/
- @ApiModelProperty(name = "涓婁紶鏍囪")
+ @ApiModelProperty("涓婁紶鏍囪")
private Long isupload;
/**
* 涓婁紶鏍囪
*/
- @ApiModelProperty(name = "鏍囩")
+ @ApiModelProperty("鏍囩")
private String tag;
/**
* 涓婁紶鏃堕棿
*/
- @ApiModelProperty(name = "涓婁紶鏃堕棿")
+ @ApiModelProperty("涓婁紶鏃堕棿")
private Date uploadTime;
--
Gitblit v1.9.3