From d3a76300066ef1d0439f4c17bc0c68e9b69db405 Mon Sep 17 00:00:00 2001 From: Devli <5003188+lide1202@user.noreply.gitee.com> Date: Mon, 26 Aug 2024 09:21:39 +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/ReportDashboardController.java | 4 ++-- .../dashboard/dao/entity/ReportDashboard.java | 24 +++++++++---------- .../dao/entity/ReportDashboardWidget.java | 21 ++++++++-------- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java index fdb66fb1..7e689824 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java +++ b/report-core/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.Char import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardObjectDto; 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 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 = "大屏设计管理") + @Permission(code = "bigScreenManage", name = "大屏报表") @RequestMapping("/reportDashboard") public class ReportDashboardController { diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java index 76ad6cb6..d103fcb8 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.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,39 +15,38 @@ import lombok.Data; @TableName(keepGlobalPrefix=true, value="gaea_report_dashboard") @Data public class ReportDashboard extends GaeaBaseEntity { - @ApiModelProperty(value = "报表编码") + /** 报表编码*/ @Unique(code = ResponseCode.REPORT_CODE_ISEXIST) private String reportCode; - @ApiModelProperty(value = "看板标题") + /** 看板标题*/ private String title; - @ApiModelProperty(value = "宽度px") + /** 宽度px*/ private Long width; - @ApiModelProperty(value = "高度px") + /** 高度px*/ private Long height; - @ApiModelProperty(value = "背景色") + /** 背景色*/ private String backgroundColor; - @ApiModelProperty(value = "背景图片") + /** 背景图片*/ private String backgroundImage; - @ApiModelProperty(value = "工作台中的辅助线") + /** 工作台中的辅助线*/ private String presetLine; - @ApiModelProperty(value = "自动刷新间隔秒，数据字典REFRESH_TYPE") + /** 自动刷新间隔秒，数据字典REFRESH_TYPE*/ private Integer refreshSeconds; - @ApiModelProperty(value = "0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG") + /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG*/ private Integer enableFlag; - @ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG") + /** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG*/ private Integer deleteFlag; - @ApiModelProperty(value = "排序，降序") + /** 排序，降序*/ private Integer sort; - } diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java index 2631236b..47c3f3d5 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java @@ -3,7 +3,6 @@ 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 lombok.Data; /** @@ -14,36 +13,36 @@ import lombok.Data; @TableName(keepGlobalPrefix=true, value="gaea_report_dashboard_widget") @Data public class ReportDashboardWidget extends GaeaBaseEntity { - @ApiModelProperty(value = "报表编码") + /** 报表编码 */ private String reportCode; - @ApiModelProperty(value = "组件类型参考字典DASHBOARD_PANEL_TYPE") + /** 组件类型参考字典DASHBOARD_PANEL_TYPE */ private String type; - @ApiModelProperty(value = "组件的渲染属性json") + /** 组件的渲染属性json */ private String setup; - @ApiModelProperty(value = "组件的数据属性json") + /** 组件的渲染属性json */ private String data; - @ApiModelProperty(value = "组件的配置属性json") + /** 组件的渲染属性json */ private String collapse; - @ApiModelProperty(value = "组件的大小位置属性json") + /** 组件的渲染属性json */ private String position; private String options; - @ApiModelProperty(value = "自动刷新间隔秒") + /** 自动刷新间隔秒 */ private Integer refreshSeconds; - @ApiModelProperty(value = "0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG") + /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */ private Integer enableFlag; - @ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG") + /** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG */ private Integer deleteFlag; - @ApiModelProperty(value = "排序，图层的概念") + /** 排序，图层的概念 */ private Long sort;