dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(X-Pack): 修复数据填报获取数据失败的问题

Browse Source
This commit is contained in:
ulleo 2024-11-14 12:06:01 +08:00
parent 7a70161445
commit fe2958f7a0
9 changed files with 151 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
de-xpack

@ -1 +1 @@
Subproject commit 65a0bcf98f60e2218f43306295509d3918dbe320
Subproject commit 9aae0348868c253e8b6a6cc53f2250bcfab3d37c

1
sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfExcelData.java
View File

@ -1,5 +1,6 @@
package io.dataease.api.xpack.dataFilling.dto;
import io.dataease.extensions.datafilling.dto.ExtTableField;
import lombok.Data;
import lombok.experimental.Accessors;

6
sdk/common/pom.xml
View File

@ -130,6 +130,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.dataease</groupId>
<artifactId>extensions-datafilling</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

35
sdk/extensions/extensions-datafilling/pom.xml Normal file
View File

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.dataease</groupId>
<artifactId>extensions</artifactId>
<version>${dataease.version}</version>
</parent>
<artifactId>extensions-datafilling</artifactId>
<dependencies>
<dependency>
<groupId>io.dataease</groupId>
<artifactId>extensions-datasource</artifactId>
<version>${dataease.version}</version>
</dependency>
</dependencies>
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<repositories>
<repository>
<id>fit2cloud-public</id>
<name>Fit2cloud Public</name>
<url>https://repository.fit2cloud.com/repository/fit2cloud-public/</url>
</repository>
</repositories>
</project>

34
sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtIndexField.java Normal file
View File

@ -0,0 +1,34 @@
package io.dataease.extensions.datafilling.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ExtIndexField implements Serializable {
@Serial
private static final long serialVersionUID = -3169849285437114316L;
private String name;
private List<ColumnSetting> columns;
private boolean removed;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public static class ColumnSetting {
private String column;
private String order;
}
}

2
sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtTableField.java → sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtTableField.java
View File

@ -1,4 +1,4 @@
package io.dataease.api.xpack.dataFilling.dto;
package io.dataease.extensions.datafilling.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

21
sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/factory/ExtDDLProviderFactory.java Normal file
View File

@ -0,0 +1,21 @@
package io.dataease.extensions.datafilling.factory;
import io.dataease.extensions.datasource.utils.SpringContextUtil;
import io.dataease.extensions.datasource.vo.DatasourceConfiguration;
import io.dataease.extensions.datafilling.provider.ExtDDLProvider;
public class ExtDDLProviderFactory {
public static ExtDDLProvider getExtDDLProvider(String type) {
DatasourceConfiguration.DatasourceType datasourceType = DatasourceConfiguration.DatasourceType.valueOf(type);
switch (datasourceType) {
case mysql:
case mariadb:
return SpringContextUtil.getApplicationContext().getBean("mysqlExtDDLProvider", ExtDDLProvider.class);
}
return null;
}
}

51
sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/provider/ExtDDLProvider.java Normal file
View File

@ -0,0 +1,51 @@
package io.dataease.extensions.datafilling.provider;
import io.dataease.extensions.datasource.dto.TableField;
import io.dataease.extensions.datafilling.dto.ExtIndexField;
import io.dataease.extensions.datafilling.dto.ExtTableField;
import io.dataease.extensions.datasource.dto.TableFieldWithValue;
import java.util.List;
/**
* 获取对应的sql
*/
public abstract class ExtDDLProvider {
public final String DEFAULT_DATE_FORMAT_STR = "yyyy-MM-dd HH:mm:ss";
public abstract boolean supportDataFilling();
public abstract String createTableSql(String table, List<ExtTableField> formFields);
public abstract String getTableFieldsSql(String table);
public abstract String addTableColumnSql(String table, List<ExtTableField> formFieldsToCreate, List<ExtTableField> formFieldsToModify);
public abstract String dropTableColumnSql(String table, List<ExtTableField> formFields);
public abstract String searchSql(String table, List<TableField> formFields, String whereSql, long limit, long offset);
public abstract String searchColumnData(String table, String column, String order);
public abstract String countSql(String table, String whereSql);
public abstract String dropTableSql(String table);
public abstract List<String> createTableIndexSql(String table, List<ExtIndexField> indexFields);
public abstract List<String> dropTableIndexSql(String table, List<ExtIndexField> indexFields);
public abstract String deleteDataByIdsSql(String table, List<TableFieldWithValue> pks);
public abstract String insertDataSql(String tableName, List<TableFieldWithValue> fields, int count);
public abstract String updateDataByIdSql(String tableName, List<TableFieldWithValue> fields, TableFieldWithValue pk);
public abstract String checkUniqueValueSql(String tableName, TableFieldWithValue field, TableFieldWithValue pk);
public abstract String whereSql(String tableName, List<TableField> searchFields);
public abstract String getLowerCaseTaleNames();
}

1
sdk/extensions/pom.xml
View File

@ -13,6 +13,7 @@
<modules>
<module>extensions-view</module>
<module>extensions-datasource</module>
<module>extensions-datafilling</module>
</modules>
<artifactId>extensions</artifactId>