From 4a71865e3f05b91c29dcddae79197fadb4e08c1b Mon Sep 17 00:00:00 2001 From: chao <3072464591@QQ.com> Date: Sun, 28 Apr 2024 14:04:37 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E5=A2=9E=E5=8A=A0=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataSourceServiceImpl.java | 30 +++++++++++++++++-- .../impl/AssetStructureServiceImpl.java | 4 +++ .../impl/AssetStructureTableServiceImpl.java | 1 - .../impl/AssetTableDetailsServiceImpl.java | 5 +++- .../service/impl/DataTypeServiceImpl.java | 10 +++++++ 5 files changed, 45 insertions(+), 5 deletions(-) diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/service/impl/DataSourceServiceImpl.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/service/impl/DataSourceServiceImpl.java index ec8f7b6..ef2dc27 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/service/impl/DataSourceServiceImpl.java +++ b/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/service/impl/DataSourceServiceImpl.java @@ -64,6 +64,7 @@ public class DataSourceServiceImpl extends ServiceImpl selectDataSourceList(DataSource dataSource) { + log.info("查询数据源信息列表"); List dataSources = dataSourceMapper.selectDataSourceList(dataSource); + log.info("查询数据源连接类型"); List dataTypeList = dataTypeService.list(); List dataSourceResps = new ArrayList<>(); + log.info("过滤当前数据源连接数据类型"); dataSources.stream() .flatMap(source -> dataTypeList.stream() .filter(dataType -> dataType.getId().equals(source.getTypeId())) .map(dataType -> DataSourceResp.dataSourceBuilder(source, dataType)) ).forEach(dataSourceResps::add); + log.info("返回查询出的数据源信息+数据源类型信息"); return dataSourceResps; } @@ -96,6 +101,7 @@ public class DataSourceServiceImpl extends ServiceImpl() .eq(DataSource::getId, id) ); + log.info("根据查询出的数据源类型id获取数据源类型"); DataType dataType = dataTypeService.getOne( new LambdaQueryWrapper() .eq(DataType::getId, dataSource.getTypeId()) ); boolean flag = false; + log.info("判断数据源驱动和jdbc前缀是否为空"); if (dataType.getDriverManager() != null && dataType.getJdbcPre() != null) { + log.info("调用测试连接方法"); flag = testDatasource(dataSource, dataType); } else { + log.info("调用redis测试连接方法"); // 调用redis测试是否连接方法 flag = this.redisConnection(dataSource); } if (flag) { + log.info("连接成功,更新数据源状态为S"); this.update(new UpdateWrapper().set("status", "S").eq("id", id)); } else { + log.info("连接失败,更新数据源状态为E"); this.update(new UpdateWrapper().set("status", "E").eq("id", id)); } return flag; @@ -172,11 +188,13 @@ public class DataSourceServiceImpl extends ServiceImpl() .eq(DataSource::getId, id) ); - // 查询是否存在当前 + // 查询是否存在当前数据源 + log.info("查询是否存在当前数据源"); AssetStructure assetStructure = assetStructureService.getOne( new LambdaQueryWrapper() .eq(AssetStructure::getDataSourceSystemId, id) @@ -211,16 +229,17 @@ public class DataSourceServiceImpl extends ServiceImpl assetStructureTables = assetStructureTableService.list( new LambdaQueryWrapper() .eq(AssetStructureTable::getAssetStructureId, entity.getId()) ); // 删除资产结构表信息 + log.info("删除原有数据"); assetStructureTableService.remove( new LambdaQueryWrapper() .eq(AssetStructureTable::getAssetStructureId, entity.getId()) ); - log.info("已删除原数据,正在准备同步新数据"); DataType dataType = dataTypeService.selectDataTypeById(dataSource.getTypeId()); // 获取数据 Map jdbcSyncMap = this.jdbcSync(entity, dataSource, dataType); @@ -231,8 +250,12 @@ public class DataSourceServiceImpl extends ServiceImpl assetStructureTable.getId() ).collect(Collectors.toList()); for (Long assetStructureTableId : collect) { - assetTableDetailsService.remove(new LambdaQueryWrapper().eq(AssetTableDetails::getAssetStructureTableId, assetStructureTableId)); + assetTableDetailsService.remove( + new LambdaQueryWrapper() + .eq(AssetTableDetails::getAssetStructureTableId, assetStructureTableId) + ); } + log.info("已删除原数据,正在准备同步新数据"); assetTableDetailsSync(assetStructureTableList, connection); } } @@ -503,6 +526,7 @@ public class DataSourceServiceImpl extends ServiceImpl implements IAssetStructureService { @Autowired @@ -34,8 +36,10 @@ public class AssetStructureServiceImpl extends ServiceImpl assetStructureList = this.list(); + log.info("查询数据资产表列表"); List assetStructureTableList = assetStructureTableService.list(); // 统计数据 diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/impl/AssetStructureTableServiceImpl.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/impl/AssetStructureTableServiceImpl.java index e2ea51b..7dd96df 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/impl/AssetStructureTableServiceImpl.java +++ b/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/impl/AssetStructureTableServiceImpl.java @@ -55,7 +55,6 @@ public class AssetStructureTableServiceImpl extends ServiceImpl assetTableDetails = assetTableDetailsService.selectAssetTableDetailsList(); // 遍历assetStructureTableList，获取每个AssetStructureTable的AssetTableDetails diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/impl/AssetTableDetailsServiceImpl.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/impl/AssetTableDetailsServiceImpl.java index dd2923f..a98972a 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/impl/AssetTableDetailsServiceImpl.java +++ b/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/impl/AssetTableDetailsServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.etl.data.structure.domain.AssetTableDetails; import com.etl.data.structure.mapper.AssetTableDetailsMapper; import com.etl.data.structure.service.IAssetTableDetailsService; +import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Service; import java.util.List; @@ -16,14 +17,16 @@ import java.util.List; * @CreateTime: 2024/4/23 下午7:45 */ @Service +@Log4j2 public class AssetTableDetailsServiceImpl extends ServiceImpl implements IAssetTableDetailsService { /** - * 根据表id获取数据详情 + * 获取数据详情 * * @return 数据详情列表 */ @Override public List selectAssetTableDetailsList() { + log.info("获取所有数据详情列表"); return this.list(); } } diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/type/service/impl/DataTypeServiceImpl.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/type/service/impl/DataTypeServiceImpl.java index 5f076d2..c7b1f9b 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/type/service/impl/DataTypeServiceImpl.java +++ b/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/type/service/impl/DataTypeServiceImpl.java @@ -5,6 +5,7 @@ import com.etl.common.core.utils.DateUtils; import com.etl.data.type.domain.DataType; import com.etl.data.type.mapper.DataTypeMapper; import com.etl.data.type.service.IDataTypeService; +import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,6 +18,8 @@ import java.util.List; * @date 2024-04-21 */ @Service +@Log4j2 + public class DataTypeServiceImpl extends ServiceImpl implements IDataTypeService { @Autowired private DataTypeMapper dataTypeMapper; @@ -29,6 +32,7 @@ public class DataTypeServiceImpl extends ServiceImpl i */ @Override public DataType selectDataTypeById(Long id) { + log.info("查询数据源类型"); return dataTypeMapper.selectDataTypeById(id); } @@ -40,6 +44,7 @@ public class DataTypeServiceImpl extends ServiceImpl i */ @Override public List selectDataTypeList(DataType dataType) { + log.info("获取所有数据源类型列表"); return dataTypeMapper.selectDataTypeList(dataType); } @@ -53,6 +58,7 @@ public class DataTypeServiceImpl extends ServiceImpl i public int insertDataType(DataType dataType) { dataType.setCreateTime(DateUtils.getNowDate()); dataType.setDataType(lowerCase(dataType.getDataType())); + log.info("新增数据源类型"); return dataTypeMapper.insertDataType(dataType); } @@ -66,6 +72,7 @@ public class DataTypeServiceImpl extends ServiceImpl i public int updateDataType(DataType dataType) { dataType.setUpdateTime(DateUtils.getNowDate()); dataType.setDataType(lowerCase(dataType.getDataType())); + log.info("新增数据源类型"); return dataTypeMapper.updateDataType(dataType); } @@ -77,6 +84,7 @@ public class DataTypeServiceImpl extends ServiceImpl i */ @Override public int deleteDataTypeByIds(Long[] ids) { + log.info("批量删除数据源类型"); return dataTypeMapper.deleteDataTypeByIds(ids); } @@ -88,6 +96,7 @@ public class DataTypeServiceImpl extends ServiceImpl i */ @Override public int deleteDataTypeById(Long id) { + log.info("删除数据源类型"); return dataTypeMapper.deleteDataTypeById(id); } @@ -97,6 +106,7 @@ public class DataTypeServiceImpl extends ServiceImpl i * @return 转换后的参数 */ public static String lowerCase(String str){ + log.info("添加修改数据源类型时将所有的大写转换成小写并清除中间所有的空格"); return str.toLowerCase().replaceAll(" ",""); } }