diff --git a/muyu-common/muyu-common-data-standard/pom.xml b/muyu-common/muyu-common-data-standard/pom.xml
new file mode 100644
index 0000000..8222d09
--- /dev/null
+++ b/muyu-common/muyu-common-data-standard/pom.xml
@@ -0,0 +1,31 @@
+
+
+ 4.0.0
+
+ com.muyu
+ muyu-common
+ 3.6.3
+
+
+ com.bwie
+ muyu-common-data-standard
+
+
+ 17
+ 17
+ UTF-8
+
+
+ muyu-common-data-standard数据标准包
+
+
+
+
+ com.muyu
+ muyu-common-core
+ 3.6.3
+
+
+
diff --git a/muyu-common/pom.xml b/muyu-common/pom.xml
index 5b58e93..1bc36d4 100644
--- a/muyu-common/pom.xml
+++ b/muyu-common/pom.xml
@@ -18,6 +18,7 @@
muyu-common-datascope
muyu-common-datasource
muyu-common-system
+ muyu-common-data-standard
muyu-common
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DataSourceController.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DataSourceController.java
index 78aa731..2994c10 100644
--- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DataSourceController.java
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DataSourceController.java
@@ -208,7 +208,7 @@ public class DataSourceController extends BaseController {
}
@PostMapping("/findDataSourceByDataBaseId")
- public Result findDataSourceByDataBaseId(@RequestParam Integer id){
+ public Result> findDataSourceByDataBaseId(@RequestParam Integer id){
return dataSourceService.findDataSourceByDataBaseId(id);
}
}
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DataSourceMapper.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DataSourceMapper.java
index d29c008..5afb97f 100644
--- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DataSourceMapper.java
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DataSourceMapper.java
@@ -52,6 +52,8 @@ public interface DataSourceMapper extends BaseMapper {
DataBaseTable findDataBaseTableId(@Param("id") Integer id);
+ void addDataValue(@Param("dataValueList") List dataValueList);
+
// AssetStructure findDatabaseName(DataSource dataSource);
// void updateAssets(@Param("assetStructure") AssetStructure assetStructure, @Param("id") Long id);
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DataSourceService.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DataSourceService.java
index ee15e18..0796b73 100644
--- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DataSourceService.java
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DataSourceService.java
@@ -47,5 +47,5 @@ public interface DataSourceService extends IService {
Result updateDatabaseTable(DataBaseTable dataBaseTable);
- Result findDataSourceByDataBaseId(Integer id);
+ Result> findDataSourceByDataBaseId(Integer id);
}
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DataSourceServiceImpl.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DataSourceServiceImpl.java
index 201e2cc..b3abf8f 100644
--- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DataSourceServiceImpl.java
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DataSourceServiceImpl.java
@@ -2,8 +2,6 @@ package com.muyu.data.source.service.impl;
import java.sql.*;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
import java.util.List;
import com.muyu.common.core.domain.Result;
@@ -166,29 +164,8 @@ public class DataSourceServiceImpl extends ServiceImpl findDataBaseTable(Long id) {
DatabaseTableInformation databaseTableInformation=dataSourceMapper.findDataBaseTableBy(id);
return Result.success(databaseTableInformation);
@@ -355,9 +337,9 @@ public class DataSourceServiceImpl extends ServiceImpl> findDataSourceByDataBaseId(Integer id) {
+// DataBaseTable dataBaseTable=dataSourceMapper.findDataBaseTableId(id);
+ DatabaseTableInformation databaseTableInformation=dataSourceMapper.findDataBaseTableBy(Long.valueOf(id));
AssetStructure assetStructure=dataSourceMapper.findAssetsById(databaseTableInformation.getStructureId());
//连接驱动
@@ -367,28 +349,32 @@ public class DataSourceServiceImpl extends ServiceImpl dataValueList = new ArrayList<>();
try (Connection con = DriverManager.getConnection(url, user, password)){
- PreparedStatement preparedStatement = con.prepareStatement(query);
- ResultSet executeQuery = preparedStatement.executeQuery();
- System.out.println("13");
- return Result.success(executeQuery);
-// ResultSetMetaData metaData1 = executeQuery.getMetaData();
-
-// ResultSetMetaData metaData = preparedStatement.getMetaData();
-// ParameterMetaData parameterMetaData = preparedStatement.getParameterMetaData();
-// System.out.println(parameterMetaData);
-// return Result.success(metaData1);
-// System.out.println(metaData);
-// return Result.success(metaData);
- }catch (Exception e){
+ Statement statement = con.createStatement();
+ ResultSet executeQuery = statement.executeQuery(query);
+ ResultSetMetaData metaData = executeQuery.getMetaData();
+ while (executeQuery.next()){
+ for (int i = 1; i <= metaData.getColumnCount(); i++) {
+ DataValue dataValue = new DataValue();
+ String columnName = metaData.getColumnName(i);
+ dataValue.setValue(executeQuery.getObject(i));
+ dataValue.setType(metaData.getColumnTypeName(i));
+ dataValue.setInformationId(databaseTableInformation.getId());
+ dataValue.setKey(columnName);
+ dataValueList.add(dataValue);
+ }
+ }
+ System.out.println(dataValueList);
+ return Result.success(dataValueList);
+ }
+ catch (Exception e){
System.out.println("连接失败"+e.getMessage());
return Result.error("连接失败");
}
-
}
-
}
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/dataSource/DataSourceMapper.xml b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/dataSource/DataSourceMapper.xml
index f59a163..b8114ae 100644
--- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/dataSource/DataSourceMapper.xml
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/dataSource/DataSourceMapper.xml
@@ -109,6 +109,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
+
+ INSERT INTO `data_management`.`data_value`
+ (
+ `key`,
+ `value`,
+ `type`,
+ `information_id`
+ )
+ VALUES
+
+ (
+ #{dataValueList.key},
+ #{dataValueList.value},
+ #{dataValueList.type},
+ #{dataValueList.informationId}
+ )
+
+
UPDATE `data_management`.`database_table` SET
`tableName` = #{dataBaseTable.tableName},