diff --git a/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java b/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java index 2faf1fc800..ed819dd4b1 100644 --- a/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java +++ b/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java @@ -14,18 +14,18 @@ public class MybatisPlusGenerator { * 第一 我嫌麻烦 * 第二 后面配置会放到nacos读起来更麻烦了 */ - private static final String url = "jdbc:mysql://localhost:3306/dataease4?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false"; + private static final String url = "jdbc:mysql://localhost:3306/dataease?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false"; private static final String username = "root"; private static final String password = "123456"; /** * 业务模块例如datasource,dataset,panel等 */ - private static final String busi = "visualization"; + private static final String busi = "chart"; /** * 这是要生成代码的表名称 */ - private static final String TABLE_NAME = "visualization_link_jump_info"; + private static final String TABLE_NAME = "core_chart_view"; /** * 下面两个配置基本上不用动 diff --git a/core/core-backend/src/main/java/io/dataease/chart/dao/auto/entity/CoreChartView.java b/core/core-backend/src/main/java/io/dataease/chart/dao/auto/entity/CoreChartView.java index 7b35082b79..1058f0465e 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/dao/auto/entity/CoreChartView.java +++ b/core/core-backend/src/main/java/io/dataease/chart/dao/auto/entity/CoreChartView.java @@ -9,7 +9,7 @@ import java.io.Serializable; *
* * @author fit2cloud - * @since 2024-05-07 + * @since 2024-10-23 */ @TableName("core_chart_view") public class CoreChartView implements Serializable { @@ -101,11 +101,21 @@ public class CoreChartView implements Serializable { */ private String customAttr; + /** + * 图形属性_移动端 + */ + private String customAttrMobile; + /** * 组件样式 */ private String customStyle; + /** + * 组件样式_移动端 + */ + private String customStyleMobile; + /** * 结果过滤 */ @@ -137,7 +147,7 @@ public class CoreChartView implements Serializable { private Long updateTime; /** - * 缩略图 + * 缩略图 */ private String snapshot; @@ -206,8 +216,14 @@ public class CoreChartView implements Serializable { */ private Boolean aggregate; + /** + * 流向地图起点名称field + */ private String flowMapStartName; + /** + * 流向地图终点名称field + */ private String flowMapEndName; /** @@ -215,7 +231,6 @@ public class CoreChartView implements Serializable { */ private String extColor; - public Long getId() { return id; } @@ -352,6 +367,14 @@ public class CoreChartView implements Serializable { this.customAttr = customAttr; } + public String getCustomAttrMobile() { + return customAttrMobile; + } + + public void setCustomAttrMobile(String customAttrMobile) { + this.customAttrMobile = customAttrMobile; + } + public String getCustomStyle() { return customStyle; } @@ -360,6 +383,14 @@ public class CoreChartView implements Serializable { this.customStyle = customStyle; } + public String getCustomStyleMobile() { + return customStyleMobile; + } + + public void setCustomStyleMobile(String customStyleMobile) { + this.customStyleMobile = customStyleMobile; + } + public String getCustomFilter() { return customFilter; } @@ -564,7 +595,9 @@ public class CoreChartView implements Serializable { ", extLabel = " + extLabel + ", extTooltip = " + extTooltip + ", customAttr = " + customAttr + + ", customAttrMobile = " + customAttrMobile + ", customStyle = " + customStyle + + ", customStyleMobile = " + customStyleMobile + ", customFilter = " + customFilter + ", drillFields = " + drillFields + ", senior = " + senior + @@ -585,9 +618,9 @@ public class CoreChartView implements Serializable { ", copyFrom = " + copyFrom + ", copyId = " + copyId + ", aggregate = " + aggregate + - ", flowMapStartName=" + flowMapStartName + - ", flowMapEndName=" + flowMapEndName + - ", extColor=" + extColor + + ", flowMapStartName = " + flowMapStartName + + ", flowMapEndName = " + flowMapEndName + + ", extColor = " + extColor + "}"; } } diff --git a/core/core-backend/src/main/java/io/dataease/chart/dao/auto/mapper/CoreChartViewMapper.java b/core/core-backend/src/main/java/io/dataease/chart/dao/auto/mapper/CoreChartViewMapper.java index 372e70703d..e5c4fb1c33 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/dao/auto/mapper/CoreChartViewMapper.java +++ b/core/core-backend/src/main/java/io/dataease/chart/dao/auto/mapper/CoreChartViewMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; * * * @author fit2cloud - * @since 2024-05-07 + * @since 2024-10-23 */ @Mapper public interface CoreChartViewMapper extends BaseMapper