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 86c3e1c0079a5e76864dc9310d78a2f2112461cd..723240b672a3fbca92746691635f9cc860f16f04 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 f55c8974404e50a03ee4c8fbe77f6afe87a3135e..02de83703c2ca6e9efdb3c6f62eb419e4777e7b6 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 843c9a947904fe42a0c50d98a7088ceed85b1a29..a9d5235347e1fc8f4338c672861aaf653f572566 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 a54d03417cb17bda23afe3cec4cb16510bd8ea74..2a239d9c0fa991d02ac763743bd55b0df18e0501 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 0000000000000000000000000000000000000000..7259c7ad48543b37dc5bab168224ae9ab768d5fc --- /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 0000000000000000000000000000000000000000..77de5e784032232651fea032700fadd33ecf67b2 --- /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 0000000000000000000000000000000000000000..de0093602b67c87aa045e9828ea5e56995fe9dec --- /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 0000000000000000000000000000000000000000..a9a97b94bae75261042d8ee6273dfbb3226931e6 --- /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 0000000000000000000000000000000000000000..f2d061d80de40b70ef719565b2e30a71ca57704f --- /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 0864c7c84bc936b7087b23fb61ccbaa6ec4ca555..dbc89887db44b1801feb46fa935aef55a736f2bd 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 0000000000000000000000000000000000000000..c702ead051275cb25dc367c37912cede6d4fddaf --- /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 c19a457e493a2daade0ba9af8177cb9e8139b6c5..dc67a9f7705226f35d0e594fd01edc92178e1980 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 e6586a0a80fa4a777801625004cc809322d32aaa..2b1e2e9ea7804d26ee085e99ad7afb9a47d82e8c 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 65e2ac00f6e87098c8665c7edd3119e80adab0ab..8c24a21f36bd7f3597b7d679f01d1f75e3c7691b 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 880b55efa39d9c386be7afeabe348b2a810e0188..0000000000000000000000000000000000000000 --- 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 7e72875778fc3a4a89bcc1fa143c9f2497d5e03e..65793b810e80b22b95fea21d33a7d978bd598133 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 e4d97a459687490e3d9f4d33cc7ff641b303ef87..8a00b7bf748594a707d1936c15c2b6a7516ae5de 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 625a10d410fd7c02293553f96d68696f466e7434..8f780edbee2e17a4dc0d950d8bad8bfe07f78979 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 88b57bca2788860564f6fe43b2b42ccb12139ead..4fab08b51fc14b8e55a3c107b139a55be8bd40ad 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 0000000000000000000000000000000000000000..31940b6abec23aa9a5a762de92870db53000efd5 --- /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 02fac284a708891b84dc1cde971e2089e6ce7d70..53c075a2a3e958b667badbd4509ef169b4a083d4 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 b6e0646f10fdd8a0b8e9af18843d52cb3b0f6525..fa1b568b8f4746b1c152158a073f974da5403edf 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 82891fe72784b44fdcbbde3aedee0187016d0afb..3591e263c3ee2494d672b71515dfffc7d58af492 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 3cf5f6ee1610628d233ddafc78dbfde97f79c4d5..d24ddfec2ca4d74d5e170418e8626cbda33e8108 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 8d8dc15eeb83cf87a356da38c9c59d38a99b7a1e..0df9b265cd8624e3267f3337e448bebe7c94b90c 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 1e35bf0bbec2f7f54d6a94cf5a695749d3e3c965..dfa16eac8786a482a5f4bb4455a40d80a055372b 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 6660607cd45c2eadd51448670fe7efc747d15d78..200ce20b9cc581bb3c5f42f67bdc87dbb8143778 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 6557619d8d975083a9b1de8f3b0e0de54c2239a5..73ee1df76f74521b6565be94ef742d150e0c4760 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;