From 8e663c26ee06e0c2a9f2ff46dfb7ebbc50ae4c3d Mon Sep 17 00:00:00 2001 From: yutao <3082046177@qq.com> Date: Mon, 4 Aug 2025 17:54:48 +0800 Subject: [PATCH] init --- .../DashBoardController.java | 2 +- .../{ => hostMonitor}/HostMonitor.java | 2 +- .../{ => hostMonitor}/HostMonitorValue.java | 2 +- .../HostMonitorValueRepository.java | 6 +- .../statistics/StatisticsService.java | 13 +++ .../impl/AbstractDataSourceCountService.java | 13 +++ .../impl/AbstractRowCountService.java | 11 +++ .../AbstractSourceBizTableCountService.java | 11 +++ .../impl/CacheableStatisticsService.java | 70 +++++++++++++++ .../indicator}/IndicatorRepository.java | 8 +- .../indicator/dao/IndicatorDao.java | 86 +++++++++++++++++++ .../dao/entity/IndicatorEntity.java | 9 +- .../dao/mapper/IndicatorMapper.java | 4 +- .../{ => indicator}/value/Indicator.java | 3 +- .../request/SourceTableRequest.java | 6 -- .../CacheableTableDefinitionRepository.java | 6 +- .../DataGovernanceController.java | 2 +- .../DefaultTableDefinitionRepository.java | 6 +- .../TableDefinitionRepository.java | 6 +- .../request/SourceTableRequest.java | 6 ++ .../request/TableFieldRequest.java | 2 +- .../value/TableDefinitionItem.java | 2 +- .../value/TableTree.java | 2 +- .../{dao => dataService}/DwsRepository.java | 2 +- .../HiveQueryExecutor.java | 3 +- .../sqlutil => dataService}/SqlParser.java | 2 +- .../ediagnosis/cdr/dao/DwsRepositoryTest.java | 1 + .../cdr/dataGovernance/TableTreeTest.java | 2 +- 28 files changed, 245 insertions(+), 43 deletions(-) rename src/main/java/com/ediagnosis/cdr/dashBoard/{ => hostMonitor}/DashBoardController.java (95%) rename src/main/java/com/ediagnosis/cdr/dashBoard/{ => hostMonitor}/HostMonitor.java (99%) rename src/main/java/com/ediagnosis/cdr/dashBoard/{ => hostMonitor}/HostMonitorValue.java (92%) rename src/main/java/com/ediagnosis/cdr/dashBoard/{ => hostMonitor}/HostMonitorValueRepository.java (94%) create mode 100644 src/main/java/com/ediagnosis/cdr/dashBoard/statistics/StatisticsService.java create mode 100644 src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractDataSourceCountService.java create mode 100644 src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractRowCountService.java create mode 100644 src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractSourceBizTableCountService.java create mode 100644 src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/CacheableStatisticsService.java rename src/main/java/com/ediagnosis/cdr/{dao => dataGovernance/indicator}/IndicatorRepository.java (73%) create mode 100644 src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/IndicatorDao.java rename src/main/java/com/ediagnosis/cdr/{ => dataGovernance/indicator}/dao/entity/IndicatorEntity.java (92%) rename src/main/java/com/ediagnosis/cdr/{ => dataGovernance/indicator}/dao/mapper/IndicatorMapper.java (56%) rename src/main/java/com/ediagnosis/cdr/dataGovernance/{ => indicator}/value/Indicator.java (65%) delete mode 100644 src/main/java/com/ediagnosis/cdr/dataGovernance/request/SourceTableRequest.java rename src/main/java/com/ediagnosis/cdr/{dataGovernance => dataIntegration}/CacheableTableDefinitionRepository.java (85%) rename src/main/java/com/ediagnosis/cdr/{dataGovernance => dataIntegration}/DataGovernanceController.java (74%) rename src/main/java/com/ediagnosis/cdr/{dataGovernance => dataIntegration}/DefaultTableDefinitionRepository.java (69%) rename src/main/java/com/ediagnosis/cdr/{dataGovernance => dataIntegration}/TableDefinitionRepository.java (60%) create mode 100644 src/main/java/com/ediagnosis/cdr/dataIntegration/request/SourceTableRequest.java rename src/main/java/com/ediagnosis/cdr/{dataGovernance => dataIntegration}/request/TableFieldRequest.java (68%) rename src/main/java/com/ediagnosis/cdr/{dataGovernance => dataIntegration}/value/TableDefinitionItem.java (68%) rename src/main/java/com/ediagnosis/cdr/{dataGovernance => dataIntegration}/value/TableTree.java (97%) rename src/main/java/com/ediagnosis/cdr/{dao => dataService}/DwsRepository.java (97%) rename src/main/java/com/ediagnosis/cdr/{dao => dataService}/HiveQueryExecutor.java (92%) rename src/main/java/com/ediagnosis/cdr/{dao/sqlutil => dataService}/SqlParser.java (98%) diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/DashBoardController.java b/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/DashBoardController.java similarity index 95% rename from src/main/java/com/ediagnosis/cdr/dashBoard/DashBoardController.java rename to src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/DashBoardController.java index 86c3e1c..723240b 100644 --- a/src/main/java/com/ediagnosis/cdr/dashBoard/DashBoardController.java +++ b/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/DashBoardController.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dashBoard; +package com.ediagnosis.cdr.dashBoard.hostMonitor; import com.ediagnosis.cdr.context.value.Response; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/HostMonitor.java b/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitor.java similarity index 99% rename from src/main/java/com/ediagnosis/cdr/dashBoard/HostMonitor.java rename to src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitor.java index f55c897..02de837 100644 --- a/src/main/java/com/ediagnosis/cdr/dashBoard/HostMonitor.java +++ b/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitor.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dashBoard; +package com.ediagnosis.cdr.dashBoard.hostMonitor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/HostMonitorValue.java b/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitorValue.java similarity index 92% rename from src/main/java/com/ediagnosis/cdr/dashBoard/HostMonitorValue.java rename to src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitorValue.java index 843c9a9..a9d5235 100644 --- a/src/main/java/com/ediagnosis/cdr/dashBoard/HostMonitorValue.java +++ b/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitorValue.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dashBoard; +package com.ediagnosis.cdr.dashBoard.hostMonitor; public record HostMonitorValue( HostValue host, diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/HostMonitorValueRepository.java b/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitorValueRepository.java similarity index 94% rename from src/main/java/com/ediagnosis/cdr/dashBoard/HostMonitorValueRepository.java rename to src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitorValueRepository.java index a54d034..2a239d9 100644 --- a/src/main/java/com/ediagnosis/cdr/dashBoard/HostMonitorValueRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitorValueRepository.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dashBoard; +package com.ediagnosis.cdr.dashBoard.hostMonitor; import org.springframework.stereotype.Component; @@ -80,7 +80,7 @@ public class HostMonitorValueRepository { diskValue = new HostMonitorValue.DiskValue("", "", "", ""); } - HostMonitorValue hostMonitorValue = new HostMonitorValue(hostValue, cpuValue, memoryValue, diskValue); - return hostMonitorValue; + return new HostMonitorValue(hostValue, cpuValue, memoryValue, diskValue); } + } diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/StatisticsService.java b/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/StatisticsService.java new file mode 100644 index 0000000..7259c7a --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/StatisticsService.java @@ -0,0 +1,13 @@ +package com.ediagnosis.cdr.dashBoard.statistics; + +public interface StatisticsService { + + + long getRowCount(); + + int getDataSourceCount(); + + int getSourceBizTableCount(); + + +} diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractDataSourceCountService.java b/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractDataSourceCountService.java new file mode 100644 index 0000000..77de5e7 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractDataSourceCountService.java @@ -0,0 +1,13 @@ +package com.ediagnosis.cdr.dashBoard.statistics.impl; + +import com.ediagnosis.cdr.dashBoard.statistics.StatisticsService; + +public abstract class AbstractDataSourceCountService implements StatisticsService { + + @Override + public int getDataSourceCount() { + return 0; + } + + +} diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractRowCountService.java b/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractRowCountService.java new file mode 100644 index 0000000..de00936 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractRowCountService.java @@ -0,0 +1,11 @@ +package com.ediagnosis.cdr.dashBoard.statistics.impl; + +import com.ediagnosis.cdr.dashBoard.statistics.StatisticsService; + +public abstract class AbstractRowCountService implements StatisticsService { + @Override + public long getRowCount() { + return 0; + } + +} diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractSourceBizTableCountService.java b/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractSourceBizTableCountService.java new file mode 100644 index 0000000..a9a97b9 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractSourceBizTableCountService.java @@ -0,0 +1,11 @@ +package com.ediagnosis.cdr.dashBoard.statistics.impl; + +import com.ediagnosis.cdr.dashBoard.statistics.StatisticsService; + +public abstract class AbstractSourceBizTableCountService implements StatisticsService { + + public int getSourceBizTableCount(){ + return 0; + } + +} diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/CacheableStatisticsService.java b/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/CacheableStatisticsService.java new file mode 100644 index 0000000..f2d061d --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/CacheableStatisticsService.java @@ -0,0 +1,70 @@ +package com.ediagnosis.cdr.dashBoard.statistics.impl; + +import com.ediagnosis.cdr.dashBoard.statistics.StatisticsService; +import org.springframework.stereotype.Service; + +@Service +public class CacheableStatisticsService implements StatisticsService { + +private final AbstractRowCountService rowCountService; +private final AbstractDataSourceCountService dataSourceCountService; +private final AbstractSourceBizTableCountService sourceBizTableCountService; + + + + + public CacheableStatisticsService() { + this.rowCountService = new AbstractRowCountService(){ + @Override + public int getDataSourceCount() { + return 0; + } + + @Override + public int getSourceBizTableCount() { + return 0; + } + }; + this.dataSourceCountService =new AbstractDataSourceCountService(){ + @Override + public long getRowCount() { + return 0; + } + + @Override + public int getSourceBizTableCount() { + return 0; + } + } ; + this.sourceBizTableCountService = new AbstractSourceBizTableCountService() { + @Override + public long getRowCount() { + return 0; + } + + @Override + public int getDataSourceCount() { + return 0; + } + }; + } + + + @Override + public long getRowCount() { + + + + return rowCountService.getRowCount(); + } + + @Override + public int getDataSourceCount() { + return dataSourceCountService.getDataSourceCount(); + } + + @Override + public int getSourceBizTableCount() { + return sourceBizTableCountService.getSourceBizTableCount(); + } +} diff --git a/src/main/java/com/ediagnosis/cdr/dao/IndicatorRepository.java b/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/IndicatorRepository.java similarity index 73% rename from src/main/java/com/ediagnosis/cdr/dao/IndicatorRepository.java rename to src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/IndicatorRepository.java index 0864c7c..dbc8988 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/IndicatorRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/IndicatorRepository.java @@ -1,9 +1,9 @@ -package com.ediagnosis.cdr.dao; +package com.ediagnosis.cdr.dataGovernance.indicator; -import com.ediagnosis.cdr.dao.entity.IndicatorEntity; -import com.ediagnosis.cdr.dao.mapper.IndicatorMapper; +import com.ediagnosis.cdr.dataGovernance.indicator.dao.entity.IndicatorEntity; +import com.ediagnosis.cdr.dataGovernance.indicator.dao.mapper.IndicatorMapper; import com.ediagnosis.cdr.context.TimeUtil; -import com.ediagnosis.cdr.dataGovernance.value.Indicator; +import com.ediagnosis.cdr.dataGovernance.indicator.value.Indicator; import org.springframework.stereotype.Repository; import java.time.LocalDateTime; diff --git a/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/IndicatorDao.java b/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/IndicatorDao.java new file mode 100644 index 0000000..c702ead --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/IndicatorDao.java @@ -0,0 +1,86 @@ +package com.ediagnosis.cdr.dataGovernance.indicator.dao; + +import com.ediagnosis.cdr.context.TimeUtil; +import com.ediagnosis.cdr.dataGovernance.indicator.dao.entity.IndicatorEntity; +import com.ediagnosis.cdr.dataGovernance.indicator.dao.mapper.IndicatorMapper; +import com.ediagnosis.cdr.dataGovernance.indicator.value.Indicator; +import com.mybatisflex.core.query.QueryChain; +import com.mybatisflex.core.query.QueryWrapper; +import com.mybatisflex.core.update.UpdateChain; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; +import java.util.Optional; + +@Component +public class IndicatorDao { + + + private final IndicatorMapper indicatorMapper; + + public IndicatorDao(IndicatorMapper indicatorMapper) { + this.indicatorMapper = indicatorMapper; + } + + public Optional getIndicator(String code) { + + IndicatorEntity indicatorEntity = QueryChain.of(indicatorMapper) + .eq(IndicatorEntity::getCode, code) + .one(); + + if (indicatorEntity != null) { + return Optional.of(toIndicator(indicatorEntity)); + } + return Optional.empty(); + } + + + public void upsertIndicator(Indicator indicator) { + boolean existed = QueryChain.of(indicatorMapper) + .eq(IndicatorEntity::getCode, indicator.code()) + .exists(); + if (existed) { + UpdateChain.of(indicatorMapper) + .set(IndicatorEntity::getValue, indicator.value()) + .set(IndicatorEntity::getUpdateTime, + TimeUtil.toString(indicator.updateTime()).orElse("")) + .where(IndicatorEntity::getCode) + .eq(indicator.code()) + .update(); + + }else { + indicatorMapper.insert(toEntity(indicator)); + } + + } + + + public void deleteIndicator(String code) { + QueryWrapper queryWrapper = QueryWrapper.create(); + queryWrapper + .where(IndicatorEntity::getCode) + .eq(code); + indicatorMapper.deleteByQuery(queryWrapper); + + } + + + private Indicator toIndicator(IndicatorEntity entity) { + String name = entity.getName(); + String code = entity.getCode(); + String value = entity.getValue(); + String description = entity.getDescription(); + LocalDateTime updateTime = TimeUtil.toLocalDateTime(entity.getUpdateTime()).orElse(null); + return new Indicator(name, code, value, description, updateTime); + } + + private IndicatorEntity toEntity(Indicator indicator) { + IndicatorEntity entity = new IndicatorEntity(); + entity.setName(indicator.name()); + entity.setCode(indicator.code()); + entity.setValue(indicator.value()); + entity.setDescription(indicator.description()); + entity.setUpdateTime(TimeUtil.toString(indicator.updateTime()).orElse("")); + return entity; + } +} diff --git a/src/main/java/com/ediagnosis/cdr/dao/entity/IndicatorEntity.java b/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/entity/IndicatorEntity.java similarity index 92% rename from src/main/java/com/ediagnosis/cdr/dao/entity/IndicatorEntity.java rename to src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/entity/IndicatorEntity.java index c19a457..dc67a9f 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/entity/IndicatorEntity.java +++ b/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/entity/IndicatorEntity.java @@ -1,15 +1,12 @@ -package com.ediagnosis.cdr.dao.entity; +package com.ediagnosis.cdr.dataGovernance.indicator.dao.entity; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; -/** - * 记录数据总量概览 - * @TableName dim_data_summary - */ -@Table(value ="indicator") + +@Table(value ="indicator",dataSource = "ds-mysql") public class IndicatorEntity { /** * diff --git a/src/main/java/com/ediagnosis/cdr/dao/mapper/IndicatorMapper.java b/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/mapper/IndicatorMapper.java similarity index 56% rename from src/main/java/com/ediagnosis/cdr/dao/mapper/IndicatorMapper.java rename to src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/mapper/IndicatorMapper.java index e6586a0..2b1e2e9 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/mapper/IndicatorMapper.java +++ b/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/mapper/IndicatorMapper.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dao.mapper; +package com.ediagnosis.cdr.dataGovernance.indicator.dao.mapper; -import com.ediagnosis.cdr.dao.entity.IndicatorEntity; +import com.ediagnosis.cdr.dataGovernance.indicator.dao.entity.IndicatorEntity; import com.mybatisflex.core.BaseMapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/src/main/java/com/ediagnosis/cdr/dataGovernance/value/Indicator.java b/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/value/Indicator.java similarity index 65% rename from src/main/java/com/ediagnosis/cdr/dataGovernance/value/Indicator.java rename to src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/value/Indicator.java index 65e2ac0..8c24a21 100644 --- a/src/main/java/com/ediagnosis/cdr/dataGovernance/value/Indicator.java +++ b/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/value/Indicator.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataGovernance.value; +package com.ediagnosis.cdr.dataGovernance.indicator.value; import java.time.LocalDateTime; @@ -7,6 +7,7 @@ public record Indicator( String name, String code, String value, + String description, LocalDateTime updateTime ) { diff --git a/src/main/java/com/ediagnosis/cdr/dataGovernance/request/SourceTableRequest.java b/src/main/java/com/ediagnosis/cdr/dataGovernance/request/SourceTableRequest.java deleted file mode 100644 index 880b55e..0000000 --- a/src/main/java/com/ediagnosis/cdr/dataGovernance/request/SourceTableRequest.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.ediagnosis.cdr.dataGovernance.request; - -public record SourceTableRequest( - -) { -} diff --git a/src/main/java/com/ediagnosis/cdr/dataGovernance/CacheableTableDefinitionRepository.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/CacheableTableDefinitionRepository.java similarity index 85% rename from src/main/java/com/ediagnosis/cdr/dataGovernance/CacheableTableDefinitionRepository.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/CacheableTableDefinitionRepository.java index 7e72875..65793b8 100644 --- a/src/main/java/com/ediagnosis/cdr/dataGovernance/CacheableTableDefinitionRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/CacheableTableDefinitionRepository.java @@ -1,8 +1,8 @@ -package com.ediagnosis.cdr.dataGovernance; +package com.ediagnosis.cdr.dataIntegration; import com.ediagnosis.cdr.cache.CacheFacade; -import com.ediagnosis.cdr.dataGovernance.value.TableDefinitionItem; -import com.ediagnosis.cdr.dataGovernance.value.TableTree; +import com.ediagnosis.cdr.dataIntegration.value.TableDefinitionItem; +import com.ediagnosis.cdr.dataIntegration.value.TableTree; import org.springframework.stereotype.Component; import java.util.List; diff --git a/src/main/java/com/ediagnosis/cdr/dataGovernance/DataGovernanceController.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/DataGovernanceController.java similarity index 74% rename from src/main/java/com/ediagnosis/cdr/dataGovernance/DataGovernanceController.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/DataGovernanceController.java index e4d97a4..8a00b7b 100644 --- a/src/main/java/com/ediagnosis/cdr/dataGovernance/DataGovernanceController.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/DataGovernanceController.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataGovernance; +package com.ediagnosis.cdr.dataIntegration; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/ediagnosis/cdr/dataGovernance/DefaultTableDefinitionRepository.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/DefaultTableDefinitionRepository.java similarity index 69% rename from src/main/java/com/ediagnosis/cdr/dataGovernance/DefaultTableDefinitionRepository.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/DefaultTableDefinitionRepository.java index 625a10d..8f780ed 100644 --- a/src/main/java/com/ediagnosis/cdr/dataGovernance/DefaultTableDefinitionRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/DefaultTableDefinitionRepository.java @@ -1,7 +1,7 @@ -package com.ediagnosis.cdr.dataGovernance; +package com.ediagnosis.cdr.dataIntegration; -import com.ediagnosis.cdr.dataGovernance.value.TableDefinitionItem; -import com.ediagnosis.cdr.dataGovernance.value.TableTree; +import com.ediagnosis.cdr.dataIntegration.value.TableDefinitionItem; +import com.ediagnosis.cdr.dataIntegration.value.TableTree; import org.springframework.stereotype.Component; import java.util.List; diff --git a/src/main/java/com/ediagnosis/cdr/dataGovernance/TableDefinitionRepository.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/TableDefinitionRepository.java similarity index 60% rename from src/main/java/com/ediagnosis/cdr/dataGovernance/TableDefinitionRepository.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/TableDefinitionRepository.java index 88b57bc..4fab08b 100644 --- a/src/main/java/com/ediagnosis/cdr/dataGovernance/TableDefinitionRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/TableDefinitionRepository.java @@ -1,7 +1,7 @@ -package com.ediagnosis.cdr.dataGovernance; +package com.ediagnosis.cdr.dataIntegration; -import com.ediagnosis.cdr.dataGovernance.value.TableDefinitionItem; -import com.ediagnosis.cdr.dataGovernance.value.TableTree; +import com.ediagnosis.cdr.dataIntegration.value.TableDefinitionItem; +import com.ediagnosis.cdr.dataIntegration.value.TableTree; import java.util.List; diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/request/SourceTableRequest.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/request/SourceTableRequest.java new file mode 100644 index 0000000..31940b6 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/request/SourceTableRequest.java @@ -0,0 +1,6 @@ +package com.ediagnosis.cdr.dataIntegration.request; + +public record SourceTableRequest( + +) { +} diff --git a/src/main/java/com/ediagnosis/cdr/dataGovernance/request/TableFieldRequest.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/request/TableFieldRequest.java similarity index 68% rename from src/main/java/com/ediagnosis/cdr/dataGovernance/request/TableFieldRequest.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/request/TableFieldRequest.java index 02fac28..53c075a 100644 --- a/src/main/java/com/ediagnosis/cdr/dataGovernance/request/TableFieldRequest.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/request/TableFieldRequest.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataGovernance.request; +package com.ediagnosis.cdr.dataIntegration.request; public record TableFieldRequest( Integer pageNo, diff --git a/src/main/java/com/ediagnosis/cdr/dataGovernance/value/TableDefinitionItem.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/TableDefinitionItem.java similarity index 68% rename from src/main/java/com/ediagnosis/cdr/dataGovernance/value/TableDefinitionItem.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/TableDefinitionItem.java index b6e0646..fa1b568 100644 --- a/src/main/java/com/ediagnosis/cdr/dataGovernance/value/TableDefinitionItem.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/TableDefinitionItem.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataGovernance.value; +package com.ediagnosis.cdr.dataIntegration.value; public record TableDefinitionItem( String column, diff --git a/src/main/java/com/ediagnosis/cdr/dataGovernance/value/TableTree.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/TableTree.java similarity index 97% rename from src/main/java/com/ediagnosis/cdr/dataGovernance/value/TableTree.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/TableTree.java index 82891fe..3591e26 100644 --- a/src/main/java/com/ediagnosis/cdr/dataGovernance/value/TableTree.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/TableTree.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataGovernance.value; +package com.ediagnosis.cdr.dataIntegration.value; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/com/ediagnosis/cdr/dao/DwsRepository.java b/src/main/java/com/ediagnosis/cdr/dataService/DwsRepository.java similarity index 97% rename from src/main/java/com/ediagnosis/cdr/dao/DwsRepository.java rename to src/main/java/com/ediagnosis/cdr/dataService/DwsRepository.java index 3cf5f6e..d24ddfe 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/DwsRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dataService/DwsRepository.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dao; +package com.ediagnosis.cdr.dataService; import com.ediagnosis.cdr.context.value.Page; diff --git a/src/main/java/com/ediagnosis/cdr/dao/HiveQueryExecutor.java b/src/main/java/com/ediagnosis/cdr/dataService/HiveQueryExecutor.java similarity index 92% rename from src/main/java/com/ediagnosis/cdr/dao/HiveQueryExecutor.java rename to src/main/java/com/ediagnosis/cdr/dataService/HiveQueryExecutor.java index 8d8dc15..0df9b26 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/HiveQueryExecutor.java +++ b/src/main/java/com/ediagnosis/cdr/dataService/HiveQueryExecutor.java @@ -1,7 +1,6 @@ -package com.ediagnosis.cdr.dao; +package com.ediagnosis.cdr.dataService; -import com.ediagnosis.cdr.dao.sqlutil.SqlParser; import com.mybatisflex.core.datasource.DataSourceKey; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.row.Db; diff --git a/src/main/java/com/ediagnosis/cdr/dao/sqlutil/SqlParser.java b/src/main/java/com/ediagnosis/cdr/dataService/SqlParser.java similarity index 98% rename from src/main/java/com/ediagnosis/cdr/dao/sqlutil/SqlParser.java rename to src/main/java/com/ediagnosis/cdr/dataService/SqlParser.java index 1e35bf0..dfa16ea 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/sqlutil/SqlParser.java +++ b/src/main/java/com/ediagnosis/cdr/dataService/SqlParser.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dao.sqlutil; +package com.ediagnosis.cdr.dataService; import net.sf.jsqlparser.JSQLParserException; diff --git a/src/test/java/com/ediagnosis/cdr/dao/DwsRepositoryTest.java b/src/test/java/com/ediagnosis/cdr/dao/DwsRepositoryTest.java index 6660607..200ce20 100644 --- a/src/test/java/com/ediagnosis/cdr/dao/DwsRepositoryTest.java +++ b/src/test/java/com/ediagnosis/cdr/dao/DwsRepositoryTest.java @@ -1,5 +1,6 @@ package com.ediagnosis.cdr.dao; +import com.ediagnosis.cdr.dataService.HiveQueryExecutor; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.row.Row; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/ediagnosis/cdr/dataGovernance/TableTreeTest.java b/src/test/java/com/ediagnosis/cdr/dataGovernance/TableTreeTest.java index 6557619..73ee1df 100644 --- a/src/test/java/com/ediagnosis/cdr/dataGovernance/TableTreeTest.java +++ b/src/test/java/com/ediagnosis/cdr/dataGovernance/TableTreeTest.java @@ -1,7 +1,7 @@ package com.ediagnosis.cdr.dataGovernance; import com.ediagnosis.cdr.context.JsonProcessor; -import com.ediagnosis.cdr.dataGovernance.value.TableTree; +import com.ediagnosis.cdr.dataIntegration.value.TableTree; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -- 2.18.1