github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-03-03 18:23:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #682 from dataease/dev

Browse Source 
Dev
This commit is contained in:
fit2cloudrd 2021-08-23 13:30:51 +08:00 committed by GitHub
commit 1fab89449d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
75 changed files with 525 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
backend/pom.xml
View File

@ -104,23 +104,15 @@
<artifactId>pagehelper</artifactId>
<version>5.0.3</version>
</dependency>
<!--<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring</artifactId>
<version>${shiro.version}</version>
</dependency>-->
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-starter</artifactId>
<version>${shiro.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@ -139,41 +131,26 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.72</version>
</dependency>
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>${jwt.version}</version>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>7.4.1.jre8</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.14</version>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>19.7.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
@ -184,8 +161,6 @@
<artifactId>curator-recipes</artifactId>
<version>4.0.1</version>
</dependency>
<!-- easyexcel -->
<dependency>
<groupId>com.alibaba</groupId>

4
backend/src/main/java/io/dataease/auth/api/dto/CurrentRoleDto.java
View File

@ -1,5 +1,6 @@
package io.dataease.auth.api.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -7,9 +8,10 @@ import java.io.Serializable;
@Data
public class CurrentRoleDto implements Serializable {
@ApiModelProperty("ID")
private Long id;
// private String code;
@ApiModelProperty("名称")
private String name;
}

28
backend/src/main/java/io/dataease/auth/api/dto/DynamicMenuDto.java
View File

@ -1,5 +1,6 @@
package io.dataease.auth.api.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -9,32 +10,33 @@ import java.util.List;
@Data
public class DynamicMenuDto implements Serializable {
@ApiModelProperty("路径")
private String path;
@ApiModelProperty("组件")
private String component;
@ApiModelProperty("重定向")
private String redirect;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("元数据")
private MenuMeta meta;
@ApiModelProperty("父ID")
private Long pid;
@ApiModelProperty("ID")
private Long id;
@ApiModelProperty("权限")
private String permission;
@ApiModelProperty("是否隐藏")
private Boolean hidden;
@ApiModelProperty("类型")
private Integer type;
@ApiModelProperty("菜单序号")
private Integer menuSort;
@ApiModelProperty("是否插件")
private Boolean isPlugin;
@ApiModelProperty(hidden = true)
private Boolean noLayout;
@ApiModelProperty("子节点")
private List<DynamicMenuDto> children;
}

5
backend/src/main/java/io/dataease/auth/api/dto/MenuMeta.java
View File

@ -1,14 +1,15 @@
package io.dataease.auth.api.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@Data
public class MenuMeta implements Serializable {
@ApiModelProperty("标题")
private String title;
@ApiModelProperty("图标")
private String icon;
}

15
backend/src/main/java/io/dataease/base/domain/ChartGroup.java
View File

@ -1,22 +1,25 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class ChartGroup implements Serializable {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("父ID")
private String pid;
@ApiModelProperty("级别")
private Integer level;
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("创建者")
private String createBy;
@ApiModelProperty("创建时间")
private Long createTime;
private static final long serialVersionUID = 1L;

21
backend/src/main/java/io/dataease/base/domain/ChartView.java
View File

@ -1,28 +1,31 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class ChartView implements Serializable {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("场景ID")
private String sceneId;
@ApiModelProperty("表ID")
private String tableId;
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("标题")
private String title;
@ApiModelProperty("创建者")
private String createBy;
@ApiModelProperty("创建时间")
private Long createTime;
@ApiModelProperty("更新时间")
private Long updateTime;
@ApiModelProperty("样式优先级")
private String stylePriority;
private static final long serialVersionUID = 1L;

19
backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java
View File

@ -1,6 +1,8 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@ -9,22 +11,23 @@ import lombok.ToString;
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class ChartViewWithBLOBs extends ChartView implements Serializable {
@ApiModelProperty("x轴")
private String xAxis;
@ApiModelProperty("y轴")
private String yAxis;
@ApiModelProperty("堆叠")
private String extStack;
@ApiModelProperty("气泡")
private String extBubble;
@ApiModelProperty("客户端属性")
private String customAttr;
@ApiModelProperty("客户端样式")
private String customStyle;
@ApiModelProperty("客户端过滤条件")
private String customFilter;
@ApiModelProperty("下钻字段")
private String drillFields;
@ApiModelProperty("快照")
private String snapshot;
private static final long serialVersionUID = 1L;

15
backend/src/main/java/io/dataease/base/domain/DatasetGroup.java
View File

@ -1,22 +1,25 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class DatasetGroup implements Serializable {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("父ID")
private String pid;
@ApiModelProperty("级别")
private Integer level;
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("创建者")
private String createBy;
@ApiModelProperty("创建时间")
private Long createTime;
private static final long serialVersionUID = 1L;

25
backend/src/main/java/io/dataease/base/domain/DatasetTable.java
View File

@ -1,32 +1,35 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class DatasetTable implements Serializable {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("场景ID")
private String sceneId;
@ApiModelProperty("数据源ID")
private String dataSourceId;
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("模式")
private Integer mode;
@ApiModelProperty("创建者")
private String createBy;
@ApiModelProperty("创建时间")
private Long createTime;
@ApiModelProperty("定时任务实例")
private String qrtzInstance;
@ApiModelProperty("同步状态")
private String syncStatus;
@ApiModelProperty("上次更新时间")
private Long lastUpdateTime;
@ApiModelProperty("信息")
private String info;
private static final long serialVersionUID = 1L;

30
backend/src/main/java/io/dataease/base/domain/DatasetTableField.java
View File

@ -2,6 +2,7 @@ package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -12,34 +13,35 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor //全参构造函数
@NoArgsConstructor //无参构造函数
public class DatasetTableField implements Serializable {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("表ID")
private String tableId;
@ApiModelProperty("原始名称")
private String originName;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("DE名称")
private String dataeaseName;
@ApiModelProperty("分组类型")
private String groupType;
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("大小")
private Integer size;
@ApiModelProperty("de类型")
private Integer deType;
@ApiModelProperty("de类型格式")
private Integer deTypeFormat;
@ApiModelProperty("de抽取类型")
private Integer deExtractType;
@ApiModelProperty("额外字段")
private Integer extField;
@ApiModelProperty("是否选中")
private Boolean checked;
@ApiModelProperty("列号")
private Integer columnIndex;
@ApiModelProperty("上次同步时间")
private Long lastSyncTime;
private static final long serialVersionUID = 1L;

13
backend/src/main/java/io/dataease/base/domain/DatasetTableFunction.java
View File

@ -1,20 +1,23 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class DatasetTableFunction implements Serializable {
@ApiModelProperty("ID")
private Long id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("函数")
private String func;
@ApiModelProperty("库类型")
private String dbType;
@ApiModelProperty("函数类型")
private Integer funcType;
@ApiModelProperty("描述")
private String desc;
private static final long serialVersionUID = 1L;

9
backend/src/main/java/io/dataease/base/domain/DatasetTableIncrementalConfig.java
View File

@ -1,16 +1,19 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class DatasetTableIncrementalConfig implements Serializable {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("表ID")
private String tableId;
@ApiModelProperty("删除增量")
private String incrementalDelete;
@ApiModelProperty("新增增量")
private String incrementalAdd;
private static final long serialVersionUID = 1L;

29
backend/src/main/java/io/dataease/base/domain/DatasetTableTask.java
View File

@ -1,36 +1,39 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class DatasetTableTask implements Serializable {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("表ID")
private String tableId;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("开始时间")
private Long startTime;
@ApiModelProperty("频率")
private String rate;
@ApiModelProperty("表达式")
private String cron;
@ApiModelProperty("结束")
private String end;
@ApiModelProperty("结束时间")
private Long endTime;
@ApiModelProperty("创建时间")
private Long createTime;
@ApiModelProperty("上次执行时间")
private Long lastExecTime;
@ApiModelProperty("状态")
private String status;
@ApiModelProperty("上次执行状态")
private String lastExecStatus;
@ApiModelProperty("抽取数据")
private String extraData;
private static final long serialVersionUID = 1L;

19
backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLog.java
View File

@ -1,26 +1,29 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class DatasetTableTaskLog implements Serializable {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("表ID")
private String tableId;
@ApiModelProperty("任务ID")
private String taskId;
@ApiModelProperty("开始时间")
private Long startTime;
@ApiModelProperty("结束时间")
private Long endTime;
@ApiModelProperty("状态")
private String status;
@ApiModelProperty("创建时间")
private Long createTime;
@ApiModelProperty("触发类型")
private String triggerType;
@ApiModelProperty("信息")
private String info;
private static final long serialVersionUID = 1L;

19
backend/src/main/java/io/dataease/base/domain/DatasetTableUnion.java
View File

@ -1,26 +1,29 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class DatasetTableUnion implements Serializable {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("源表ID")
private String sourceTableId;
@ApiModelProperty("源表字段ID")
private String sourceTableFieldId;
@ApiModelProperty("源合并关系")
private String sourceUnionRelation;
@ApiModelProperty("目标字段ID")
private String targetTableId;
@ApiModelProperty("目标表字段ID")
private String targetTableFieldId;
@ApiModelProperty("目标合并关系")
private String targetUnionRelation;
@ApiModelProperty("创建者")
private String createBy;
@ApiModelProperty("创建时间")
private Long createTime;
private static final long serialVersionUID = 1L;

19
backend/src/main/java/io/dataease/base/domain/Datasource.java
View File

@ -1,26 +1,29 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class Datasource implements Serializable {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("描述")
private String desc;
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("创建时间")
private Long createTime;
@ApiModelProperty("更新时间")
private Long updateTime;
@ApiModelProperty("创建者")
private String createBy;
@ApiModelProperty("状态")
private String status;
@ApiModelProperty("配置")
private String configuration;
private static final long serialVersionUID = 1L;

25
backend/src/main/java/io/dataease/base/domain/PanelGroup.java
View File

@ -1,32 +1,35 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class PanelGroup implements Serializable {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("父ID")
private String pid;
@ApiModelProperty("级别")
private Integer level;
@ApiModelProperty("节点类型")
private String nodeType;
@ApiModelProperty("创建者")
private String createBy;
@ApiModelProperty("创建时间")
private Long createTime;
@ApiModelProperty("类型")
private String panelType;
@ApiModelProperty("源")
private String source;
@ApiModelProperty("拓展1")
private String extend1;
@ApiModelProperty("拓展2")
private String extend2;
@ApiModelProperty("重新标记")
private String remark;
private static final long serialVersionUID = 1L;

5
backend/src/main/java/io/dataease/base/domain/PanelGroupWithBLOBs.java
View File

@ -1,6 +1,8 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@ -9,8 +11,9 @@ import lombok.ToString;
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PanelGroupWithBLOBs extends PanelGroup implements Serializable {
@ApiModelProperty("仪表板样式")
private String panelStyle;
@ApiModelProperty("仪表板数据")
private String panelData;
private static final long serialVersionUID = 1L;

11
backend/src/main/java/io/dataease/base/domain/PanelShare.java
View File

@ -1,18 +1,21 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class PanelShare implements Serializable {
@ApiModelProperty("分享ID")
private Long shareId;
@ApiModelProperty("仪表板ID")
private String panelGroupId;
@ApiModelProperty("目标ID")
private Long targetId;
@ApiModelProperty("分享时间")
private Long createTime;
@ApiModelProperty("类型")
private Integer type;
private static final long serialVersionUID = 1L;

17
backend/src/main/java/io/dataease/base/domain/PanelSubject.java
View File

@ -1,24 +1,27 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class PanelSubject implements Serializable {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("创建时间")
private Long createTime;
@ApiModelProperty("创建者")
private String createBy;
@ApiModelProperty("更新时间")
private Long updateTime;
@ApiModelProperty("更新者")
private String updateBy;
@ApiModelProperty("详息")
private String details;
private static final long serialVersionUID = 1L;

17
backend/src/main/java/io/dataease/base/domain/PanelTemplate.java
View File

@ -1,24 +1,27 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class PanelTemplate implements Serializable {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("父ID")
private String pid;
@ApiModelProperty("级别")
private Integer level;
@ApiModelProperty("节点类型")
private String nodeType;
@ApiModelProperty("创建者")
private String createBy;
@ApiModelProperty("创建时间")
private Long createTime;
@ApiModelProperty("模版类型")
private String templateType;
private static final long serialVersionUID = 1L;

9
backend/src/main/java/io/dataease/base/domain/PanelTemplateWithBLOBs.java
View File

@ -1,6 +1,8 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@ -9,12 +11,13 @@ import lombok.ToString;
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PanelTemplateWithBLOBs extends PanelTemplate implements Serializable {
@ApiModelProperty("快照")
private String snapshot;
@ApiModelProperty("模版样式")
private String templateStyle;
@ApiModelProperty("模版数据")
private String templateData;
@ApiModelProperty("动态数据")
private String dynamicData;
private static final long serialVersionUID = 1L;

17
backend/src/main/java/io/dataease/base/domain/PanelViewLinkage.java
View File

@ -1,24 +1,27 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class PanelViewLinkage implements Serializable {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("仪表板ID")
private String panelId;
@ApiModelProperty("源视图ID")
private String sourceViewId;
@ApiModelProperty("目标视图ID")
private String targetViewId;
@ApiModelProperty("更新时间")
private Long updateTime;
@ApiModelProperty("更新者")
private String updatePeople;
@ApiModelProperty("额外1")
private String ext1;
@ApiModelProperty("额外2")
private String ext2;
private static final long serialVersionUID = 1L;

11
backend/src/main/java/io/dataease/base/domain/PanelViewLinkageField.java
View File

@ -1,18 +1,21 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class PanelViewLinkageField implements Serializable {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("联动ID")
private String linkageId;
@ApiModelProperty("源字段")
private String sourceField;
@ApiModelProperty("目标字段")
private String targetField;
@ApiModelProperty("更新时间")
private Long updateTime;
private static final long serialVersionUID = 1L;

17
backend/src/main/java/io/dataease/base/domain/SysMsg.java
View File

@ -1,24 +1,27 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class SysMsg implements Serializable {
@ApiModelProperty("消息ID")
private Long msgId;
@ApiModelProperty("用户ID")
private Long userId;
@ApiModelProperty("类型ID")
private Long typeId;
@ApiModelProperty("状态")
private Boolean status;
@ApiModelProperty("参数")
private String param;
@ApiModelProperty("创建时间")
private Long createTime;
@ApiModelProperty("读取时间")
private Long readTime;
@ApiModelProperty("内容")
private String content;
private static final long serialVersionUID = 1L;

15
backend/src/main/java/io/dataease/base/domain/SysRole.java
View File

@ -1,22 +1,25 @@
package io.dataease.base.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class SysRole implements Serializable {
@ApiModelProperty("角色ID")
private Long roleId;
@ApiModelProperty("角色名称")
private String name;
@ApiModelProperty("描述")
private String description;
@ApiModelProperty("创建者")
private String createBy;
@ApiModelProperty("更新者")
private String updateBy;
@ApiModelProperty("创建时间")
private Long createTime;
@ApiModelProperty("更新时间")
private Long updateTime;
private static final long serialVersionUID = 1L;

4
backend/src/main/java/io/dataease/commons/model/AuthURD.java
View File

@ -1,6 +1,7 @@
package io.dataease.commons.model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -9,10 +10,13 @@ import java.util.List;
@Data
public class AuthURD implements Serializable {
@ApiModelProperty("用户ID集合")
private List<Long> userIds;
@ApiModelProperty("组织ID集合")
private List<Long> deptIds;
@ApiModelProperty("角色ID集合")
private List<Long> roleIds;

2
backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
View File

@ -329,7 +329,7 @@ public class ExcelXlsxReader extends DefaultHandler {
formatString = style.getDataFormatString();
short format = this.formatIndex;
if (format == 14 || format == 31 || format == 57 ||format == 59||
format == 58 || (176 < format && format < 178)
format == 58 || (176 <= format && format < 178)
|| (182 <= format && format <= 196) ||
(210 <= format && format <= 213) || (208 == format))
{ // 日期

5
backend/src/main/java/io/dataease/commons/utils/Pager.java
View File

@ -1,9 +1,14 @@
package io.dataease.commons.utils;
import io.swagger.annotations.ApiModelProperty;
public class Pager<T> {
@ApiModelProperty("数据")
private T listObject;
@ApiModelProperty("总数")
private long itemCount;
@ApiModelProperty("页数")
private long pageCount;
public Pager() {

3
backend/src/main/java/io/dataease/controller/IndexController.java
View File

@ -43,7 +43,8 @@ public class IndexController {
return "doc.html";
default:
// DataEaseException.throwException("Invalid License.");
return "nolic.html";
return "nolic.html";
// return "doc.html";
}
// return "index.html";
}

2
backend/src/main/java/io/dataease/controller/ResultHolder.java
View File

@ -2,7 +2,9 @@ package io.dataease.controller;
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import springfox.documentation.annotations.ApiIgnore;
@ApiIgnore
public class ResultHolder {
public ResultHolder() {
this.success = true;

2
backend/src/main/java/io/dataease/controller/request/chart/ChartDrillRequest.java
View File

@ -1,6 +1,7 @@
package io.dataease.controller.request.chart;
import io.dataease.dto.chart.ChartDimensionDTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@ -11,5 +12,6 @@ import java.util.List;
*/
@Data
public class ChartDrillRequest {
@ApiModelProperty("下钻维度集合")
private List<ChartDimensionDTO> dimensionList;
}

7
backend/src/main/java/io/dataease/controller/request/chart/ChartExtFilterRequest.java
View File

@ -1,6 +1,7 @@
package io.dataease.controller.request.chart;
import io.dataease.base.domain.DatasetTableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@ -13,10 +14,16 @@ import java.util.List;
@Getter
@Setter
public class ChartExtFilterRequest {
@ApiModelProperty("过滤组件ID")
private String componentId;
@ApiModelProperty("过滤字段ID")
private String fieldId;
@ApiModelProperty("过滤操作符")
private String operator;
@ApiModelProperty("过滤值")
private List<String> value;
@ApiModelProperty("目标视图ID集合")
private List<String> viewIds;
@ApiModelProperty("过滤字段")
private DatasetTableField datasetTableField;
}

5
backend/src/main/java/io/dataease/controller/request/chart/ChartExtRequest.java
View File

@ -1,5 +1,6 @@
package io.dataease.controller.request.chart;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@ -12,9 +13,13 @@ import java.util.List;
@Getter
@Setter
public class ChartExtRequest {
@ApiModelProperty("视图额外过滤条件集合")
private List<ChartExtFilterRequest> filter;
//联动过滤条件
@ApiModelProperty("联动过滤条件集合")
private List<ChartExtFilterRequest> linkageFilters;
@ApiModelProperty("下钻维度集合")
private List<ChartDrillRequest> drill;
}

4
backend/src/main/java/io/dataease/controller/request/chart/ChartGroupRequest.java
View File

@ -1,6 +1,7 @@
package io.dataease.controller.request.chart;
import io.dataease.base.domain.ChartGroup;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Set;
@ -8,7 +9,10 @@ import java.util.Set;
@Data
public class ChartGroupRequest extends ChartGroup {
@ApiModelProperty("排序")
private String sort;
@ApiModelProperty("用户ID")
private String userId;
@ApiModelProperty("ID集合")
private Set<String> ids;
}

6
backend/src/main/java/io/dataease/controller/request/dataset/DataSetGroupRequest.java
View File

@ -1,6 +1,7 @@
package io.dataease.controller.request.dataset;
import io.dataease.base.domain.DatasetGroup;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Set;
@ -11,9 +12,10 @@ import java.util.Set;
*/
@Data
public class DataSetGroupRequest extends DatasetGroup {
@ApiModelProperty("排序")
private String sort;
@ApiModelProperty("用户ID")
private String userId;
@ApiModelProperty("ID集合")
private Set<String> ids;
}

12
backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java
View File

@ -3,6 +3,7 @@ package io.dataease.controller.request.dataset;
import io.dataease.base.domain.DatasetTable;
import io.dataease.datasource.dto.TableFiled;
import io.dataease.dto.dataset.ExcelSheetData;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@ -15,15 +16,26 @@ import java.util.List;
@Setter
@Getter
public class DataSetTableRequest extends DatasetTable {
@ApiModelProperty("排序")
private String sort;
@ApiModelProperty("表名集合")
private List<String> tableNames;
@ApiModelProperty("行数")
private String row = "1000";
@ApiModelProperty("用户ID")
private String userId;
@ApiModelProperty("同步类型")
private String syncType;
@ApiModelProperty("编辑类型")
private Integer editType;
@ApiModelProperty("是否重命名")
private Boolean isRename;
@ApiModelProperty("类型过滤条件集合")
private List<String> typeFilter;
@ApiModelProperty("字段集合")
private List<TableFiled> fields;
@ApiModelProperty("excel sheet集合")
private List<ExcelSheetData> sheets;
@ApiModelProperty("是否合并sheet")
private boolean mergeSheet = false;
}

3
backend/src/main/java/io/dataease/controller/request/dataset/DataSetTaskRequest.java
View File

@ -2,12 +2,15 @@ package io.dataease.controller.request.dataset;
import io.dataease.base.domain.DatasetTableIncrementalConfig;
import io.dataease.base.domain.DatasetTableTask;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@Setter
@Getter
public class DataSetTaskRequest {
@ApiModelProperty("数据集任务")
private DatasetTableTask datasetTableTask;
@ApiModelProperty("数据集增量配置")
private DatasetTableIncrementalConfig datasetTableIncrementalConfig;
}

6
backend/src/main/java/io/dataease/controller/request/panel/PanelGroupRequest.java
View File

@ -1,6 +1,7 @@
package io.dataease.controller.request.panel;
import io.dataease.dto.panel.PanelGroupDTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -10,10 +11,11 @@ import lombok.Data;
*/
@Data
public class PanelGroupRequest extends PanelGroupDTO {
@ApiModelProperty("排序")
private String sort;
@ApiModelProperty("用户ID")
private String userId;
@ApiModelProperty("操作类型")
private String optType;
public PanelGroupRequest() {

8
backend/src/main/java/io/dataease/controller/request/panel/PanelLinkageRequest.java
View File

@ -1,6 +1,7 @@
package io.dataease.controller.request.panel;
import io.dataease.dto.PanelViewLinkageDTO;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import java.util.Map;
@ -11,13 +12,14 @@ import java.util.Map;
* Description:
*/
public class PanelLinkageRequest {
@ApiModelProperty("仪表板ID")
private String panelId;
@ApiModelProperty("源视图ID")
private String sourceViewId;
@ApiModelProperty("目标视图ID集合")
private List<String> targetViewIds;
@ApiModelProperty("联动信息")
private Map<String, PanelViewLinkageDTO> linkageInfo;
public Map<String, PanelViewLinkageDTO> getLinkageInfo() {

5
backend/src/main/java/io/dataease/controller/request/panel/PanelShareFineDto.java
View File

@ -1,6 +1,7 @@
package io.dataease.controller.request.panel;
import io.dataease.commons.model.AuthURD;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -11,8 +12,8 @@ public class PanelShareFineDto implements Serializable {
private static final long serialVersionUID = -792964171742204428L;
@ApiModelProperty("资源ID")
private String resourceId;
@ApiModelProperty("分享信息")
private AuthURD authURD;
}

8
backend/src/main/java/io/dataease/controller/request/panel/PanelTemplateRequest.java
View File

@ -1,6 +1,7 @@
package io.dataease.controller.request.panel;
import io.dataease.base.domain.PanelTemplateWithBLOBs;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -10,12 +11,13 @@ import lombok.Data;
*/
@Data
public class PanelTemplateRequest extends PanelTemplateWithBLOBs {
@ApiModelProperty("排序")
private String sort;
@ApiModelProperty("详息")
private String withBlobs="Y";
@ApiModelProperty("操作类型")
private String optType;
@ApiModelProperty("是否及联")
private Boolean withChildren = false;
public PanelTemplateRequest() {

4
backend/src/main/java/io/dataease/controller/request/panel/link/EnablePwdRequest.java
View File

@ -1,11 +1,13 @@
package io.dataease.controller.request.panel.link;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class EnablePwdRequest {
@ApiModelProperty("资源ID")
private String resourceId;
@ApiModelProperty("是否启用密码保护")
private boolean enablePwd;
}

5
backend/src/main/java/io/dataease/controller/request/panel/link/LinkRequest.java
View File

@ -1,11 +1,12 @@
package io.dataease.controller.request.panel.link;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class LinkRequest {
@ApiModelProperty("资源ID")
private String resourceId;
@ApiModelProperty("是否有效")
private boolean valid;
}

4
backend/src/main/java/io/dataease/controller/request/panel/link/PasswordRequest.java
View File

@ -1,12 +1,14 @@
package io.dataease.controller.request.panel.link;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class PasswordRequest {
@ApiModelProperty("资源ID")
private String resourceId;
@ApiModelProperty("密码")
private String password;

3
backend/src/main/java/io/dataease/controller/sys/response/MsgGridDto.java
View File

@ -1,11 +1,14 @@
package io.dataease.controller.sys.response;
import io.dataease.base.domain.SysMsg;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class MsgGridDto extends SysMsg {
@ApiModelProperty("回调路由")
private String router;
@ApiModelProperty("回调函数")
private String callback;
}

4
backend/src/main/java/io/dataease/controller/sys/response/RoleUserItem.java
View File

@ -1,5 +1,6 @@
package io.dataease.controller.sys.response;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -7,7 +8,8 @@ import java.io.Serializable;
@Data
public class RoleUserItem implements Serializable {
@ApiModelProperty("角色ID")
private Long id;
@ApiModelProperty("角色名称")
private String name;
}

7
backend/src/main/java/io/dataease/controller/sys/response/SysUserDept.java
View File

@ -1,15 +1,16 @@
package io.dataease.controller.sys.response;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@Data
public class SysUserDept implements Serializable {
@ApiModelProperty("组织ID")
private Long deptId;
@ApiModelProperty("父ID")
private Long pid;
@ApiModelProperty("组织名称")
private String deptName;
}

8
backend/src/main/java/io/dataease/controller/sys/response/SysUserGridResponse.java
View File

@ -2,17 +2,19 @@ package io.dataease.controller.sys.response;
import io.dataease.base.domain.SysUser;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class SysUserGridResponse extends SysUser {
@ApiModelProperty("ID")
private Long id;
@ApiModelProperty("角色集合")
private List<SysUserRole> roles;
@ApiModelProperty("组织信息")
private SysUserDept dept;
@ApiModelProperty("角色ID集合")
private List<Long> roleIds;
}

5
backend/src/main/java/io/dataease/controller/sys/response/SysUserRole.java
View File

@ -1,13 +1,14 @@
package io.dataease.controller.sys.response;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@Data
public class SysUserRole implements Serializable {
@ApiModelProperty("角色ID")
private Long roleId;
@ApiModelProperty("角色名称")
private String roleName;
}

5
backend/src/main/java/io/dataease/datasource/dto/DBTableDTO.java
View File

@ -1,5 +1,6 @@
package io.dataease.datasource.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@ -10,8 +11,12 @@ import lombok.Setter;
@Getter
@Setter
public class DBTableDTO {
@ApiModelProperty("数据源ID")
private String datasourceId;
@ApiModelProperty("数据源名称")
private String name;
@ApiModelProperty("启用检测")
private boolean enableCheck;
@ApiModelProperty("数据集路径")
private String datasetPath;
}

6
backend/src/main/java/io/dataease/datasource/dto/TableFiled.java
View File

@ -1,15 +1,19 @@
package io.dataease.datasource.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@Setter
@Getter
public class TableFiled {
@ApiModelProperty("字段名称")
private String fieldName;
@ApiModelProperty("重新标记")
private String remarks;
@ApiModelProperty("字段类型")
private String fieldType;
@ApiModelProperty("字段大小")
private int fieldSize;
}

2
backend/src/main/java/io/dataease/dto/DatasourceDTO.java
View File

@ -1,6 +1,7 @@
package io.dataease.dto;
import io.dataease.base.domain.Datasource;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -11,6 +12,7 @@ import lombok.Data;
@Data
public class DatasourceDTO extends Datasource {
@ApiModelProperty("权限")
private String privileges;
}

10
backend/src/main/java/io/dataease/dto/PanelViewLinkageDTO.java
View File

@ -3,6 +3,7 @@ package io.dataease.dto;
import io.dataease.base.domain.DatasetTableField;
import io.dataease.base.domain.PanelViewLinkage;
import io.dataease.base.domain.PanelViewLinkageField;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
@ -14,17 +15,18 @@ import java.util.List;
*/
public class PanelViewLinkageDTO extends PanelViewLinkage {
@ApiModelProperty("目标视图名称")
//目标视图名称
private String targetViewName;
@ApiModelProperty("启用联动")
//关联状态
private boolean linkageActive = false;
@ApiModelProperty("联动字段")
private List<PanelViewLinkageField> linkageFields = new ArrayList<>();
@ApiModelProperty("目标视图字段")
private List<DatasetTableField> targetViewFields = new ArrayList<>();
@ApiModelProperty("表ID")
private String tableId;

3
backend/src/main/java/io/dataease/dto/chart/ChartDimensionDTO.java
View File

@ -1,5 +1,6 @@
package io.dataease.dto.chart;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -8,6 +9,8 @@ import lombok.Data;
*/
@Data
public class ChartDimensionDTO {
@ApiModelProperty("维度ID")
private String id;
@ApiModelProperty("维度值")
private String value;
}

6
backend/src/main/java/io/dataease/dto/chart/ChartGroupDTO.java
View File

@ -2,6 +2,7 @@ package io.dataease.dto.chart;
import io.dataease.base.domain.DatasetGroup;
import io.dataease.commons.model.ITreeBase;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@ -9,9 +10,10 @@ import java.util.List;
@Data
public class ChartGroupDTO extends DatasetGroup implements ITreeBase<ChartGroupDTO> {
@ApiModelProperty("标签")
private String label;
@ApiModelProperty("子节点")
private List<ChartGroupDTO> children;
@ApiModelProperty("权限")
private String privileges;
}

12
backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java
View File

@ -2,6 +2,7 @@ package io.dataease.dto.chart;
import io.dataease.base.domain.ChartViewWithBLOBs;
import io.dataease.controller.request.chart.ChartExtFilterRequest;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@ -15,15 +16,18 @@ import java.util.Map;
@Setter
@Getter
public class ChartViewDTO extends ChartViewWithBLOBs {
@ApiModelProperty("数据")
private Map<String, Object> data;
@ApiModelProperty("权限")
private String privileges;
@ApiModelProperty("是否叶子节点")
private Boolean isLeaf;
@ApiModelProperty("父ID")
private String pid;
@ApiModelProperty("sql")
private String sql;
@ApiModelProperty("下钻")
private boolean drill;
@ApiModelProperty("下钻条件集合")
private List<ChartExtFilterRequest> drillFilters;
}

5
backend/src/main/java/io/dataease/dto/dataset/DataSetGroupDTO.java
View File

@ -2,6 +2,7 @@ package io.dataease.dto.dataset;
import io.dataease.base.domain.DatasetGroup;
import io.dataease.commons.model.ITreeBase;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@ -12,8 +13,10 @@ import java.util.List;
*/
@Data
public class DataSetGroupDTO extends DatasetGroup implements ITreeBase<DataSetGroupDTO> {
@ApiModelProperty("标签")
private String label;
@ApiModelProperty("子节点")
private List<DataSetGroupDTO> children;
@ApiModelProperty("权限")
private String privileges;
}

6
backend/src/main/java/io/dataease/dto/dataset/DataSetTableDTO.java
View File

@ -1,6 +1,7 @@
package io.dataease.dto.dataset;
import io.dataease.base.domain.DatasetTable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@ -13,9 +14,12 @@ import java.util.List;
@Setter
@Getter
public class DataSetTableDTO extends DatasetTable {
@ApiModelProperty("子节点")
private List<DataSetTableDTO> children;
@ApiModelProperty("权限")
private String privileges;
@ApiModelProperty("是否叶子结点")
private Boolean isLeaf;
@ApiModelProperty("父ID")
private String pid;
}

5
backend/src/main/java/io/dataease/dto/dataset/DataSetTableUnionDTO.java
View File

@ -1,6 +1,7 @@
package io.dataease.dto.dataset;
import io.dataease.base.domain.DatasetTableUnion;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@ -11,8 +12,12 @@ import lombok.Setter;
@Getter
@Setter
public class DataSetTableUnionDTO extends DatasetTableUnion {
@ApiModelProperty("源表名称")
private String sourceTableName;
@ApiModelProperty("源表字段名称")
private String sourceTableFieldName;
@ApiModelProperty("目标表名称")
private String targetTableName;
@ApiModelProperty("目标表字段名称")
private String targetTableFieldName;
}

6
backend/src/main/java/io/dataease/dto/dataset/DataSetTaskDTO.java
View File

@ -1,6 +1,7 @@
package io.dataease.dto.dataset;
import io.dataease.base.domain.DatasetTableTask;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@ -11,9 +12,14 @@ import lombok.Setter;
@Getter
@Setter
public class DataSetTaskDTO extends DatasetTableTask {
@ApiModelProperty("数据集名称")
private String datasetName;
@ApiModelProperty("下次执行时间")
private Long nextExecTime;
@ApiModelProperty("任务状态")
private String taskStatus;
@ApiModelProperty("消息")
private String msg;
@ApiModelProperty("权限")
private String privileges;
}

3
backend/src/main/java/io/dataease/dto/dataset/DataSetTaskLogDTO.java
View File

@ -1,6 +1,7 @@
package io.dataease.dto.dataset;
import io.dataease.base.domain.DatasetTableTaskLog;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@ -11,6 +12,8 @@ import lombok.Setter;
@Getter
@Setter
public class DataSetTaskLogDTO extends DatasetTableTaskLog {
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("数据集名称")
private String datasetName;
}

6
backend/src/main/java/io/dataease/dto/dataset/ExcelFileData.java
View File

@ -1,14 +1,20 @@
package io.dataease.dto.dataset;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class ExcelFileData {
@ApiModelProperty("excelID")
private String excelId;
@ApiModelProperty("excel标签")
private String excelLable;
@ApiModelProperty("sheets")
private List<ExcelSheetData> sheets;
@ApiModelProperty("路径")
private String path;
@ApiModelProperty("是否Sheet")
private boolean isSheet = false;
}

11
backend/src/main/java/io/dataease/dto/dataset/ExcelSheetData.java
View File

@ -1,6 +1,7 @@
package io.dataease.dto.dataset;
import io.dataease.datasource.dto.TableFiled;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@ -8,14 +9,24 @@ import java.util.Map;
@Data
public class ExcelSheetData {
@ApiModelProperty("标签")
private String excelLable;
@ApiModelProperty("数据集合")
private List<List<String>> data;
@ApiModelProperty("字段集合")
private List<TableFiled> fields;
@ApiModelProperty("是否sheet")
private boolean isSheet = true;
@ApiModelProperty("json数组")
private List<Map<String, Object>> jsonArray;
@ApiModelProperty("数据集名称")
private String datasetName;
@ApiModelProperty("excelID")
private String sheetExcelId;
@ApiModelProperty("sheetId")
private String sheetId;
@ApiModelProperty("路径")
private String path;
@ApiModelProperty("字段MD5")
private String fieldsMd5;
}

17
backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java
View File

@ -2,6 +2,7 @@ package io.dataease.dto.panel;
import io.dataease.base.domain.PanelGroupWithBLOBs;
import io.dataease.commons.model.ITreeBase;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
@ -14,21 +15,21 @@ import java.util.List;
*/
@Data
public class PanelGroupDTO extends PanelGroupWithBLOBs implements ITreeBase<PanelGroupDTO> {
@ApiModelProperty("标签")
private String label;
@ApiModelProperty("是否叶子节点")
private Boolean leaf;
@ApiModelProperty("权限")
private String privileges;
@ApiModelProperty("默认仪表板ID")
private String defaultPanelId;
@ApiModelProperty("默认仪表板名称")
private String defaultPanelName;
@ApiModelProperty("是否默认")
private Boolean isDefault;
@ApiModelProperty("源仪表板名称")
private String sourcePanelName;
@ApiModelProperty("子节点")
private List<PanelGroupDTO> children = new ArrayList<>();

6
backend/src/main/java/io/dataease/dto/panel/PanelTemplateDTO.java
View File

@ -1,6 +1,7 @@
package io.dataease.dto.panel;
import io.dataease.base.domain.PanelTemplateWithBLOBs;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@ -13,10 +14,11 @@ import java.util.List;
@Data
public class PanelTemplateDTO extends PanelTemplateWithBLOBs {
@ApiModelProperty("标签")
private String label;
@ApiModelProperty("子节点数量")
private Integer childrenCount;
@ApiModelProperty("子节点")
private List<PanelTemplateDTO> children;

11
backend/src/main/java/io/dataease/dto/panel/PanelViewDto.java
View File

@ -1,6 +1,7 @@
package io.dataease.dto.panel;
import io.dataease.commons.model.ITreeBase;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
@ -9,15 +10,15 @@ import java.util.Optional;
@Data
public class PanelViewDto implements ITreeBase<PanelViewDto> {
@ApiModelProperty("ID")
private String id;
@ApiModelProperty("父ID")
private String pid;
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("子节点")
private List<PanelViewDto> children;
public void addChild(PanelViewDto dto){

8
backend/src/main/java/io/dataease/dto/panel/link/GenerateDto.java
View File

@ -1,15 +1,17 @@
package io.dataease.dto.panel.link;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class GenerateDto {
@ApiModelProperty("是否有效")
private boolean valid;
@ApiModelProperty("是否启用密码")
private boolean enablePwd;
@ApiModelProperty("链接地址")
private String uri;
@ApiModelProperty("密码")
private String pwd;
}

8
backend/src/main/java/io/dataease/dto/panel/link/ValidateDto.java
View File

@ -1,15 +1,17 @@
package io.dataease.dto.panel.link;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class ValidateDto {
@ApiModelProperty("是否可用")
private boolean valid;
@ApiModelProperty("是否启用密码")
private boolean enablePwd;
@ApiModelProperty("是否通过密码验证")
private boolean passPwd;
@ApiModelProperty("资源ID")
private String resourceId;
}

2
backend/src/main/java/io/dataease/job/sechedule/Schedular.java
View File

@ -3,9 +3,11 @@ package io.dataease.job.sechedule;
import com.fit2cloud.quartz.anno.QuartzScheduled;
import io.dataease.datasource.service.DatasourceService;
import io.dataease.service.dataset.DataSetTableService;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@Component
public class Schedular {
@Resource
private DataSetTableService dataSetTableService;

78
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -40,10 +40,11 @@ import org.pentaho.di.job.JobMeta;
import org.pentaho.di.job.entries.shell.JobEntryShell;
import org.pentaho.di.job.entries.special.JobEntrySpecial;
import org.pentaho.di.job.entries.success.JobEntrySuccess;
import org.pentaho.di.job.entries.trans.JobEntryTrans;
import org.pentaho.di.job.entry.JobEntryCopy;
import org.pentaho.di.repository.RepositoryDirectoryInterface;
import org.pentaho.di.repository.filerep.KettleFileRepository;
import org.pentaho.di.trans.Trans;
import org.pentaho.di.trans.TransExecutionConfiguration;
import org.pentaho.di.trans.TransHopMeta;
import org.pentaho.di.trans.TransMeta;
import org.pentaho.di.trans.step.StepMeta;
@ -56,6 +57,7 @@ import org.pentaho.di.trans.steps.textfileoutput.TextFileOutputMeta;
import org.pentaho.di.trans.steps.userdefinedjavaclass.UserDefinedJavaClassDef;
import org.pentaho.di.trans.steps.userdefinedjavaclass.UserDefinedJavaClassMeta;
import org.pentaho.di.www.SlaveServerJobStatus;
import org.pentaho.di.www.SlaveServerTransStatus;
import org.quartz.JobExecutionContext;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
@ -572,16 +574,20 @@ public class ExtractDataService {
datasourceService.validate(datasetTable.getDataSourceId());
KettleFileRepository repository = CommonBeanFactory.getBean(KettleFileRepository.class);
RepositoryDirectoryInterface repositoryDirectoryInterface = repository.loadRepositoryDirectoryTree();
TransMeta transMeta = null;
JobMeta jobMeta = null;
switch (extractType) {
case "all_scope":
jobMeta = repository.loadJob("job_" + DorisTableUtils.dorisName(datasetTable.getId()), repositoryDirectoryInterface, null, null);
transMeta = repository.loadTransformation("trans_" + DorisTableUtils.dorisName(datasetTable.getId()), repositoryDirectoryInterface, null, true, "");
break;
case "incremental_add":
jobMeta = repository.loadJob("job_add_" + DorisTableUtils.dorisName(datasetTable.getId()), repositoryDirectoryInterface, null, null);
transMeta = repository.loadTransformation("trans_add_" + DorisTableUtils.dorisName(datasetTable.getId()), repositoryDirectoryInterface, null, true, "");
break;
case "incremental_delete":
jobMeta = repository.loadJob("job_delete_" + DorisTableUtils.dorisName(datasetTable.getId()), repositoryDirectoryInterface, null, null);
transMeta = repository.loadTransformation("trans_delete_" + DorisTableUtils.dorisName(datasetTable.getId()), repositoryDirectoryInterface, null, true, "");
break;
default:
break;
@ -591,9 +597,29 @@ public class ExtractDataService {
JobExecutionConfiguration jobExecutionConfiguration = new JobExecutionConfiguration();
jobExecutionConfiguration.setRemoteServer(remoteSlaveServer);
jobExecutionConfiguration.setRepository(repository);
TransExecutionConfiguration transExecutionConfiguration = new TransExecutionConfiguration();
transExecutionConfiguration.setRepository(repository);
transExecutionConfiguration.setRemoteServer(remoteSlaveServer);
String lastTranceId = Trans.sendToSlaveServer(transMeta, transExecutionConfiguration, repository, null);
SlaveServerTransStatus transStatus = null;
boolean executing = true;
while (executing) {
transStatus = remoteSlaveServer.getTransStatus(transMeta.getName(), lastTranceId, 0);
executing = transStatus.isRunning() || transStatus.isWaiting();
if (!executing)
break;
Thread.sleep(1000);
}
if (!transStatus.getStatusDescription().equals("Finished")) {
DataEaseException.throwException((transStatus.getLoggingString()));
}
executing = true;
String lastCarteObjectId = Job.sendToSlaveServer(jobMeta, jobExecutionConfiguration, repository, null);
SlaveServerJobStatus jobStatus = null;
boolean executing = true;
while (executing) {
jobStatus = remoteSlaveServer.getJobStatus(jobMeta.getName(), lastCarteObjectId, 0);
executing = jobStatus.isRunning() || jobStatus.isWaiting();
@ -666,18 +692,18 @@ public class ExtractDataService {
jobMeta.addJobEntry(startEntry);
//trans
JobEntryTrans transrans = new JobEntryTrans();
transrans.clearResultFiles = true;
transrans.execPerRow = true;
transrans.clearResultRows = true;
transrans.setTransname(transName);
transrans.setName("Transformation");
JobEntryCopy transEntry = new JobEntryCopy(transrans);
transEntry.setDrawn(true);
transEntry.setLocation(300, 100);
jobMeta.addJobEntry(transEntry);
// JobEntryTrans transrans = new JobEntryTrans();
// transrans.clearResultFiles = true;
// transrans.clearResultRows = true;
// transrans.followingAbortRemotely = true;
// transrans.setTransname(transName);
// transrans.setName("Transformation");
// JobEntryCopy transEntry = new JobEntryCopy(transrans);
// transEntry.setDrawn(true);
// transEntry.setLocation(300, 100);
// jobMeta.addJobEntry(transEntry);
jobMeta.addJobHop(new JobHopMeta(startEntry, transEntry));
// jobMeta.addJobHop(new JobHopMeta(startEntry, transEntry));
//exec shell
JobEntryShell shell = new JobEntryShell();
@ -689,7 +715,7 @@ public class ExtractDataService {
shellEntry.setLocation(500, 100);
jobMeta.addJobEntry(shellEntry);
JobHopMeta transHop = new JobHopMeta(transEntry, shellEntry);
JobHopMeta transHop = new JobHopMeta(startEntry, shellEntry);
transHop.setEvaluation(true);
jobMeta.addJobHop(transHop);
@ -879,7 +905,7 @@ public class ExtractDataService {
ExcelInputField[] fields = new ExcelInputField[datasetTableFields.size()];
for (int i = 0; i < datasetTableFields.size(); i++) {
ExcelInputField field = new ExcelInputField();
field.setName(datasetTableFields.get(i).getOriginName());
field.setName(datasetTableFields.get(i).getDataeaseName());
if (datasetTableFields.get(i).getDeExtractType() == 1) {
field.setType("String");
field.setFormat("yyyy-MM-dd HH:mm:ss");
@ -937,6 +963,26 @@ public class ExtractDataService {
textFileField.setType("String");
outputFields[datasetTableFields.size()] = textFileField;
textFileOutputMeta.setOutputFields(outputFields);
}else if(datasource.getType().equalsIgnoreCase(DatasourceTypes.excel.name())) {
TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1];
for(int i=0;i< datasetTableFields.size();i++){
TextFileField textFileField = new TextFileField();
textFileField.setName(datasetTableFields.get(i).getDataeaseName());
if (datasetTableFields.get(i).getDeExtractType() == 2) {
textFileField.setType("Integer");
textFileField.setFormat("0");
} else {
textFileField.setType("String");
}
outputFields[i] = textFileField;
}
TextFileField textFileField = new TextFileField();
textFileField.setName("dataease_uuid");
textFileField.setType("String");
outputFields[datasetTableFields.size()] = textFileField;
textFileOutputMeta.setOutputFields(outputFields);
}else {
textFileOutputMeta.setOutputFields(new TextFileField[0]);
@ -968,7 +1014,7 @@ public class ExtractDataService {
tmp_code = tmp_code.replace("handleWraps", handleWraps);
String Column_Fields = "";
if (datasourceType.equals(DatasourceTypes.excel) || datasourceType.equals(DatasourceTypes.oracle)) {
if (datasourceType.equals(DatasourceTypes.oracle)) {
Column_Fields = String.join(",", datasetTableFields.stream().map(DatasetTableField::getOriginName).collect(Collectors.toList()));
} else {
Column_Fields = String.join(",", datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList()));

3
frontend/src/components/canvas/components/Toolbar.vue
View File

@ -282,6 +282,9 @@ export default {
},
save(withClose) {
// 清理联动信息
this.$store.commit('clearPanelLinkageInfo')
// 保存到数据库
const requestInfo = {
id: this.$store.state.panel.panelInfo.id,

12
frontend/src/views/chart/components/normal/LabelNormal.vue
View File

@ -6,15 +6,17 @@
id="label-content"
:style="content_class"
>
<span v-if="quotaShow" :style="label_space">
<span v-if="quotaShow" :style="label_class">
<p v-for="item in chart.data.series" :key="item.name" :style="label_content_class">
{{ item.data[0] }}
</p>
</span>
<p v-if="dimensionShow" :style="label_class">
<!-- {{ chart.data.x[0] }}-->
{{ chart.data.series[0].name }}
</p>
<span v-if="dimensionShow" :style="label_space">
<p :style="label_class">
<!-- {{ chart.data.x[0] }}-->
{{ chart.data.series[0].name }}
</p>
</span>
</div>
</div>
</template>

6
frontend/src/views/chart/components/shape-attr/ColorSelector.vue
View File

@ -46,12 +46,12 @@
</el-popover>
</el-form-item>
<el-form-item v-show="(chart.type && chart.type.includes('text')) || sourceType==='panelTable'" :label="$t('chart.dimension_color')" class="form-item">
<el-color-picker v-model="colorForm.dimensionColor" class="color-picker-style" @change="changeColorCase" />
</el-form-item>
<el-form-item v-show="(chart.type && chart.type.includes('text')) || sourceType==='panelTable'" :label="$t('chart.quota_color')" class="form-item">
<el-color-picker v-model="colorForm.quotaColor" class="color-picker-style" @change="changeColorCase" />
</el-form-item>
<el-form-item v-show="(chart.type && chart.type.includes('text')) || sourceType==='panelTable'" :label="$t('chart.dimension_color')" class="form-item">
<el-color-picker v-model="colorForm.dimensionColor" class="color-picker-style" @change="changeColorCase" />
</el-form-item>
</div>
<div v-if="sourceType==='view' || sourceType==='panelTable'">
<el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_header_bg')" class="form-item">

11
frontend/src/views/dataset/data/CalcFieldEdit.vue
View File

@ -86,7 +86,7 @@
:disabled="true"
>
<transition-group>
<span v-for="item in dimensionData" :key="item.id" class="item-dimension" :title="item.name" @click="insertParamToCodeMirror('['+item.id+']')">
<span v-for="item in dimensionData" :key="item.id" class="item-dimension" :title="item.name" @click="insertFieldToCodeMirror('['+item.id+']')">
<svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
<svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
<svg-icon v-if="item.deType === 2 || item.deType === 3" icon-class="field_value" class="field-icon-value" />
@ -106,7 +106,7 @@
:disabled="true"
>
<transition-group>
<span v-for="item in quotaData" :key="item.id" class="item-quota" :title="item.name" @click="insertParamToCodeMirror('['+item.id+']')">
<span v-for="item in quotaData" :key="item.id" class="item-quota" :title="item.name" @click="insertFieldToCodeMirror('['+item.id+']')">
<svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
<svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
<svg-icon v-if="item.deType === 2 || item.deType === 3" icon-class="field_value" class="field-icon-value" />
@ -314,6 +314,13 @@ export default {
pos2.ch = pos1.ch
this.$refs.myCm.codemirror.replaceRange(param, pos2)
},
insertFieldToCodeMirror(param) {
const pos1 = this.$refs.myCm.codemirror.getCursor()
const pos2 = {}
pos2.line = pos1.line
pos2.ch = pos1.ch
this.$refs.myCm.codemirror.replaceRange(param, pos2)
},
initFunctions() {
post('/dataset/function/listByTableId/' + this.param.id, null).then(response => {