♻️ Refactoring code. 使用openapi3 替代swagger2

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/AccessAuthorityController.java

@@ -11,7 +11,7 @@ import com.anjiplus.template.gaea.business.modules.accessauthority.controller.dt
 import com.anjiplus.template.gaea.business.modules.accessauthority.controller.param.AccessAuthorityParam;
 import com.anjiplus.template.gaea.business.modules.accessauthority.dao.entity.AccessAuthority;
 import com.anjiplus.template.gaea.business.modules.accessauthority.service.AccessAuthorityService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,7 +25,7 @@ import java.util.List;
  * @date 2019-02-17 08:50:10.009
  **/
 @RestController
-@Api(tags = "权限管理管理")
+@Tag(name =  "权限管理管理")
 @RequestMapping("/accessAuthority")
 @Permission(code = "authorityManage", name = "权限管理")
 public class AccessAuthorityController

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/dto/AccessAuthorityDto.java

@@ -2,7 +2,7 @@
 package com.anjiplus.template.gaea.business.modules.accessauthority.controller.dto;
 
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -18,39 +18,39 @@ import java.io.Serializable;
 public class AccessAuthorityDto extends GaeaBaseDTO implements Serializable {
 
 	/** 父菜单代码 */
-	@ApiModelProperty(value = "父菜单代码")
+	@Schema(description = "父菜单代码")
 	private String parentTarget;
 
 	/** 目标菜单 */
-	@ApiModelProperty(value = "菜单代码")
+	@Schema(description = "菜单代码")
 	@NotEmpty(message = "6002")
 	private String target;
 
 	/** 目标菜单名称 */
-	@ApiModelProperty(value = "菜单名称")
+	@Schema(description = "菜单名称")
 	@NotEmpty(message = "6002")
 	private String targetName;
 
 	/** 目标按钮 */
-	@ApiModelProperty(value = "按钮代码")
+	@Schema(description = "按钮代码")
 	@NotEmpty(message = "6002")
 	private String action;
 
 	/** 目标按钮名称 */
-	@ApiModelProperty(value = "按钮名称")
+	@Schema(description = "按钮名称")
 	@NotEmpty(message = "6002")
 	private String actionName;
 
 	/** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG */
-	@ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
+	@Schema(description = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
 	private Integer deleteFlag;
 
 	/** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	@NotNull(message = "6002")
 	private Integer enableFlag;
 
-	@ApiModelProperty(value = "sort")
+	@Schema(description = "sort")
 	private Integer sort;
 
 }

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/AccessRoleController.java

@@ -10,7 +10,7 @@ import com.anjiplus.template.gaea.business.modules.accessrole.controller.dto.Acc
 import com.anjiplus.template.gaea.business.modules.accessrole.controller.param.AccessRoleParam;
 import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRole;
 import com.anjiplus.template.gaea.business.modules.accessrole.service.AccessRoleService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,7 +22,7 @@ import java.util.Map;
  * @date 2019-02-17 08:50:14.136
  **/
 @RestController
-@Api(tags = "角色管理管理")
+@Tag(name =  "角色管理管理")
 @RequestMapping("/accessRole")
 @Permission(code = "roleManage", name = "角色管理")
 public class AccessRoleController extends GaeaBaseController<AccessRoleParam, AccessRole, AccessRoleDto> {

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/dto/AccessRoleDto.java

@@ -2,7 +2,7 @@
 package com.anjiplus.template.gaea.business.modules.accessrole.controller.dto;
 
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -19,21 +19,21 @@ import java.util.List;
 public class AccessRoleDto extends GaeaBaseDTO implements Serializable {
 
 	/** 角色编码 */
-	@ApiModelProperty(value = "角色编码")
+	@Schema(description = "角色编码")
 	@NotEmpty(message = "6002")
 	private String roleCode;
 
 	/** 角色名称 */
-	@ApiModelProperty(value = "角色名称")
+	@Schema(description = "角色名称")
 	@NotEmpty(message = "6002")
 	private String roleName;
 
 	/** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG */
-	@ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
+	@Schema(description = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
 	private Integer deleteFlag;
 
 	/** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	@NotNull(message = "6002")
 	private Integer enableFlag;
 

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/AccessUserController.java

@@ -12,7 +12,7 @@ import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.Upd
 import com.anjiplus.template.gaea.business.modules.accessuser.controller.param.AccessUserParam;
 import com.anjiplus.template.gaea.business.modules.accessuser.dao.entity.AccessUser;
 import com.anjiplus.template.gaea.business.modules.accessuser.service.AccessUserService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -25,7 +25,7 @@ import java.util.Map;
  * @date 2019-02-17 08:50:11.902
  **/
 @RestController
-@Api(tags = "用户管理管理")
+@Tag(name =  "用户管理管理")
 @RequestMapping("/accessUser")
 @Permission(code = "userManage", name = "用户管理")
 public class AccessUserController extends GaeaBaseController<AccessUserParam, AccessUser, AccessUserDto> {

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/AccessUserDto.java

@@ -2,7 +2,7 @@
 package com.anjiplus.template.gaea.business.modules.accessuser.controller.dto;
 
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -20,42 +20,42 @@ import java.util.List;
 public class AccessUserDto extends GaeaBaseDTO implements Serializable {
 
 	/**  登录名 */
-	@ApiModelProperty(value = " 登录名")
+	@Schema(description = " 登录名")
 	@NotEmpty(message = "6002")
 	private String loginName;
 
 	/** 真实用户 */
-	@ApiModelProperty(value = "真实用户")
+	@Schema(description = "真实用户")
 	@NotEmpty(message = "6002")
 	private String realName;
 
 	/** 手机号码 */
-	@ApiModelProperty(value = "手机号码")
+	@Schema(description = "手机号码")
 	private String phone;
 
 	/** 用户邮箱 */
-	@ApiModelProperty(value = "用户邮箱")
+	@Schema(description = "用户邮箱")
 	private String email;
 
 	/** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	@NotNull(message = "6002")
 	private Integer enableFlag;
 
 	/** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG */
-	@ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
+	@Schema(description = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
 	private Integer deleteFlag;
 
 	/** 最后一次登录IP */
-	@ApiModelProperty(value = "最后一次登录IP")
+	@Schema(description = "最后一次登录IP")
 	private String lastLoginIp;
 
 	/** 最后一次登陆时间 */
-	@ApiModelProperty(value = "最后一次登陆时间")
+	@Schema(description = "最后一次登陆时间")
 	private Date lastLoginTime;
 
 	/** 备注 */
-	@ApiModelProperty(value = "备注")
+	@Schema(description = "备注")
 	private String remark;
 
 	/** 用户勾选的角色 */

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/GaeaUserDto.java

@@ -1,21 +1,20 @@
 package com.anjiplus.template.gaea.business.modules.accessuser.controller.dto;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.util.List;
 
-@ApiModel(value = "用户登录")
+@Schema(description = "用户登录")
 @Data
 public class GaeaUserDto {
 
-	@ApiModelProperty(value = "登录名")
+	@Schema(description = "登录名")
 	@NotBlank
 	private String loginName;
 
-	@ApiModelProperty(value = "密码")
+	@Schema(description = "密码")
 	@NotBlank
 	private String password;
 

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/UpdatePasswordDto.java

@@ -1,24 +1,23 @@
 package com.anjiplus.template.gaea.business.modules.accessuser.controller.dto;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 
-@ApiModel(value = "修改密码")
+@Schema(description = "修改密码")
 @Data
 public class UpdatePasswordDto {
 
-	@ApiModelProperty(value = "旧密码密码")
+	@Schema(description = "旧密码密码")
 	@NotBlank
 	private String oldPassword;
 
-	@ApiModelProperty(value = "密码")
+	@Schema(description = "密码")
 	@NotBlank
 	private String password;
 
-	@ApiModelProperty(value = "密码")
+	@Schema(description = "密码")
 	@NotBlank
 	private String confirmPassword;
 

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java

@@ -9,7 +9,7 @@ import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.Repo
 import com.anjiplus.template.gaea.business.modules.dashboard.service.ReportDashboardService;
 import com.anjiplus.template.gaea.business.modules.reportshare.controller.dto.ReportShareDto;
 import com.anjiplus.template.gaea.business.modules.reportshare.service.ReportShareService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse;
  * @date 2021-04-12 14:52:21.761
  **/
 @RestController
-@Api(tags = "大屏设计管理")
+@Tag(name =  "大屏设计管理")
 @Permission(code = "bigScreenManage", name = "大屏报表")
 @RequestMapping("/reportDashboard")
 public class ReportDashboardController {

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java

@@ -5,7 +5,7 @@ import com.anji.plus.gaea.annotation.Unique;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.anjiplus.template.gaea.business.code.ResponseCode;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -17,38 +17,38 @@ import lombok.Data;
 @Data
 public class ReportDashboard extends GaeaBaseEntity {
 
-	@ApiModelProperty(value = "报表编码")
+	@Schema(description = "报表编码")
 	@Unique(code = ResponseCode.REPORT_CODE_ISEXIST)
 	private String reportCode;
 
-	@ApiModelProperty(value = "看板标题")
+	@Schema(description = "看板标题")
 	private String title;
 
-	@ApiModelProperty(value = "宽度px")
+	@Schema(description = "宽度px")
 	private Long width;
 
-	@ApiModelProperty(value = "高度px")
+	@Schema(description = "高度px")
 	private Long height;
 
-	@ApiModelProperty(value = "背景色")
+	@Schema(description = "背景色")
 	private String backgroundColor;
 
-	@ApiModelProperty(value = "背景图片")
+	@Schema(description = "背景图片")
 	private String backgroundImage;
 
-	@ApiModelProperty(value = "工作台中的辅助线")
+	@Schema(description = "工作台中的辅助线")
 	private String presetLine;
 
-	@ApiModelProperty(value = "自动刷新间隔秒，数据字典REFRESH_TYPE")
+	@Schema(description = "自动刷新间隔秒，数据字典REFRESH_TYPE")
 	private Integer refreshSeconds;
 
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;
 
-	@ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
+	@Schema(description = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
 	private Integer deleteFlag;
 
-	@ApiModelProperty(value = "排序，降序")
+	@Schema(description = "排序，降序")
 	private Integer sort;
 
 }

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java

@@ -3,7 +3,7 @@ package com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity;
 
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -15,36 +15,36 @@ import lombok.Data;
 @Data
 public class ReportDashboardWidget extends GaeaBaseEntity {
 
-	@ApiModelProperty(value = "报表编码")
+	@Schema(description = "报表编码")
 	private String reportCode;
 
-	@ApiModelProperty(value = "组件类型参考字典DASHBOARD_PANEL_TYPE")
+	@Schema(description = "组件类型参考字典DASHBOARD_PANEL_TYPE")
 	private String type;
 
-	@ApiModelProperty(value = "组件的渲染属性json")
+	@Schema(description = "组件的渲染属性json")
 	private String setup;
 
-	@ApiModelProperty(value = "组件的数据属性json")
+	@Schema(description = "组件的数据属性json")
 	private String data;
 
-	@ApiModelProperty(value = "组件的配置属性json")
+	@Schema(description = "组件的配置属性json")
 	private String collapse;
 
-	@ApiModelProperty(value = "组件的大小位置属性json")
+	@Schema(description = "组件的大小位置属性json")
 	private String position;
 
 	private String options;
 
-	@ApiModelProperty(value = "自动刷新间隔秒")
+	@Schema(description = "自动刷新间隔秒")
 	private Integer refreshSeconds;
 
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;
 
-	@ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
+	@Schema(description = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
 	private Integer deleteFlag;
 
-	@ApiModelProperty(value = "排序，图层的概念")
+	@Schema(description = "排序，图层的概念")
 	private Long sort;
 
 }

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/DataSetController.java

@@ -14,7 +14,7 @@ import com.anjiplus.template.gaea.business.modules.dataset.controller.param.Data
 import com.anjiplus.template.gaea.business.modules.dataset.controller.param.DataSetTestTransformParam;
 import com.anjiplus.template.gaea.business.modules.dataset.dao.entity.DataSet;
 import com.anjiplus.template.gaea.business.modules.dataset.service.DataSetService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2021-03-18 12:11:31.150755900
  **/
 @RestController
-@Api(tags = "数据集管理")
+@Tag(name =  "数据集管理")
 @Permission(code = "resultsetManage", name = "数据集管理")
 @RequestMapping("/dataSet")
 public class DataSetController extends GaeaBaseController<DataSetParam, DataSet, DataSetDto> {

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java

@@ -5,7 +5,7 @@ import com.anji.plus.gaea.annotation.Unique;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.anjiplus.template.gaea.business.code.ResponseCode;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -17,32 +17,32 @@ import lombok.Data;
 @Data
 public class DataSet extends GaeaBaseEntity {
 
-	@ApiModelProperty(value = "数据集编码")
+	@Schema(description = "数据集编码")
 	@Unique(code = ResponseCode.SET_CODE_ISEXIST)
 	private String setCode;
 
-	@ApiModelProperty(value = "数据集名称")
+	@Schema(description = "数据集名称")
 	private String setName;
 
-	@ApiModelProperty(value = "数据集描述")
+	@Schema(description = "数据集描述")
 	private String setDesc;
 
-	@ApiModelProperty(value = "数据集类型")
+	@Schema(description = "数据集类型")
 	private String setType;
 
-	@ApiModelProperty(value = "数据源编码")
+	@Schema(description = "数据源编码")
 	private String sourceCode;
 
-	@ApiModelProperty(value = "动态查询sql或者接口中的请求体")
+	@Schema(description = "动态查询sql或者接口中的请求体")
 	private String dynSentence;
 
-	@ApiModelProperty(value = "结果案例")
+	@Schema(description = "结果案例")
 	private String caseResult;
 
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;
 
-	@ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
+	@Schema(description = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
 	private Integer deleteFlag;
 
 }

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/DataSetParamController.java

@@ -9,7 +9,7 @@ import com.anjiplus.template.gaea.business.modules.datasetparam.controller.param
 import com.anjiplus.template.gaea.business.modules.datasetparam.controller.param.DataSetParamValidationParam;
 import com.anjiplus.template.gaea.business.modules.datasetparam.dao.entity.DataSetParam;
 import com.anjiplus.template.gaea.business.modules.datasetparam.service.DataSetParamService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2021-03-18 12:12:33.108033200
  **/
 @RestController
-@Api(tags = "数据集动态参数管理")
+@Tag(name =  "数据集动态参数管理")
 @RequestMapping("/dataSetParam")
 public class DataSetParamController extends GaeaBaseController<DataSetParamParam, DataSetParam, DataSetParamDto> {
 

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/entity/DataSetParam.java

@@ -3,7 +3,7 @@ package com.anjiplus.template.gaea.business.modules.datasetparam.dao.entity;
 
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -15,34 +15,34 @@ import lombok.Data;
 @Data
 public class DataSetParam extends GaeaBaseEntity {
 
-	@ApiModelProperty(value = "数据集编码")
+	@Schema(description = "数据集编码")
 	private String setCode;
 
-	@ApiModelProperty(value = "参数名")
+	@Schema(description = "参数名")
 	private String paramName;
 
-	@ApiModelProperty(value = "参数描述")
+	@Schema(description = "参数描述")
 	private String paramDesc;
 
-	@ApiModelProperty(value = "参数类型，字典=")
+	@Schema(description = "参数类型，字典=")
 	private String paramType;
 
-	@ApiModelProperty(value = "参数示例项")
+	@Schema(description = "参数示例项")
 	private String sampleItem;
 
-	@ApiModelProperty(value = "0--非必填 1--必填 DIC_NAME=REQUIRED_FLAG")
+	@Schema(description = "0--非必填 1--必填 DIC_NAME=REQUIRED_FLAG")
 	private Integer requiredFlag;
 
-	@ApiModelProperty(value = "js校验字段值规则，满足校验返回 true")
+	@Schema(description = "js校验字段值规则，满足校验返回 true")
 	private String validationRules;
 
-	@ApiModelProperty(value = "排序")
+	@Schema(description = "排序")
 	private Integer orderNum;
 
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;
 
-	@ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
+	@Schema(description = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
 	private Integer deleteFlag;
 
 }

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/DataSetTransformController.java

@@ -7,7 +7,7 @@ import com.anjiplus.template.gaea.business.modules.datasettransform.controller.d
 import com.anjiplus.template.gaea.business.modules.datasettransform.controller.param.DataSetTransformParam;
 import com.anjiplus.template.gaea.business.modules.datasettransform.dao.entity.DataSetTransform;
 import com.anjiplus.template.gaea.business.modules.datasettransform.service.DataSetTransformService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2021-03-18 12:13:15.591309400
  **/
 @RestController
-@Api(tags = "数据集数据转换管理")
+@Tag(name =  "数据集数据转换管理")
 @RequestMapping("/dataSetTransform")
 public class DataSetTransformController
 		extends GaeaBaseController<DataSetTransformParam, DataSetTransform, DataSetTransformDto> {

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/entity/DataSetTransform.java

@@ -3,7 +3,7 @@ package com.anjiplus.template.gaea.business.modules.datasettransform.dao.entity;
 
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -15,22 +15,22 @@ import lombok.Data;
 @Data
 public class DataSetTransform extends GaeaBaseEntity {
 
-	@ApiModelProperty(value = "数据集编码")
+	@Schema(description = "数据集编码")
 	private String setCode;
 
-	@ApiModelProperty(value = "数据转换类型，DIC_NAME=TRANSFORM_TYPE; js，javaBean，字典转换")
+	@Schema(description = "数据转换类型，DIC_NAME=TRANSFORM_TYPE; js，javaBean，字典转换")
 	private String transformType;
 
-	@ApiModelProperty(value = "数据转换script,处理逻辑")
+	@Schema(description = "数据转换script,处理逻辑")
 	private String transformScript;
 
-	@ApiModelProperty(value = "排序,执行数据转换顺序")
+	@Schema(description = "排序,执行数据转换顺序")
 	private Integer orderNum;
 
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;
 
-	@ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
+	@Schema(description = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
 	private Integer deleteFlag;
 
 }

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/DataSourceController.java

@@ -10,7 +10,7 @@ import com.anjiplus.template.gaea.business.modules.datasource.controller.param.C
 import com.anjiplus.template.gaea.business.modules.datasource.controller.param.DataSourceParam;
 import com.anjiplus.template.gaea.business.modules.datasource.dao.entity.DataSource;
 import com.anjiplus.template.gaea.business.modules.datasource.service.DataSourceService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2021-03-18 12:09:57.728203200
  **/
 @RestController
-@Api(tags = "数据源管理")
+@Tag(name =  "数据源管理")
 @Permission(code = "datasourceManage", name = "数据源管理")
 @RequestMapping("/dataSource")
 public class DataSourceController extends GaeaBaseController<DataSourceParam, DataSource, DataSourceDto> {

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/entity/DataSource.java

@@ -5,7 +5,7 @@ import com.anji.plus.gaea.annotation.Unique;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.anjiplus.template.gaea.business.code.ResponseCode;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -17,28 +17,28 @@ import lombok.Data;
 @Data
 public class DataSource extends GaeaBaseEntity {
 
-	@ApiModelProperty(value = "数据源编码")
+	@Schema(description = "数据源编码")
 	@Unique(code = ResponseCode.SOURCE_CODE_ISEXIST)
 	private String sourceCode;
 
-	@ApiModelProperty(value = "数据源名称")
+	@Schema(description = "数据源名称")
 	private String sourceName;
 
-	@ApiModelProperty(value = "数据源描述")
+	@Schema(description = "数据源描述")
 	private String sourceDesc;
 
-	@ApiModelProperty(
-			value = "数据源类型 DIC_NAME=SOURCE_TYPE; mysql，orace，sqlserver，elasticsearch，接口，javaBean，数据源类型字典中item-extend动态生成表单")
+	@Schema(
+			description = "数据源类型 DIC_NAME=SOURCE_TYPE; mysql，orace，sqlserver，elasticsearch，接口，javaBean，数据源类型字典中item-extend动态生成表单")
 	private String sourceType;
 
-	@ApiModelProperty(
-			value = "数据源连接配置json：关系库{ jdbcUrl:'', username:'', password:'','driverName':''}ES-sql{ apiUrl:'http://127.0.0.1:9092/_xpack/sql?format=json','method':'POST','body':'{\"query\":\"select 1\"}' }  接口{ apiUrl:'http://ip:port/url', method:'' } javaBean{ beanNamw:'xxx' }")
+	@Schema(
+			description = "数据源连接配置json：关系库{ jdbcUrl:'', username:'', password:'','driverName':''}ES-sql{ apiUrl:'http://127.0.0.1:9092/_xpack/sql?format=json','method':'POST','body':'{\"query\":\"select 1\"}' }  接口{ apiUrl:'http://ip:port/url', method:'' } javaBean{ beanNamw:'xxx' }")
 	private String sourceConfig;
 
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;
 
-	@ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
+	@Schema(description = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
 	private Integer deleteFlag;
 
 }

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/GaeaDictController.java

@@ -10,7 +10,7 @@ import com.anjiplus.template.gaea.business.modules.dict.controller.param.GaeaDic
 import com.anjiplus.template.gaea.business.modules.dict.dao.entity.GaeaDict;
 import com.anjiplus.template.gaea.business.modules.dict.service.GaeaDictItemService;
 import com.anjiplus.template.gaea.business.modules.dict.service.GaeaDictService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.*;
@@ -28,7 +28,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/gaeaDict")
-@Api(value = "/gaeaDict", tags = "")
+@Tag(description  = "/gaeaDict", name =  "")
 public class GaeaDictController extends GaeaBaseController<GaeaDictParam, GaeaDict, GaeaDictDTO> {
 
 	@Autowired

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/GaeaDictItemController.java

@@ -6,7 +6,7 @@ import com.anjiplus.template.gaea.business.modules.dict.controller.dto.GaeaDictI
 import com.anjiplus.template.gaea.business.modules.dict.controller.param.GaeaDictItemParam;
 import com.anjiplus.template.gaea.business.modules.dict.dao.entity.GaeaDictItem;
 import com.anjiplus.template.gaea.business.modules.dict.service.GaeaDictItemService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/gaeaDictItem")
-@Api(value = "/gaeaDictItem", tags = "数据字典项")
+@Tag(description  = "/gaeaDictItem", name =  "数据字典项")
 public class GaeaDictItemController extends GaeaBaseController<GaeaDictItemParam, GaeaDictItem, GaeaDictItemDTO> {
 
 	@Autowired

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/dto/GaeaDictDTO.java

@@ -1,8 +1,7 @@
 package com.anjiplus.template.gaea.business.modules.dict.controller.dto;
 
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -13,26 +12,26 @@ import java.io.Serializable;
  * @author lr
  * @since 2021-02-23 10:01:02
  */
-@ApiModel(value = "")
+@Schema(description = "")
 @Data
 public class GaeaDictDTO extends GaeaBaseDTO implements Serializable {
 
 	/**
 	 * 字典名称
 	 */
-	@ApiModelProperty(value = "字典名称")
+	@Schema(description = "字典名称")
 	private String dictName;
 
 	/**
 	 * 字典编号
 	 */
-	@ApiModelProperty(value = "字典编号")
+	@Schema(description = "字典编号")
 	private String dictCode;
 
 	/**
 	 * 字典描述
 	 */
-	@ApiModelProperty(value = "字典描述")
+	@Schema(description = "字典描述")
 	private String remark;
 
 }

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/dto/GaeaDictItemDTO.java

@@ -1,8 +1,7 @@
 package com.anjiplus.template.gaea.business.modules.dict.controller.dto;
 
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -13,50 +12,50 @@ import java.io.Serializable;
  * @author lirui
  * @since 2021-03-10 13:05:59
  */
-@ApiModel(value = "数据字典项")
+@Schema(description = "数据字典项")
 @Data
 public class GaeaDictItemDTO extends GaeaBaseDTO implements Serializable {
 
 	/**
 	 * 数据字典编码
 	 */
-	@ApiModelProperty(value = "数据字典编码")
+	@Schema(description = "数据字典编码")
 	private String dictCode;
 
 	/**
 	 * 字典项名称
 	 */
-	@ApiModelProperty(value = "字典项名称")
+	@Schema(description = "字典项名称")
 	private String itemName;
 
 	/**
 	 * 字典项值
 	 */
-	@ApiModelProperty(value = "字典项值")
+	@Schema(description = "字典项值")
 	private String itemValue;
 
 	/**
 	 * 字典项扩展
 	 */
-	@ApiModelProperty(value = "字典项扩展")
+	@Schema(description = "字典项扩展")
 	private String itemExtend;
 
 	/**
 	 * 语言标识
 	 */
-	@ApiModelProperty(value = "语言标识")
+	@Schema(description = "语言标识")
 	private String locale;
 
 	/**
 	 * 描述
 	 */
-	@ApiModelProperty(value = "描述")
+	@Schema(description = "描述")
 	private String remark;
 
 	/**
 	 * 排序
 	 */
-	@ApiModelProperty(value = "排序")
+	@Schema(description = "排序")
 	private Integer sort;
 
 	/**

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/file/controller/GaeaFileController.java

@@ -8,7 +8,7 @@ import com.anjiplus.template.gaea.business.modules.file.controller.dto.GaeaFileD
 import com.anjiplus.template.gaea.business.modules.file.controller.param.GaeaFileParam;
 import com.anjiplus.template.gaea.business.modules.file.entity.GaeaFile;
 import com.anjiplus.template.gaea.business.modules.file.service.GaeaFileService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @RestController
 @RequestMapping("/file")
-@Api(value = "/file", tags = "")
+@Tag(description  = "/file", name =  "")
 public class GaeaFileController extends BaseController<GaeaFileParam, GaeaFile, GaeaFileDTO> {
 
 	@Autowired

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/file/entity/GaeaFile.java

@@ -2,7 +2,7 @@ package com.anjiplus.template.gaea.business.modules.file.entity;
 
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,19 +17,19 @@ import java.io.Serializable;
 @Data
 public class GaeaFile extends GaeaBaseEntity implements Serializable {
 
-	@ApiModelProperty(value = "文件标识")
+	@Schema(description = "文件标识")
 	private String fileId;
 
-	@ApiModelProperty(value = "文件类型")
+	@Schema(description = "文件类型")
 	private String fileType;
 
-	@ApiModelProperty(value = "文件路径")
+	@Schema(description = "文件路径")
 	private String filePath;
 
-	@ApiModelProperty(value = "url路径")
+	@Schema(description = "url路径")
 	private String urlPath;
 
-	@ApiModelProperty(value = "内容说明")
+	@Schema(description = "内容说明")
 	private String fileInstruction;
 
 }

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/ReportController.java

@@ -9,7 +9,7 @@ import com.anjiplus.template.gaea.business.modules.report.controller.dto.ReportD
 import com.anjiplus.template.gaea.business.modules.report.controller.param.ReportParam;
 import com.anjiplus.template.gaea.business.modules.report.dao.entity.Report;
 import com.anjiplus.template.gaea.business.modules.report.service.ReportService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2021/3/26 10:19
  */
 @RestController
-@Api(tags = "报表数据管理")
+@Tag(name =  "报表数据管理")
 @Permission(code = "reportManage", name = "报表管理")
 @RequestMapping("/report")
 public class ReportController extends GaeaBaseController<ReportParam, Report, ReportDto> {

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/report/dao/entity/Report.java

@@ -4,7 +4,7 @@ import com.anji.plus.gaea.annotation.Unique;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.anjiplus.template.gaea.business.code.ResponseCode;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -17,35 +17,35 @@ import lombok.Data;
 @Data
 public class Report extends GaeaBaseEntity {
 
-	@ApiModelProperty(value = "名称")
+	@Schema(description = "名称")
 	private String reportName;
 
-	@ApiModelProperty(value = "报表编码")
+	@Schema(description = "报表编码")
 	@Unique(code = ResponseCode.REPORT_CODE_ISEXIST)
 	private String reportCode;
 
-	@ApiModelProperty(value = "分组")
+	@Schema(description = "分组")
 	private String reportGroup;
 
-	@ApiModelProperty(value = "报表描述")
+	@Schema(description = "报表描述")
 	private String reportDesc;
 
-	@ApiModelProperty(value = "报表类型")
+	@Schema(description = "报表类型")
 	private String reportType;
 
-	@ApiModelProperty(value = "报表缩略图")
+	@Schema(description = "报表缩略图")
 	private String reportImage;
 
-	@ApiModelProperty(value = "报表作者")
+	@Schema(description = "报表作者")
 	private String reportAuthor;
 
-	@ApiModelProperty(value = "下载次数")
+	@Schema(description = "下载次数")
 	private Long downloadCount;
 
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;
 
-	@ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
+	@Schema(description = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
 	private Integer deleteFlag;
 
 }

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/ReportExcelController.java

@@ -12,7 +12,7 @@ import com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity.Report
 import com.anjiplus.template.gaea.business.modules.reportexcel.service.ReportExcelService;
 import com.anjiplus.template.gaea.business.modules.reportshare.controller.dto.ReportShareDto;
 import com.anjiplus.template.gaea.business.modules.reportshare.service.ReportShareService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2021/4/13 15:12
  */
 @RestController
-@Api(tags = "报表表格管理")
+@Tag(name =  "报表表格管理")
 @Permission(code = "excelManage", name = "报表管理")
 @RequestMapping("/reportExcel")
 public class ReportExcelController extends GaeaBaseController<ReportExcelParam, ReportExcel, ReportExcelDto> {

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/dao/entity/ReportExcel.java

@@ -2,7 +2,7 @@ package com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity;
 
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -13,22 +13,22 @@ import lombok.Data;
 @Data
 public class ReportExcel extends GaeaBaseEntity {
 
-	@ApiModelProperty(value = "报表编码")
+	@Schema(description = "报表编码")
 	private String reportCode;
 
-	@ApiModelProperty(value = "数据集编码，以|分割")
+	@Schema(description = "数据集编码，以|分割")
 	private String setCodes;
 
-	@ApiModelProperty(value = "数据集查询参数")
+	@Schema(description = "数据集查询参数")
 	private String setParam;
 
-	@ApiModelProperty(value = "报表json字符串")
+	@Schema(description = "报表json字符串")
 	private String jsonStr;
 
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;
 
-	@ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
+	@Schema(description = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
 	private Integer deleteFlag;
 
 }

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/controller/ReportShareController.java

@@ -12,7 +12,7 @@ import com.anjiplus.template.gaea.business.modules.reportshare.controller.dto.Re
 import com.anjiplus.template.gaea.business.modules.reportshare.controller.param.ReportShareParam;
 import com.anjiplus.template.gaea.business.modules.reportshare.dao.entity.ReportShare;
 import com.anjiplus.template.gaea.business.modules.reportshare.service.ReportShareService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2021-08-18 13:37:26.663
  **/
 @RestController
-@Api(tags = "报表分享管理")
+@Tag(name =  "报表分享管理")
 @RequestMapping("/reportShare")
 @Permission(code = "reportShareManage", name = "报表分享管理")
 public class ReportShareController extends GaeaBaseController<ReportShareParam, ReportShare, ReportShareDto> {

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/controller/dto/ReportShareDto.java

@@ -2,7 +2,7 @@
 package com.anjiplus.template.gaea.business.modules.reportshare.controller.dto;
 
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -19,38 +19,38 @@ import java.util.Date;
 public class ReportShareDto extends GaeaBaseDTO implements Serializable {
 
 	/** 分享编码，系统生成，默认UUID */
-	@ApiModelProperty(value = "分享编码，系统生成，默认UUID")
+	@Schema(description = "分享编码，系统生成，默认UUID")
 	private String shareCode;
 
 	/** 分享有效期类型，DIC_NAME=SHARE_VAILD */
-	@ApiModelProperty(value = "分享有效期类型，DIC_NAME=SHARE_VAILD")
+	@Schema(description = "分享有效期类型，DIC_NAME=SHARE_VAILD")
 	@NotNull(message = "6002")
 	private Integer shareValidType;
 
 	/** 分享有效期 */
-	@ApiModelProperty(value = "分享有效期")
+	@Schema(description = "分享有效期")
 	private Date shareValidTime;
 
 	/** 分享token */
-	@ApiModelProperty(value = "分享token")
+	@Schema(description = "分享token")
 	private String shareToken;
 
 	/** 分享url */
-	@ApiModelProperty(value = "分享url")
+	@Schema(description = "分享url")
 	@NotEmpty(message = "6002")
 	private String shareUrl;
 
 	/** 报表编码 */
-	@ApiModelProperty(value = "报表编码")
+	@Schema(description = "报表编码")
 	@NotEmpty(message = "6002")
 	private String reportCode;
 
 	/** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;
 
 	/** 0--未删除 1--已删除 DIC_NAME=DELETE_FLAG */
-	@ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
+	@Schema(description = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
 	private Integer deleteFlag;
 
 	/** 分享码 */