From 8a16792a4ffc6ede4510594ac4118893b124de96 Mon Sep 17 00:00:00 2001 From: lwj <3529558005@qq.com> Date: Tue, 10 Sep 2024 19:25:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/mysql/MySqlDataSource.java | 14 +++- .../com/muyu/data/base/BaseDataSource.java | 4 +- .../main/java/com/muyu/domain/DataValue.java | 22 ------ .../java/com/muyu/domain/enums/DataType.java | 77 ------------------- .../etl/controller/AccreditController.java | 7 +- .../etl/controller/DataValueController.java | 4 +- .../etl/controller/ProductController.java | 2 +- .../cloud/etl/service/DataValueService.java | 2 +- .../cloud/etl/service/ProductService.java | 2 +- .../service/impl/DataValueServiceImpl.java | 4 +- .../etl/service/impl/ProductServiceImpl.java | 4 +- 11 files changed, 25 insertions(+), 117 deletions(-) delete mode 100644 cloud-etl-common/src/main/java/com/muyu/domain/DataValue.java delete mode 100644 cloud-etl-common/src/main/java/com/muyu/domain/enums/DataType.java diff --git a/cloud-etl-client/src/main/java/com/muyu/mysql/MySqlDataSource.java b/cloud-etl-client/src/main/java/com/muyu/mysql/MySqlDataSource.java index 2079117..0fc5b79 100644 --- a/cloud-etl-client/src/main/java/com/muyu/mysql/MySqlDataSource.java +++ b/cloud-etl-client/src/main/java/com/muyu/mysql/MySqlDataSource.java @@ -3,9 +3,9 @@ package com.muyu.mysql; import com.muyu.basic.SourceConfig; import com.muyu.data.base.BaseDataAbsSource; -import com.muyu.domain.DataValue; import com.muyu.domain.Source; -import com.muyu.domain.enums.DataType; +import com.muyu.etl.domain.DataValue; +import com.muyu.etl.enums.DataType; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import lombok.extern.log4j.Log4j2; @@ -390,6 +390,7 @@ public class MySqlDataSource extends BaseDataAbsSource { log.info("反复循环的次数为：{}",i); if (resultSet.isFirst()){ String columnTypeName = metaData.getColumnTypeName(i); + DatabaseMetaData metaDataColumns = conn.getMetaData(); ResultSet columns = metaDataColumns.getColumns(null, null, metaData.getTableName(i), metaData.getColumnName(i)); String remarks =null; @@ -399,14 +400,21 @@ public class MySqlDataSource extends BaseDataAbsSource { remarks = columns.getString("REMARKS"); log.info("字段备注:"+remarks); } + + log.info("字段备注提取完成"); Class clazz = DataType.convertType(columnTypeName); log.info("字段类型：{}", clazz.getName()); + Object object = resultSet.getObject(i, clazz); log.info("字段类型：{}", object); + String key = metaData.getColumnName(i); + log.info("字段Key：{}", key); - log.info("columnTypeName{},",columnTypeName); + + log.info("columnTypeName：{},",columnTypeName); + DataType bySqlType = DataType.findBySqlType(columnTypeName); log.info("字段数据类型：{}", bySqlType); DataValue build = DataValue.builder() diff --git a/cloud-etl-common/src/main/java/com/muyu/data/base/BaseDataSource.java b/cloud-etl-common/src/main/java/com/muyu/data/base/BaseDataSource.java index 4aaab4b..b976b1b 100644 --- a/cloud-etl-common/src/main/java/com/muyu/data/base/BaseDataSource.java +++ b/cloud-etl-common/src/main/java/com/muyu/data/base/BaseDataSource.java @@ -1,9 +1,7 @@ package com.muyu.data.base; - - -import com.muyu.domain.DataValue; +import com.muyu.etl.domain.DataValue; /** * 数据源基准 diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/DataValue.java b/cloud-etl-common/src/main/java/com/muyu/domain/DataValue.java deleted file mode 100644 index d65b81a..0000000 --- a/cloud-etl-common/src/main/java/com/muyu/domain/DataValue.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.domain; - -import com.muyu.domain.enums.DataType; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class DataValue { - - private String key; - - private String label; - - private DataType type; - - private Object value; -} diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/enums/DataType.java b/cloud-etl-common/src/main/java/com/muyu/domain/enums/DataType.java deleted file mode 100644 index de27f96..0000000 --- a/cloud-etl-common/src/main/java/com/muyu/domain/enums/DataType.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.muyu.domain.enums; - -import java.math.BigDecimal; -import java.util.Date; - - -public enum DataType { - - VARCHAR("varchar",String.class,"String"), - BIGINT("bigint",Long.class,"Long"), - INT("int",Integer.class,"Integer"), - DECIMAL("decimal", BigDecimal.class,"BigDecimal"), - DATETIME("datetime", Date.class,"Date"), - TEXT ("text",String.class,"String"), - DOUBLE ("double",Double.class,"Double"); - - private final String sourceType; - private final Class targetType; - private final String javaType; - - public String getSourceType() { - return sourceType; - } - - public Class getTargetType() { - return targetType; - } - - public String getJavaType() { - return javaType; - } - - - - DataType(String sourceType, Class targetType, String javaType) { - this.sourceType = sourceType; - this.targetType = targetType; - this.javaType = javaType; - } - - - public static Class convertType(String type){ - for (DataType dataType : DataType.values()) { - if(dataType.sourceType.equalsIgnoreCase(type)){ - return dataType.targetType; - } - } - return String.class; - } - - - public static String convertTypeString(String type){ - - for (DataType dataType : DataType.values()) { - if (dataType.sourceType.equalsIgnoreCase(type)){ - return dataType.javaType; - } - } - return "String"; - } - - - public static DataType findBySqlType(String sqlType){ - for (DataType dataType : DataType.values()) { - if (dataType.getSourceType().equalsIgnoreCase(sqlType)){ - return dataType; - } - } - return VARCHAR; - } - - - - - - -} diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/AccreditController.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/AccreditController.java index d236709..5ada36d 100644 --- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/AccreditController.java +++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/AccreditController.java @@ -7,6 +7,7 @@ import com.muyu.domain.Accredit; import com.muyu.domain.rep.AccreditDeptRep; import com.muyu.domain.rep.AccreditUserRep; import com.muyu.domain.req.AccreditReq; +import com.muyu.etl.domain.DataValue; import com.muyu.mysql.MySqlDataSource; import com.muyu.mysql.MySqlQuery; import lombok.extern.log4j.Log4j2; @@ -67,11 +68,11 @@ public class AccreditController { @PostMapping("texttt") - public Result remove(@RequestBody MySqlQuery query) { + public DataValue[][] remove(@RequestBody MySqlQuery query) { mySqlDataSource.setQuery(query); System.out.println("amnmnmnmnmnmmnnm"); - mySqlDataSource.getRows(); - return null; + DataValue[][] rows = mySqlDataSource.getRows(); + return rows; } diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/DataValueController.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/DataValueController.java index 3761ceb..bf4887a 100644 --- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/DataValueController.java +++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/DataValueController.java @@ -2,7 +2,7 @@ package com.muyu.cloud.etl.controller; import com.muyu.cloud.etl.service.DataValueService; import com.muyu.common.core.domain.Result; -import com.muyu.domain.DataValue; +import com.muyu.etl.domain.DataValue; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -16,7 +16,7 @@ public class DataValueController { //获取字段值 供任务调用 @PostMapping("/findTableValue") - public Result>> findTableValue(@RequestParam("basicId") Long basicId,@RequestParam("sql") String sql) { + public Result>> findTableValue(@RequestParam("basicId") Long basicId, @RequestParam("sql") String sql) { List> list= dataValueService.findTableValue(basicId,sql); return Result.success(list); } diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/ProductController.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/ProductController.java index 500f6ea..8ba606c 100644 --- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/ProductController.java +++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/ProductController.java @@ -2,7 +2,7 @@ package com.muyu.cloud.etl.controller; import com.muyu.cloud.etl.service.ProductService; import com.muyu.common.core.domain.Result; -import com.muyu.domain.DataValue; +import com.muyu.etl.domain.DataValue; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/DataValueService.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/DataValueService.java index f7312f1..74bd32f 100644 --- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/DataValueService.java +++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/DataValueService.java @@ -1,6 +1,6 @@ package com.muyu.cloud.etl.service; -import com.muyu.domain.DataValue; +import com.muyu.etl.domain.DataValue; import java.util.List; diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/ProductService.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/ProductService.java index c5a026c..115e90c 100644 --- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/ProductService.java +++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/ProductService.java @@ -1,6 +1,6 @@ package com.muyu.cloud.etl.service; -import com.muyu.domain.DataValue; +import com.muyu.etl.domain.DataValue; public interface ProductService { int addProduct(Long basicId, Long tableId, DataValue[][] listList); diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/DataValueServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/DataValueServiceImpl.java index 66082c9..db5605a 100644 --- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/DataValueServiceImpl.java +++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/DataValueServiceImpl.java @@ -5,10 +5,10 @@ import com.muyu.cloud.etl.service.DataValueService; import com.muyu.cloud.etl.service.SourceService; import com.muyu.cloud.etl.service.TableInfoService; import com.muyu.data.base.BaseQueryHandler; -import com.muyu.domain.DataValue; import com.muyu.domain.Source; import com.muyu.domain.TableInfo; -import com.muyu.domain.enums.DataType; +import com.muyu.etl.domain.DataValue; +import com.muyu.etl.enums.DataType; import com.muyu.mysql.MySqlDataSource; import com.muyu.mysql.MySqlQuery; import com.zaxxer.hikari.HikariDataSource; diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/ProductServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/ProductServiceImpl.java index 49bc0fb..35b8736 100644 --- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/ProductServiceImpl.java +++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/ProductServiceImpl.java @@ -3,10 +3,10 @@ package com.muyu.cloud.etl.service.impl; import com.muyu.cloud.etl.service.ProductService; import com.muyu.cloud.etl.service.SourceService; import com.muyu.cloud.etl.service.TableInfoService; -import com.muyu.domain.DataValue; import com.muyu.domain.Source; import com.muyu.domain.TableInfo; -import com.muyu.domain.enums.DataType; +import com.muyu.etl.domain.DataValue; +import com.muyu.etl.enums.DataType; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import lombok.extern.slf4j.Slf4j;