From a5560a4b12c4bd6794a082f95e168a8a06ce2efe Mon Sep 17 00:00:00 2001 From: Devli <5003188+lide1202@user.noreply.gitee.com> Date: Mon, 26 Aug 2024 09:20:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4swagger=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataset/controller/DataSetController.java | 4 ++-- .../modules/dataset/dao/entity/DataSet.java | 20 ++++++++--------- .../controller/DataSetParamController.java | 4 ++-- .../datasetparam/dao/entity/DataSetParam.java | 22 +++++++++---------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/DataSetController.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/DataSetController.java index 88a24bf9..69ff8f4a 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/DataSetController.java +++ b/report-core/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 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 = "数据集管理") + @Permission(code = "resultsetManage", name = "数据集管理") @RequestMapping("/dataSet") public class DataSetController extends GaeaBaseController { diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java index d9313b51..cca7ff38 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java @@ -5,7 +5,6 @@ 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 lombok.Data; /** @@ -16,32 +15,33 @@ import lombok.Data; @TableName(keepGlobalPrefix=true, value="gaea_report_data_set") @Data public class DataSet extends GaeaBaseEntity { - @ApiModelProperty(value = "数据集编码") + + /** 数据集编码 */ @Unique(code = ResponseCode.SET_CODE_ISEXIST) private String setCode; - @ApiModelProperty(value = "数据集名称") + /** 数据集名称 */ private String setName; - @ApiModelProperty(value = "数据集描述") + /** 数据集描述 */ private String setDesc; - @ApiModelProperty(value = "数据集类型") + /** 数据集类型 */ private String setType; - @ApiModelProperty(value = "数据源编码") + /** 数据源编码 */ private String sourceCode; - @ApiModelProperty(value = "动态查询sql或者接口中的请求体") + /** 动态查询sql或者接口中的请求体 */ private String dynSentence; - @ApiModelProperty(value = "结果案例") + /** 结果案例 */ private String caseResult; - @ApiModelProperty(value = "0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG") + /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */ private Integer enableFlag; - @ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG") + /** 0--未删除 1--已删除 DIC_NAME=DELETE_FLAG */ private Integer deleteFlag; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/DataSetParamController.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/DataSetParamController.java index 4a7e076e..13f02480 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/DataSetParamController.java +++ b/report-core/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 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 = "数据集动态参数管理") + @RequestMapping("/dataSetParam") public class DataSetParamController extends GaeaBaseController { diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/entity/DataSetParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/entity/DataSetParam.java index 96a1648f..3d4a6551 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/entity/DataSetParam.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/entity/DataSetParam.java @@ -3,7 +3,6 @@ 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 lombok.Data; /** @@ -14,34 +13,35 @@ import lombok.Data; @TableName(keepGlobalPrefix=true, value="gaea_report_data_set_param") @Data public class DataSetParam extends GaeaBaseEntity { - @ApiModelProperty(value = "数据集编码") + + /** 数据集编码 */ private String setCode; - @ApiModelProperty(value = "参数名") + /** 参数名 */ private String paramName; - @ApiModelProperty(value = "参数描述") + /** 参数描述 */ private String paramDesc; - @ApiModelProperty(value = "参数类型，字典=") + /** 参数类型 */ private String paramType; - @ApiModelProperty(value = "参数示例项") + /** 参数示例项 */ private String sampleItem; - @ApiModelProperty(value = "0--非必填 1--必填 DIC_NAME=REQUIRED_FLAG") + /** 0--非必填 1--必填 DIC_NAME=REQUIRED_FLAG */ private Integer requiredFlag; - @ApiModelProperty(value = "js校验字段值规则，满足校验返回 true") + /** js校验字段值规则，满足校验返回 true */ private String validationRules; - @ApiModelProperty(value = "排序") + /** 排序 */ private Integer orderNum; - @ApiModelProperty(value = "0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG") + /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */ private Integer enableFlag; - @ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG") + /** 0--未删除 1--已删除 DIC_NAME=DELETE_FLAG" */ private Integer deleteFlag;