diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/TableInfoMapper.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/TableInfoMapper.java index fd32d46..837ea13 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/TableInfoMapper.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/TableInfoMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.etl.domain.TableInfo; +import org.apache.ibatis.annotations.Param; /** * 库表基础信息Mapper接口 @@ -60,4 +61,7 @@ public interface TableInfoMapper extends BaseMapper * @return 结果 */ public int deleteTableInfoByIds(Long[] ids); + + + TableInfo selectTableInfoByName(TableInfo table); } diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/TableInfoService.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/TableInfoService.java index 53df0c9..87b8044 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/TableInfoService.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/TableInfoService.java @@ -60,4 +60,7 @@ public interface TableInfoService extends IService * @return 结果 */ public int deleteTableInfoById(Long id); + + TableInfo selectTableInfoByName(TableInfo build); + } diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java index d308a45..501f3e6 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.muyu.etl.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -154,10 +155,7 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl structureList = new ArrayList<>(); while (resultSet.next()){ - String columnName = resultSet.getObject(0).toString(); - String columnComment = resultSet.getObject(1).toString(); - String columnKey = resultSet.getObject(2).toString(); - String end = resultSet.getObject(3).toString(); - String dataType = resultSet.getObject(4).toString(); - String columnType = resultSet.getObject(5).toString(); - String characterMaximumLength = resultSet.getObject(6).toString(); - String NumericScale = resultSet.getObject(7).toString(); - String isNullable = resultSet.getObject(8).toString(); - String columnDefault = resultSet.getObject(9).toString(); - System.out.println(columnName); - System.out.println(columnComment); - System.out.println(columnKey); - System.out.println(end); - System.out.println(dataType); - System.out.println(columnType); - System.out.println(characterMaximumLength); - System.out.println(NumericScale); - System.out.println(isNullable); - System.out.println(columnDefault); + String columnName = (String) resultSet.getString(1); + String columnComment = (String) resultSet.getObject(2); + String columnKey = (String) resultSet.getObject(3); + String end = (String) resultSet.getObject(4); + String dataType = (String) resultSet.getObject(5); + String columnType = (String) resultSet.getObject(6); + String characterMaximumLength = String.valueOf(resultSet.getInt(7)); + String NumericScale = String.valueOf(resultSet.getInt(8)); + String isNullable = (String) resultSet.getObject(9); + String columnDefault = (String) resultSet.getObject(10); + Structure build = Structure.builder() .tableId(table.getId()) - .columnName(columnName) + .columnName(String.valueOf(columnName)) .columnRemark(columnComment) .isPrimary("是".equals(columnKey) ? "Y" : "N") - .javaType(end) - .columnType(dataType) + .javaType( end) + .columnType( dataType) .columnType(columnType) .columnLength(characterMaximumLength) - .columnDecimals(NumericScale) + .columnDecimals( NumericScale) .isNull("YES".equals(isNullable) ? "Y" : "N") - .defaultValue(columnDefault) + .defaultValue( columnDefault) .build(); log.info(build); - structureList.add(build); + structureService.saveOrUpdate(build,new LambdaUpdateWrapper(){{ + eq(Structure::getTableId,build.getTableId()); + eq(Structure::getColumnName,build.getColumnName()); + eq(Structure::getRemark,build.getRemark()); + }}); } } @@ -287,48 +286,6 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl map = new HashMap<>(); -// // 列明 -// map.put("columnName", rs.getString("COLUMN_NAME")); -// // 列类型 -// map.put("typeName", rs.getString("TYPE_NAME")); -// // 列备注 -// map.put("remarks", rs.getString("REMARKS")); -//// list.add(map); -// //库名 -// System.out.println("TABLE_CAT" + "===" + rs.getString("TABLE_CAT")); -// -// System.out.println("TABLE_SCHEM" + "===" + rs.getString("TABLE_SCHEM")); -// System.out.println("TABLE_NAME" + "===" + rs.getString("TABLE_NAME")); -//// System.out.println("NON_UNIQUE" + "===" + rs.getString("NON_UNIQUE")); -// System.out.println("INDEX_QUALIFIER" + "===" + rs.getString("INDEX_QUALIFIER")); -// System.out.println("INDEX_NAME" + "===" + rs.getString("INDEX_NAME")); -// System.out.println("TYPE" + "===" + rs.getString("TYPE")); -// System.out.println("ORDINAL_POSITION" + "===" + rs.getString("ORDINAL_POSITION")); -// System.out.println("COLUMN_NAME" + "===" + rs.getString("COLUMN_NAME")); -// System.out.println("ASC_OR_DESC" + "===" + rs.getString("ASC_OR_DESC")); -// System.out.println("CARDINALITY" + "===" + rs.getString("CARDINALITY")); -// System.out.println("PAGES" + "===" + rs.getString("PAGES")); -// System.out.println("FILTER_CONDITION" + "===" + rs.getString("FILTER_CONDITION")); -// -// } -// }catch (Exception e){ -// log.error(e.getMessage()); -// continue; -// } -// } } } catch (Exception e){ log.error(e.getMessage()); diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/TableInfoServiceImpl.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/TableInfoServiceImpl.java index 35b655a..a0c7f04 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/TableInfoServiceImpl.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/TableInfoServiceImpl.java @@ -95,4 +95,9 @@ public class TableInfoServiceImpl extends ServiceImpl + + + insert into table_info