From a3e6fae3fc70f46f9a44ce04c8a76694ccaaa285 Mon Sep 17 00:00:00 2001 From: Devli <5003188+lide1202@user.noreply.gitee.com> Date: Mon, 26 Aug 2024 09:20:50 +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 --- .../controller/DataSourceController.java | 4 ++-- .../modules/datasource/dao/entity/DataSource.java | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/DataSourceController.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/DataSourceController.java index ba6c3a4d..1571b145 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/DataSourceController.java +++ b/report-core/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 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 = "数据源管理") + @Permission(code = "datasourceManage", name = "数据源管理") @RequestMapping("/dataSource") public class DataSourceController extends GaeaBaseController { diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/entity/DataSource.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/entity/DataSource.java index 79f1e5b3..346e4b87 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/entity/DataSource.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/entity/DataSource.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,26 +15,26 @@ import lombok.Data; @TableName(keepGlobalPrefix=true, value="gaea_report_data_source") @Data public class DataSource extends GaeaBaseEntity { - @ApiModelProperty(value = "数据源编码") + /**数据源编码*/ @Unique(code = ResponseCode.SOURCE_CODE_ISEXIST) private String sourceCode; - @ApiModelProperty(value = "数据源名称") + /**数据源名称*/ private String sourceName; - @ApiModelProperty(value = "数据源描述") + /**数据源描述*/ private String sourceDesc; - @ApiModelProperty(value = "数据源类型 DIC_NAME=SOURCE_TYPE; mysql，orace，sqlserver，elasticsearch，接口，javaBean，数据源类型字典中item-extend动态生成表单") + /**数据源类型 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' }") + /**数据源连接配置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") + /**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;