From 503ddce937ac3d88ac82eada3a22037396953477 Mon Sep 17 00:00:00 2001 From: yutao <3082046177@qq.com> Date: Tue, 5 Aug 2025 14:47:38 +0800 Subject: [PATCH] init --- .../{util => context}/PageConvertUtils.java | 4 +- .../ediagnosis/cdr/context/package-info.java | 6 ++ .../ediagnosis/cdr/context/value/Page.java | 77 ------------------- .../cdr/{value => context/values}/PageVo.java | 2 +- .../context/{value => values}/Response.java | 2 +- .../BusinessDataApi.java | 2 +- .../BusinessDataController.java | 27 +++---- .../BusinessSourceController.java | 24 +++--- .../BusinessSystemController.java | 24 +++--- .../BusinessTableController.java | 2 +- .../dao/BusinessDataDao.java | 19 ++--- .../dao/dto/BusinessDataSourceDTO.java | 2 +- .../dao/dto/BusinessDataSourceQueryDTO.java | 4 +- .../dao/dto/BusinessDataSystemDTO.java | 2 +- .../dao/dto/BusinessDataSystemQueryDTO.java | 4 +- .../dao/dto/BusinessDataTableDTO.java | 2 +- .../dto/BusinessDataTableFieldQueryDTO.java | 4 +- .../dao/dto/BusinessDataTableQueryDTO.java | 4 +- .../dao/entity/BusinessDataSource.java | 2 +- .../dao/entity/BusinessDataSystem.java | 2 +- .../dao/entity/BusinessDataTable.java | 2 +- .../dao/entity/BusinessDataTableField.java | 2 +- .../dao/mapper/BusinessDataSourceMapper.java | 4 +- .../dao/mapper/BusinessDataSystemMapper.java | 4 +- .../mapper/BusinessDataTableFieldMapper.java | 4 +- .../dao/mapper/BusinessDataTableMapper.java | 4 +- .../inner/BusinessDataRepository.java | 10 +-- .../inner/BusinessSystemRepository.java | 10 +-- .../CacheableTableDefinitionRepository.java | 4 +- .../DefaultTableDefinitionRepository.java | 2 +- .../TableDefinitionRepository.java | 2 +- .../value}/BusinessDataSourceVo.java | 2 +- .../value}/BusinessDataSystemVo.java | 2 +- .../value}/BusinessDataTableFieldVo.java | 2 +- .../value}/BusinessDataTableVo.java | 2 +- .../value}/param/DataSourceQueryParam.java | 2 +- .../value}/param/DataSystemAddParam.java | 2 +- .../value}/param/DataSystemDeleteParam.java | 2 +- .../value}/param/DataSystemQueryParam.java | 2 +- .../value}/param/DataSystemUpdateParam.java | 2 +- .../param/DataTableFieldQueryParam.java | 2 +- .../value}/param/DataTableQueryParam.java | 2 +- .../value}/param/PageQuery.java | 2 +- .../dataModel/ModelDefinitionRepository.java | 2 +- .../cdr/dataService/DwsRepository.java | 1 - .../indicator/IndicatorRepository.java | 8 +- .../indicator/dao/IndicatorDao.java | 8 +- .../indicator/dao/entity/IndicatorEntity.java | 2 +- .../indicator/dao/mapper/IndicatorMapper.java | 4 +- .../statistics/StatisticsController.java | 2 +- .../statistics/StatisticsService.java | 2 +- .../impl/AbstractDataSourceCountService.java | 4 +- .../impl/AbstractRowCountService.java | 4 +- .../AbstractSourceBizTableCountService.java | 4 +- .../impl/CacheableStatisticsService.java | 4 +- .../indicator/value/Indicator.java | 2 +- .../hostMonitor/DashBoardController.java | 4 +- .../hostMonitor/HostMonitor.java | 2 +- .../hostMonitor/HostMonitorValue.java | 2 +- .../HostMonitorValueRepository.java | 2 +- .../java/com/ediagnosis/cdr/package-info.java | 58 ++++++++++++++ .../mapper/BusinessDataSourceMapper.xml | 4 +- .../mapper/BusinessDataSystemMapper.xml | 4 +- .../mapper/BusinessDataTableFieldMapper.xml | 4 +- .../mapper/BusinessDataTableMapper.xml | 4 +- .../com/ediagnosis/cdr/dao/MapperTest.java | 10 +-- .../com/ediagnosis/cdr/demo/DemoTest.java | 6 +- 67 files changed, 211 insertions(+), 223 deletions(-) rename src/main/java/com/ediagnosis/cdr/{util => context}/PageConvertUtils.java (93%) create mode 100644 src/main/java/com/ediagnosis/cdr/context/package-info.java delete mode 100644 src/main/java/com/ediagnosis/cdr/context/value/Page.java rename src/main/java/com/ediagnosis/cdr/{value => context/values}/PageVo.java (97%) rename src/main/java/com/ediagnosis/cdr/context/{value => values}/Response.java (97%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/BusinessDataApi.java (81%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/BusinessDataController.java (77%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/BusinessSourceController.java (73%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/BusinessSystemController.java (73%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/BusinessTableController.java (73%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/BusinessDataDao.java (90%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/dto/BusinessDataSourceDTO.java (95%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/dto/BusinessDataSourceQueryDTO.java (85%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/dto/BusinessDataSystemDTO.java (93%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/dto/BusinessDataSystemQueryDTO.java (73%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/dto/BusinessDataTableDTO.java (95%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/dto/BusinessDataTableFieldQueryDTO.java (80%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/dto/BusinessDataTableQueryDTO.java (83%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/entity/BusinessDataSource.java (97%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/entity/BusinessDataSystem.java (95%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/entity/BusinessDataTable.java (96%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/entity/BusinessDataTableField.java (96%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/mapper/BusinessDataSourceMapper.java (75%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/mapper/BusinessDataSystemMapper.java (76%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/mapper/BusinessDataTableFieldMapper.java (76%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/dao/mapper/BusinessDataTableMapper.java (75%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/inner/BusinessDataRepository.java (83%) rename src/main/java/com/ediagnosis/cdr/{dataCollect => dataIntegration}/inner/BusinessSystemRepository.java (81%) rename src/main/java/com/ediagnosis/cdr/dataIntegration/{ => inner}/CacheableTableDefinitionRepository.java (93%) rename src/main/java/com/ediagnosis/cdr/dataIntegration/{ => inner}/DefaultTableDefinitionRepository.java (91%) rename src/main/java/com/ediagnosis/cdr/dataIntegration/{ => inner}/TableDefinitionRepository.java (88%) rename src/main/java/com/ediagnosis/cdr/{dataCollect/endpoint/vo => dataIntegration/value}/BusinessDataSourceVo.java (95%) rename src/main/java/com/ediagnosis/cdr/{dataCollect/endpoint/vo => dataIntegration/value}/BusinessDataSystemVo.java (93%) rename src/main/java/com/ediagnosis/cdr/{dataCollect/endpoint/vo => dataIntegration/value}/BusinessDataTableFieldVo.java (94%) rename src/main/java/com/ediagnosis/cdr/{dataCollect/endpoint/vo => dataIntegration/value}/BusinessDataTableVo.java (95%) rename src/main/java/com/ediagnosis/cdr/{dataCollect/endpoint => dataIntegration/value}/param/DataSourceQueryParam.java (91%) rename src/main/java/com/ediagnosis/cdr/{dataCollect/endpoint => dataIntegration/value}/param/DataSystemAddParam.java (89%) rename src/main/java/com/ediagnosis/cdr/{dataCollect/endpoint => dataIntegration/value}/param/DataSystemDeleteParam.java (86%) rename src/main/java/com/ediagnosis/cdr/{dataCollect/endpoint => dataIntegration/value}/param/DataSystemQueryParam.java (86%) rename src/main/java/com/ediagnosis/cdr/{dataCollect/endpoint => dataIntegration/value}/param/DataSystemUpdateParam.java (89%) rename src/main/java/com/ediagnosis/cdr/{dataCollect/endpoint => dataIntegration/value}/param/DataTableFieldQueryParam.java (89%) rename src/main/java/com/ediagnosis/cdr/{dataCollect/endpoint => dataIntegration/value}/param/DataTableQueryParam.java (91%) rename src/main/java/com/ediagnosis/cdr/{dataCollect/endpoint => dataIntegration/value}/param/PageQuery.java (88%) rename src/main/java/com/ediagnosis/cdr/{dataGovernance => }/dataModel/ModelDefinitionRepository.java (66%) rename src/main/java/com/ediagnosis/cdr/{dataGovernance => }/indicator/IndicatorRepository.java (73%) rename src/main/java/com/ediagnosis/cdr/{dataGovernance => }/indicator/dao/IndicatorDao.java (90%) rename src/main/java/com/ediagnosis/cdr/{dataGovernance => }/indicator/dao/entity/IndicatorEntity.java (96%) rename src/main/java/com/ediagnosis/cdr/{dataGovernance => }/indicator/dao/mapper/IndicatorMapper.java (56%) rename src/main/java/com/ediagnosis/cdr/{dashBoard => indicator}/statistics/StatisticsController.java (71%) rename src/main/java/com/ediagnosis/cdr/{dashBoard => indicator}/statistics/StatisticsService.java (73%) rename src/main/java/com/ediagnosis/cdr/{dashBoard => indicator}/statistics/impl/AbstractDataSourceCountService.java (58%) rename src/main/java/com/ediagnosis/cdr/{dashBoard => indicator}/statistics/impl/AbstractRowCountService.java (56%) rename src/main/java/com/ediagnosis/cdr/{dashBoard => indicator}/statistics/impl/AbstractSourceBizTableCountService.java (57%) rename src/main/java/com/ediagnosis/cdr/{dashBoard => indicator}/statistics/impl/CacheableStatisticsService.java (93%) rename src/main/java/com/ediagnosis/cdr/{dataGovernance => }/indicator/value/Indicator.java (76%) rename src/main/java/com/ediagnosis/cdr/{dashBoard => maintenance}/hostMonitor/DashBoardController.java (91%) rename src/main/java/com/ediagnosis/cdr/{dashBoard => maintenance}/hostMonitor/HostMonitor.java (99%) rename src/main/java/com/ediagnosis/cdr/{dashBoard => maintenance}/hostMonitor/HostMonitorValue.java (92%) rename src/main/java/com/ediagnosis/cdr/{dashBoard => maintenance}/hostMonitor/HostMonitorValueRepository.java (98%) create mode 100644 src/main/java/com/ediagnosis/cdr/package-info.java diff --git a/src/main/java/com/ediagnosis/cdr/util/PageConvertUtils.java b/src/main/java/com/ediagnosis/cdr/context/PageConvertUtils.java similarity index 93% rename from src/main/java/com/ediagnosis/cdr/util/PageConvertUtils.java rename to src/main/java/com/ediagnosis/cdr/context/PageConvertUtils.java index 5dc154a..2ddcd05 100644 --- a/src/main/java/com/ediagnosis/cdr/util/PageConvertUtils.java +++ b/src/main/java/com/ediagnosis/cdr/context/PageConvertUtils.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.util; +package com.ediagnosis.cdr.context; -import com.ediagnosis.cdr.value.PageVo; +import com.ediagnosis.cdr.context.values.PageVo; import com.mybatisflex.core.paginate.Page; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/ediagnosis/cdr/context/package-info.java b/src/main/java/com/ediagnosis/cdr/context/package-info.java new file mode 100644 index 0000000..7ea6987 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/context/package-info.java @@ -0,0 +1,6 @@ +/** + * 存放具有公共使用属性的组件。 + * 额外开放的包：values 存放值对象 + */ +package com.ediagnosis.cdr.context; + diff --git a/src/main/java/com/ediagnosis/cdr/context/value/Page.java b/src/main/java/com/ediagnosis/cdr/context/value/Page.java deleted file mode 100644 index 6d67eec..0000000 --- a/src/main/java/com/ediagnosis/cdr/context/value/Page.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.ediagnosis.cdr.context.value; - -import java.util.List; - -public class Page { - private long pageNo; - private long pageSize; - private long totalCount; - private List content; - private long totalPage; - - public Page() { - } - - public Page(long pageNo, long pageSize, - long totalCount, List content) { - this.pageNo = pageNo; - this.pageSize = pageSize; - this.totalCount = totalCount; - this.content = content; - long tmp=totalCount / pageSize; - long tmp1=totalCount % pageSize; - if (tmp1>0) { - this.totalPage = tmp+1; - }else { - this.totalPage = tmp; - } - - } - - - public long getPageNo() { - return pageNo; - } - - - public long getPageSize() { - return pageSize; - } - - - public long getTotalCount() { - return totalCount; - } - - - public long getTotalPage() { - return totalPage; - } - - - public List getContent() { - return content; - } - - public void setPageNo(long pageNo) { - this.pageNo = pageNo; - } - - public void setPageSize(long pageSize) { - this.pageSize = pageSize; - } - - public void setTotalCount(long totalCount) { - this.totalCount = totalCount; - } - - public void setContent(List content) { - this.content = content; - } - - public void setTotalPage(long totalPage) { - this.totalPage = totalPage; - } - - -} diff --git a/src/main/java/com/ediagnosis/cdr/value/PageVo.java b/src/main/java/com/ediagnosis/cdr/context/values/PageVo.java similarity index 97% rename from src/main/java/com/ediagnosis/cdr/value/PageVo.java rename to src/main/java/com/ediagnosis/cdr/context/values/PageVo.java index fc4438a..b9fa150 100644 --- a/src/main/java/com/ediagnosis/cdr/value/PageVo.java +++ b/src/main/java/com/ediagnosis/cdr/context/values/PageVo.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.value; +package com.ediagnosis.cdr.context.values; import java.util.List; diff --git a/src/main/java/com/ediagnosis/cdr/context/value/Response.java b/src/main/java/com/ediagnosis/cdr/context/values/Response.java similarity index 97% rename from src/main/java/com/ediagnosis/cdr/context/value/Response.java rename to src/main/java/com/ediagnosis/cdr/context/values/Response.java index 3a76ec4..a6a5876 100644 --- a/src/main/java/com/ediagnosis/cdr/context/value/Response.java +++ b/src/main/java/com/ediagnosis/cdr/context/values/Response.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.context.value; +package com.ediagnosis.cdr.context.values; import java.io.Serializable; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataApi.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessDataApi.java similarity index 81% rename from src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataApi.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessDataApi.java index b9947dc..a3e4012 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataApi.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessDataApi.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect; +package com.ediagnosis.cdr.dataIntegration; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataController.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessDataController.java similarity index 77% rename from src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataController.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessDataController.java index c156264..b1a99b0 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataController.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessDataController.java @@ -1,18 +1,19 @@ -package com.ediagnosis.cdr.dataCollect; +package com.ediagnosis.cdr.dataIntegration; -import com.ediagnosis.cdr.dataCollect.dao.dto.*; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTableField; -import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSourceQueryParam; -import com.ediagnosis.cdr.dataCollect.endpoint.param.DataTableFieldQueryParam; -import com.ediagnosis.cdr.dataCollect.endpoint.param.DataTableQueryParam; -import com.ediagnosis.cdr.dataCollect.endpoint.vo.BusinessDataSourceVo; -import com.ediagnosis.cdr.dataCollect.endpoint.vo.BusinessDataTableFieldVo; -import com.ediagnosis.cdr.dataCollect.endpoint.vo.BusinessDataTableVo; -import com.ediagnosis.cdr.dataCollect.inner.BusinessDataRepository; -import com.ediagnosis.cdr.util.PageConvertUtils; -import com.ediagnosis.cdr.value.PageVo; -import com.ediagnosis.cdr.value.Response; +import com.ediagnosis.cdr.context.values.Response; +import com.ediagnosis.cdr.dataIntegration.dao.dto.*; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTableField; +import com.ediagnosis.cdr.dataIntegration.value.param.DataSourceQueryParam; +import com.ediagnosis.cdr.dataIntegration.value.param.DataTableFieldQueryParam; +import com.ediagnosis.cdr.dataIntegration.value.param.DataTableQueryParam; +import com.ediagnosis.cdr.dataIntegration.value.BusinessDataSourceVo; +import com.ediagnosis.cdr.dataIntegration.value.BusinessDataTableFieldVo; +import com.ediagnosis.cdr.dataIntegration.value.BusinessDataTableVo; +import com.ediagnosis.cdr.dataIntegration.inner.BusinessDataRepository; +import com.ediagnosis.cdr.context.PageConvertUtils; +import com.ediagnosis.cdr.context.values.PageVo; + import com.mybatisflex.core.paginate.Page; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSourceController.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSourceController.java similarity index 73% rename from src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSourceController.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSourceController.java index 488ccbb..a90106b 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSourceController.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSourceController.java @@ -1,16 +1,16 @@ -package com.ediagnosis.cdr.dataCollect; +package com.ediagnosis.cdr.dataIntegration; -import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSystemDTO; -import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSystemQueryDTO; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemAddParam; -import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemDeleteParam; -import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemQueryParam; -import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemUpdateParam; -import com.ediagnosis.cdr.dataCollect.endpoint.vo.BusinessDataSystemVo; -import com.ediagnosis.cdr.dataCollect.inner.BusinessSystemRepository; -import com.ediagnosis.cdr.util.PageConvertUtils; -import com.ediagnosis.cdr.value.PageVo; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemDTO; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemQueryDTO; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemAddParam; +import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemDeleteParam; +import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemQueryParam; +import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemUpdateParam; +import com.ediagnosis.cdr.dataIntegration.value.BusinessDataSystemVo; +import com.ediagnosis.cdr.dataIntegration.inner.BusinessSystemRepository; +import com.ediagnosis.cdr.context.PageConvertUtils; +import com.ediagnosis.cdr.context.values.PageVo; import com.ediagnosis.cdr.value.Response; import com.mybatisflex.core.paginate.Page; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSystemController.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSystemController.java similarity index 73% rename from src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSystemController.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSystemController.java index 631e867..de1e61a 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSystemController.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSystemController.java @@ -1,16 +1,16 @@ -package com.ediagnosis.cdr.dataCollect; +package com.ediagnosis.cdr.dataIntegration; -import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSystemDTO; -import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSystemQueryDTO; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemAddParam; -import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemDeleteParam; -import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemQueryParam; -import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemUpdateParam; -import com.ediagnosis.cdr.dataCollect.endpoint.vo.BusinessDataSystemVo; -import com.ediagnosis.cdr.dataCollect.inner.BusinessSystemRepository; -import com.ediagnosis.cdr.util.PageConvertUtils; -import com.ediagnosis.cdr.value.PageVo; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemDTO; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemQueryDTO; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemAddParam; +import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemDeleteParam; +import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemQueryParam; +import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemUpdateParam; +import com.ediagnosis.cdr.dataIntegration.value.BusinessDataSystemVo; +import com.ediagnosis.cdr.dataIntegration.inner.BusinessSystemRepository; +import com.ediagnosis.cdr.context.PageConvertUtils; +import com.ediagnosis.cdr.context.values.PageVo; import com.ediagnosis.cdr.value.Response; import com.mybatisflex.core.paginate.Page; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessTableController.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessTableController.java similarity index 73% rename from src/main/java/com/ediagnosis/cdr/dataCollect/BusinessTableController.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessTableController.java index 4c0529c..2e217c3 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessTableController.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessTableController.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect; +package com.ediagnosis.cdr.dataIntegration; /** * @author monojun diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/BusinessDataDao.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/BusinessDataDao.java similarity index 90% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/BusinessDataDao.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/BusinessDataDao.java index 0e4e2b0..d4d7f30 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/BusinessDataDao.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/BusinessDataDao.java @@ -1,15 +1,16 @@ -package com.ediagnosis.cdr.dataCollect.dao; +package com.ediagnosis.cdr.dataIntegration.dao; import com.ediagnosis.cdr.dataCollect.dao.dto.*; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSource; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTable; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTableField; -import com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataSourceMapper; -import com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataSystemMapper; -import com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataTableFieldMapper; -import com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataTableMapper; +import com.ediagnosis.cdr.dataIntegration.dao.dto.*; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSource; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTable; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTableField; +import com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataSourceMapper; +import com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataSystemMapper; +import com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataTableFieldMapper; +import com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataTableMapper; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSourceDTO.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceDTO.java similarity index 95% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSourceDTO.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceDTO.java index 00b9dc0..d2da22e 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSourceDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceDTO.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.dao.dto; +package com.ediagnosis.cdr.dataIntegration.dao.dto; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSourceQueryDTO.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceQueryDTO.java similarity index 85% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSourceQueryDTO.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceQueryDTO.java index e298941..486afe7 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSourceQueryDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceQueryDTO.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dataCollect.dao.dto; +package com.ediagnosis.cdr.dataIntegration.dao.dto; -import com.ediagnosis.cdr.dataCollect.endpoint.param.PageQuery; +import com.ediagnosis.cdr.dataIntegration.value.param.PageQuery; import lombok.Data; import java.io.Serial; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSystemDTO.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemDTO.java similarity index 93% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSystemDTO.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemDTO.java index 5e2bc3d..a811f02 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSystemDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemDTO.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.dao.dto; +package com.ediagnosis.cdr.dataIntegration.dao.dto; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSystemQueryDTO.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemQueryDTO.java similarity index 73% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSystemQueryDTO.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemQueryDTO.java index 9832247..438c0b6 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSystemQueryDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemQueryDTO.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dataCollect.dao.dto; +package com.ediagnosis.cdr.dataIntegration.dao.dto; -import com.ediagnosis.cdr.dataCollect.endpoint.param.PageQuery; +import com.ediagnosis.cdr.dataIntegration.value.param.PageQuery; import lombok.Data; /** diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableDTO.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableDTO.java similarity index 95% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableDTO.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableDTO.java index 935ff83..dd83db3 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableDTO.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.dao.dto; +package com.ediagnosis.cdr.dataIntegration.dao.dto; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableFieldQueryDTO.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableFieldQueryDTO.java similarity index 80% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableFieldQueryDTO.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableFieldQueryDTO.java index 56f5211..60f8ba8 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableFieldQueryDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableFieldQueryDTO.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dataCollect.dao.dto; +package com.ediagnosis.cdr.dataIntegration.dao.dto; -import com.ediagnosis.cdr.dataCollect.endpoint.param.PageQuery; +import com.ediagnosis.cdr.dataIntegration.value.param.PageQuery; import lombok.Data; import java.io.Serial; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableQueryDTO.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableQueryDTO.java similarity index 83% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableQueryDTO.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableQueryDTO.java index f0a49f4..81c006f 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableQueryDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableQueryDTO.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dataCollect.dao.dto; +package com.ediagnosis.cdr.dataIntegration.dao.dto; -import com.ediagnosis.cdr.dataCollect.endpoint.param.PageQuery; +import com.ediagnosis.cdr.dataIntegration.value.param.PageQuery; import lombok.Data; import java.io.Serial; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSource.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSource.java similarity index 97% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSource.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSource.java index 79ac5ac..94252dc 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSource.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSource.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.dao.entity; +package com.ediagnosis.cdr.dataIntegration.dao.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSystem.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSystem.java similarity index 95% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSystem.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSystem.java index 168199c..d98419e 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSystem.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSystem.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.dao.entity; +package com.ediagnosis.cdr.dataIntegration.dao.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTable.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTable.java similarity index 96% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTable.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTable.java index 597d10d..a778f7c 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTable.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTable.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.dao.entity; +package com.ediagnosis.cdr.dataIntegration.dao.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTableField.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTableField.java similarity index 96% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTableField.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTableField.java index a2509c0..2beac55 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTableField.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTableField.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.dao.entity; +package com.ediagnosis.cdr.dataIntegration.dao.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSourceMapper.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSourceMapper.java similarity index 75% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSourceMapper.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSourceMapper.java index 97994e3..a988556 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSourceMapper.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSourceMapper.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dataCollect.dao.mapper; +package com.ediagnosis.cdr.dataIntegration.dao.mapper; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSource; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSource; import com.mybatisflex.core.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSystemMapper.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSystemMapper.java similarity index 76% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSystemMapper.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSystemMapper.java index 4e56b42..fd41099 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSystemMapper.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSystemMapper.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dataCollect.dao.mapper; +package com.ediagnosis.cdr.dataIntegration.dao.mapper; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; import com.mybatisflex.core.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableFieldMapper.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableFieldMapper.java similarity index 76% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableFieldMapper.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableFieldMapper.java index e886a84..af158af 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableFieldMapper.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableFieldMapper.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dataCollect.dao.mapper; +package com.ediagnosis.cdr.dataIntegration.dao.mapper; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTableField; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTableField; import com.mybatisflex.core.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableMapper.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableMapper.java similarity index 75% rename from src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableMapper.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableMapper.java index 4320472..eda2038 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableMapper.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableMapper.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dataCollect.dao.mapper; +package com.ediagnosis.cdr.dataIntegration.dao.mapper; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTable; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTable; import com.mybatisflex.core.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessDataRepository.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessDataRepository.java similarity index 83% rename from src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessDataRepository.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessDataRepository.java index b8dc93f..27301eb 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessDataRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessDataRepository.java @@ -1,10 +1,10 @@ -package com.ediagnosis.cdr.dataCollect.inner; +package com.ediagnosis.cdr.dataIntegration.inner; -import com.ediagnosis.cdr.dataCollect.dao.BusinessDataDao; -import com.ediagnosis.cdr.dataCollect.dao.dto.*; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTableField; +import com.ediagnosis.cdr.dataIntegration.dao.BusinessDataDao; +import com.ediagnosis.cdr.dataIntegration.dao.dto.*; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTableField; import com.mybatisflex.core.paginate.Page; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessSystemRepository.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessSystemRepository.java similarity index 81% rename from src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessSystemRepository.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessSystemRepository.java index 83be93b..f57836f 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessSystemRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessSystemRepository.java @@ -1,9 +1,9 @@ -package com.ediagnosis.cdr.dataCollect.inner; +package com.ediagnosis.cdr.dataIntegration.inner; -import com.ediagnosis.cdr.dataCollect.dao.BusinessDataDao; -import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSystemDTO; -import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSystemQueryDTO; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataIntegration.dao.BusinessDataDao; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemDTO; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemQueryDTO; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; import com.mybatisflex.core.paginate.Page; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/CacheableTableDefinitionRepository.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/CacheableTableDefinitionRepository.java similarity index 93% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/CacheableTableDefinitionRepository.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/inner/CacheableTableDefinitionRepository.java index 65793b8..d4dea77 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/CacheableTableDefinitionRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/CacheableTableDefinitionRepository.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataIntegration; +package com.ediagnosis.cdr.dataIntegration.inner; import com.ediagnosis.cdr.cache.CacheFacade; import com.ediagnosis.cdr.dataIntegration.value.TableDefinitionItem; @@ -7,7 +7,7 @@ import org.springframework.stereotype.Component; import java.util.List; @Component -public class CacheableTableDefinitionRepository implements TableDefinitionRepository{ +public class CacheableTableDefinitionRepository implements TableDefinitionRepository { private final DefaultTableDefinitionRepository defaultTableDefinitionRepository; private final CacheFacade cacheFacade; diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/DefaultTableDefinitionRepository.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/DefaultTableDefinitionRepository.java similarity index 91% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/DefaultTableDefinitionRepository.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/inner/DefaultTableDefinitionRepository.java index 8f780ed..ca86e0b 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/DefaultTableDefinitionRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/DefaultTableDefinitionRepository.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataIntegration; +package com.ediagnosis.cdr.dataIntegration.inner; import com.ediagnosis.cdr.dataIntegration.value.TableDefinitionItem; import com.ediagnosis.cdr.dataIntegration.value.TableTree; diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/TableDefinitionRepository.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/TableDefinitionRepository.java similarity index 88% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/TableDefinitionRepository.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/inner/TableDefinitionRepository.java index 4fab08b..edb7a27 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/TableDefinitionRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/TableDefinitionRepository.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataIntegration; +package com.ediagnosis.cdr.dataIntegration.inner; import com.ediagnosis.cdr.dataIntegration.value.TableDefinitionItem; import com.ediagnosis.cdr.dataIntegration.value.TableTree; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSourceVo.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSourceVo.java similarity index 95% rename from src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSourceVo.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSourceVo.java index 10d5bf3..e466155 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSourceVo.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSourceVo.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.endpoint.vo; +package com.ediagnosis.cdr.dataIntegration.value; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSystemVo.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSystemVo.java similarity index 93% rename from src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSystemVo.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSystemVo.java index a3cb847..fe5a0f5 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSystemVo.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSystemVo.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.endpoint.vo; +package com.ediagnosis.cdr.dataIntegration.value; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataTableFieldVo.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableFieldVo.java similarity index 94% rename from src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataTableFieldVo.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableFieldVo.java index 6a0d2f5..95abbb6 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataTableFieldVo.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableFieldVo.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.endpoint.vo; +package com.ediagnosis.cdr.dataIntegration.value; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataTableVo.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableVo.java similarity index 95% rename from src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataTableVo.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableVo.java index 3f814a3..20dd72c 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataTableVo.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableVo.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.endpoint.vo; +package com.ediagnosis.cdr.dataIntegration.value; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceQueryParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSourceQueryParam.java similarity index 91% rename from src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceQueryParam.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSourceQueryParam.java index b21d4c3..2ef44a0 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceQueryParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSourceQueryParam.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.endpoint.param; +package com.ediagnosis.cdr.dataIntegration.value.param; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemAddParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemAddParam.java similarity index 89% rename from src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemAddParam.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemAddParam.java index f7ab46d..bbea953 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemAddParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemAddParam.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.endpoint.param; +package com.ediagnosis.cdr.dataIntegration.value.param; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemDeleteParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemDeleteParam.java similarity index 86% rename from src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemDeleteParam.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemDeleteParam.java index 3ed8e7e..8c7ec4c 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemDeleteParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemDeleteParam.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.endpoint.param; +package com.ediagnosis.cdr.dataIntegration.value.param; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemQueryParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemQueryParam.java similarity index 86% rename from src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemQueryParam.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemQueryParam.java index 2424007..d59c842 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemQueryParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemQueryParam.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.endpoint.param; +package com.ediagnosis.cdr.dataIntegration.value.param; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemUpdateParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemUpdateParam.java similarity index 89% rename from src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemUpdateParam.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemUpdateParam.java index bbd50b1..e3977ca 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemUpdateParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemUpdateParam.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.endpoint.param; +package com.ediagnosis.cdr.dataIntegration.value.param; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableFieldQueryParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableFieldQueryParam.java similarity index 89% rename from src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableFieldQueryParam.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableFieldQueryParam.java index e3d0a2a..d2ba3c4 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableFieldQueryParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableFieldQueryParam.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.endpoint.param; +package com.ediagnosis.cdr.dataIntegration.value.param; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableQueryParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableQueryParam.java similarity index 91% rename from src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableQueryParam.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableQueryParam.java index 6da57c0..03d14eb 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableQueryParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableQueryParam.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.endpoint.param; +package com.ediagnosis.cdr.dataIntegration.value.param; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/PageQuery.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/PageQuery.java similarity index 88% rename from src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/PageQuery.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/PageQuery.java index 739e0a2..3f5b694 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/PageQuery.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/PageQuery.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataCollect.endpoint.param; +package com.ediagnosis.cdr.dataIntegration.value.param; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataGovernance/dataModel/ModelDefinitionRepository.java b/src/main/java/com/ediagnosis/cdr/dataModel/ModelDefinitionRepository.java similarity index 66% rename from src/main/java/com/ediagnosis/cdr/dataGovernance/dataModel/ModelDefinitionRepository.java rename to src/main/java/com/ediagnosis/cdr/dataModel/ModelDefinitionRepository.java index 5109707..e442426 100644 --- a/src/main/java/com/ediagnosis/cdr/dataGovernance/dataModel/ModelDefinitionRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dataModel/ModelDefinitionRepository.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataGovernance.dataModel; +package com.ediagnosis.cdr.dataModel; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/ediagnosis/cdr/dataService/DwsRepository.java b/src/main/java/com/ediagnosis/cdr/dataService/DwsRepository.java index ee1e03e..f5b46ef 100644 --- a/src/main/java/com/ediagnosis/cdr/dataService/DwsRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dataService/DwsRepository.java @@ -1,7 +1,6 @@ package com.ediagnosis.cdr.dataService; -import com.ediagnosis.cdr.context.value.Page; import com.mybatisflex.core.row.Row; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/IndicatorRepository.java b/src/main/java/com/ediagnosis/cdr/indicator/IndicatorRepository.java similarity index 73% rename from src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/IndicatorRepository.java rename to src/main/java/com/ediagnosis/cdr/indicator/IndicatorRepository.java index dbc8988..36e6fab 100644 --- a/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/IndicatorRepository.java +++ b/src/main/java/com/ediagnosis/cdr/indicator/IndicatorRepository.java @@ -1,9 +1,9 @@ -package com.ediagnosis.cdr.dataGovernance.indicator; +package com.ediagnosis.cdr.indicator; -import com.ediagnosis.cdr.dataGovernance.indicator.dao.entity.IndicatorEntity; -import com.ediagnosis.cdr.dataGovernance.indicator.dao.mapper.IndicatorMapper; +import com.ediagnosis.cdr.indicator.dao.entity.IndicatorEntity; +import com.ediagnosis.cdr.indicator.dao.mapper.IndicatorMapper; import com.ediagnosis.cdr.context.TimeUtil; -import com.ediagnosis.cdr.dataGovernance.indicator.value.Indicator; +import com.ediagnosis.cdr.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/indicator/dao/IndicatorDao.java similarity index 90% rename from src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/IndicatorDao.java rename to src/main/java/com/ediagnosis/cdr/indicator/dao/IndicatorDao.java index c702ead..511e1bd 100644 --- a/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/IndicatorDao.java +++ b/src/main/java/com/ediagnosis/cdr/indicator/dao/IndicatorDao.java @@ -1,9 +1,9 @@ -package com.ediagnosis.cdr.dataGovernance.indicator.dao; +package com.ediagnosis.cdr.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.ediagnosis.cdr.indicator.dao.entity.IndicatorEntity; +import com.ediagnosis.cdr.indicator.dao.mapper.IndicatorMapper; +import com.ediagnosis.cdr.indicator.value.Indicator; import com.mybatisflex.core.query.QueryChain; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.update.UpdateChain; diff --git a/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/entity/IndicatorEntity.java b/src/main/java/com/ediagnosis/cdr/indicator/dao/entity/IndicatorEntity.java similarity index 96% rename from src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/entity/IndicatorEntity.java rename to src/main/java/com/ediagnosis/cdr/indicator/dao/entity/IndicatorEntity.java index dc67a9f..61db09c 100644 --- a/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/entity/IndicatorEntity.java +++ b/src/main/java/com/ediagnosis/cdr/indicator/dao/entity/IndicatorEntity.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataGovernance.indicator.dao.entity; +package com.ediagnosis.cdr.indicator.dao.entity; import com.mybatisflex.annotation.Id; diff --git a/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/mapper/IndicatorMapper.java b/src/main/java/com/ediagnosis/cdr/indicator/dao/mapper/IndicatorMapper.java similarity index 56% rename from src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/mapper/IndicatorMapper.java rename to src/main/java/com/ediagnosis/cdr/indicator/dao/mapper/IndicatorMapper.java index 2b1e2e9..e14bccb 100644 --- a/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/mapper/IndicatorMapper.java +++ b/src/main/java/com/ediagnosis/cdr/indicator/dao/mapper/IndicatorMapper.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dataGovernance.indicator.dao.mapper; +package com.ediagnosis.cdr.indicator.dao.mapper; -import com.ediagnosis.cdr.dataGovernance.indicator.dao.entity.IndicatorEntity; +import com.ediagnosis.cdr.indicator.dao.entity.IndicatorEntity; import com.mybatisflex.core.BaseMapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/StatisticsController.java b/src/main/java/com/ediagnosis/cdr/indicator/statistics/StatisticsController.java similarity index 71% rename from src/main/java/com/ediagnosis/cdr/dashBoard/statistics/StatisticsController.java rename to src/main/java/com/ediagnosis/cdr/indicator/statistics/StatisticsController.java index 4d87d84..e6acac8 100644 --- a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/StatisticsController.java +++ b/src/main/java/com/ediagnosis/cdr/indicator/statistics/StatisticsController.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dashBoard.statistics; +package com.ediagnosis.cdr.indicator.statistics; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/StatisticsService.java b/src/main/java/com/ediagnosis/cdr/indicator/statistics/StatisticsService.java similarity index 73% rename from src/main/java/com/ediagnosis/cdr/dashBoard/statistics/StatisticsService.java rename to src/main/java/com/ediagnosis/cdr/indicator/statistics/StatisticsService.java index 7259c7a..0238651 100644 --- a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/StatisticsService.java +++ b/src/main/java/com/ediagnosis/cdr/indicator/statistics/StatisticsService.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dashBoard.statistics; +package com.ediagnosis.cdr.indicator.statistics; public interface StatisticsService { diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractDataSourceCountService.java b/src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/AbstractDataSourceCountService.java similarity index 58% rename from src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractDataSourceCountService.java rename to src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/AbstractDataSourceCountService.java index 77de5e7..2e4c240 100644 --- a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractDataSourceCountService.java +++ b/src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/AbstractDataSourceCountService.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dashBoard.statistics.impl; +package com.ediagnosis.cdr.indicator.statistics.impl; -import com.ediagnosis.cdr.dashBoard.statistics.StatisticsService; +import com.ediagnosis.cdr.indicator.statistics.StatisticsService; public abstract class AbstractDataSourceCountService implements StatisticsService { diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractRowCountService.java b/src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/AbstractRowCountService.java similarity index 56% rename from src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractRowCountService.java rename to src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/AbstractRowCountService.java index de00936..c1a7a62 100644 --- a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractRowCountService.java +++ b/src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/AbstractRowCountService.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dashBoard.statistics.impl; +package com.ediagnosis.cdr.indicator.statistics.impl; -import com.ediagnosis.cdr.dashBoard.statistics.StatisticsService; +import com.ediagnosis.cdr.indicator.statistics.StatisticsService; public abstract class AbstractRowCountService implements StatisticsService { @Override diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractSourceBizTableCountService.java b/src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/AbstractSourceBizTableCountService.java similarity index 57% rename from src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractSourceBizTableCountService.java rename to src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/AbstractSourceBizTableCountService.java index a9a97b9..d78b7b8 100644 --- a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractSourceBizTableCountService.java +++ b/src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/AbstractSourceBizTableCountService.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dashBoard.statistics.impl; +package com.ediagnosis.cdr.indicator.statistics.impl; -import com.ediagnosis.cdr.dashBoard.statistics.StatisticsService; +import com.ediagnosis.cdr.indicator.statistics.StatisticsService; public abstract class AbstractSourceBizTableCountService implements StatisticsService { diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/CacheableStatisticsService.java b/src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/CacheableStatisticsService.java similarity index 93% rename from src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/CacheableStatisticsService.java rename to src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/CacheableStatisticsService.java index f2d061d..ce42eb6 100644 --- a/src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/CacheableStatisticsService.java +++ b/src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/CacheableStatisticsService.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dashBoard.statistics.impl; +package com.ediagnosis.cdr.indicator.statistics.impl; -import com.ediagnosis.cdr.dashBoard.statistics.StatisticsService; +import com.ediagnosis.cdr.indicator.statistics.StatisticsService; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/value/Indicator.java b/src/main/java/com/ediagnosis/cdr/indicator/value/Indicator.java similarity index 76% rename from src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/value/Indicator.java rename to src/main/java/com/ediagnosis/cdr/indicator/value/Indicator.java index 8c24a21..63309cf 100644 --- a/src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/value/Indicator.java +++ b/src/main/java/com/ediagnosis/cdr/indicator/value/Indicator.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dataGovernance.indicator.value; +package com.ediagnosis.cdr.indicator.value; import java.time.LocalDateTime; diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/DashBoardController.java b/src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/DashBoardController.java similarity index 91% rename from src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/DashBoardController.java rename to src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/DashBoardController.java index 723240b..fe8c13a 100644 --- a/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/DashBoardController.java +++ b/src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/DashBoardController.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dashBoard.hostMonitor; +package com.ediagnosis.cdr.maintenance.hostMonitor; -import com.ediagnosis.cdr.context.value.Response; +import com.ediagnosis.cdr.context.values.Response; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitor.java b/src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/HostMonitor.java similarity index 99% rename from src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitor.java rename to src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/HostMonitor.java index 02de837..bbbddc6 100644 --- a/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitor.java +++ b/src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/HostMonitor.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dashBoard.hostMonitor; +package com.ediagnosis.cdr.maintenance.hostMonitor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitorValue.java b/src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/HostMonitorValue.java similarity index 92% rename from src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitorValue.java rename to src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/HostMonitorValue.java index a9d5235..8d8674b 100644 --- a/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitorValue.java +++ b/src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/HostMonitorValue.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dashBoard.hostMonitor; +package com.ediagnosis.cdr.maintenance.hostMonitor; public record HostMonitorValue( HostValue host, diff --git a/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitorValueRepository.java b/src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/HostMonitorValueRepository.java similarity index 98% rename from src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitorValueRepository.java rename to src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/HostMonitorValueRepository.java index 2a239d9..da94226 100644 --- a/src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitorValueRepository.java +++ b/src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/HostMonitorValueRepository.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dashBoard.hostMonitor; +package com.ediagnosis.cdr.maintenance.hostMonitor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/ediagnosis/cdr/package-info.java b/src/main/java/com/ediagnosis/cdr/package-info.java new file mode 100644 index 0000000..6c59ab8 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/package-info.java @@ -0,0 +1,58 @@ +/** + * 分包原则： + * 1、每层包结构代表一个特定领域，项目整体按照业务领域进行一级分包，简称业务模块，模块内按功能进行分包。 + * 2、每层第一层包目录下的类为公开类，额外追加的公开包需要再package-info.java中声明。 + * 3、每层包目录下的子包结构的类为私有类，私有类不提供外部访问，外部不感知。 + * 4、开发遵循测试先行的流程，每层领域都要有单元测试、集成测试。 + * 代码设计原则： + * 1、注重扩展性的同时，要警惕过渡设计 。 + * 2、尽力遮蔽对特定框架、软件的强依赖，形成防腐层，便于重构。 + * 3、代码以简洁为目标，例如只有一个实现类的情况，没有必要使用接口。 + * 4、代码尽量使用抽象类、组合、继承等手段解构大类，形成一系列灵活的小类。 + * 5、如果不写注释，代码要做到语义化，仅通过阅读单词就能准确描述出代码的意图。 + * 角色语义： + * 构建类： + * 1、repository：代表提供某类对象的仓库，对对象的生命周期进行管理，外部直接询问repository拿到对象，不关注具体细节。 + * 2、builder：代表提供对象构建者，为对象的属性进行组装，用于构建复杂对象。 + * 3、factory：代表提供对象工厂，提供对象创建功能，用于构建消耗性对象。 + * 行为类： + * 1、service：代表提供某类相关服务，代表一组难以归属实例对象的行为抽象。 + * 2、dao:数据访问对象，用于封装对数据库的访问，进行业务对象到数据库实体记录的转换 + * 3、convertor：数据转换器，用于将值对象之间转换。 + * 4、processor/handler: 代表处理某类功能的实例对象，实例有一组对应的行为 + * 5、manager: 代表管理某一系列实例对象的实例对象 + * 6、listener: 代表监听某类事件，并执行相应的处理逻辑。 + * 7、observer: 代表观察某类状态的实例对象 + * 8、strategy: 代表策略对象，提供一组算法，并封装，使得算法可以相互替换。 + * 9、validator: 代表数据校验对象，用于校验数据，并返回校验结果。 + * 10、executor: 代表执行器对象，执行某类任务。 + * 11、scheduler: 代表计划任务对象，执行某类任务。 + * 12、chain: 连锁对象，执行某类任务，并传递给下一个连锁。 + * 13、proxy: 代理对象，代理某类对象，对某类对象的行为进行代理。 + * 数据结构： + * 1、value:表示值对象，没有唯一标识，无需管理生命周期，用于系统内部一对一的数据交换。 + * 2、entity:表示实体对象，有唯一标识，需要管理生命周期 + * 3、event:表示事件对象，有唯一追踪标识，存在生命周期，用于描述某类事件，并携带事件数据，用在系统内部对边界的访问 + * 4、signal:表示信号对象，无唯一追踪标识，不存在生命周期，用于描述某类信号，并携带信号数据，用在系统内部一对N的通知 + * 5、request：表示请求对象，专用于外部网络请求对边界的访问 + * 6、response：表示响应对象，专用于边界对外部网络请求的返回 + * 包名语义： + * 1、endpoint:表示端点，是系统、模块的边界 + * 2、api:表示接口,端点的一种,是系统对外提供功能的入口 + * 3、values:表示值对象，存放数据结构 + * 4、inner:存放难以分类的内部文件 + * 5、entities：表示对应数据库记录的实体对象 + * 6、context:表示上下文对象，存放贯通系统层级的类 + * 系统业务术语： + * cdr:临床数据中心 + * dataIntegration:数据集成,描述采集数据的业务。 + * dataService:数据服务,描述数据中心对外提供数据的业务。 + * indicator:指标，描述数据中心的指标业务。 + * dataModel：模型设计，描述数据中心数据服务层的模型设计业务。 + * dataDict: 数据字典 + * maintenance: 运维中心，描述系统监控、作业调度、任务调度。 + * + * + * + */ +package com.ediagnosis.cdr; \ No newline at end of file diff --git a/src/main/resources/generator/mapper/BusinessDataSourceMapper.xml b/src/main/resources/generator/mapper/BusinessDataSourceMapper.xml index 8f93e8f..75887b6 100644 --- a/src/main/resources/generator/mapper/BusinessDataSourceMapper.xml +++ b/src/main/resources/generator/mapper/BusinessDataSourceMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/main/resources/generator/mapper/BusinessDataSystemMapper.xml b/src/main/resources/generator/mapper/BusinessDataSystemMapper.xml index a605d18..f0a463e 100644 --- a/src/main/resources/generator/mapper/BusinessDataSystemMapper.xml +++ b/src/main/resources/generator/mapper/BusinessDataSystemMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/main/resources/generator/mapper/BusinessDataTableFieldMapper.xml b/src/main/resources/generator/mapper/BusinessDataTableFieldMapper.xml index db6c4df..0d076c1 100644 --- a/src/main/resources/generator/mapper/BusinessDataTableFieldMapper.xml +++ b/src/main/resources/generator/mapper/BusinessDataTableFieldMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/main/resources/generator/mapper/BusinessDataTableMapper.xml b/src/main/resources/generator/mapper/BusinessDataTableMapper.xml index 7685dc7..6e60630 100644 --- a/src/main/resources/generator/mapper/BusinessDataTableMapper.xml +++ b/src/main/resources/generator/mapper/BusinessDataTableMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java b/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java index 3eb473d..a36bf40 100644 --- a/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java +++ b/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java @@ -1,11 +1,11 @@ package com.ediagnosis.cdr.dao; import com.ediagnosis.cdr.CdrApplication; -import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSourceDTO; -import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSourceQueryDTO; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSource; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataSourceMapper; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSourceDTO; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSourceQueryDTO; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSource; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataSourceMapper; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/ediagnosis/cdr/demo/DemoTest.java b/src/test/java/com/ediagnosis/cdr/demo/DemoTest.java index 5ad7429..5d8ab5f 100644 --- a/src/test/java/com/ediagnosis/cdr/demo/DemoTest.java +++ b/src/test/java/com/ediagnosis/cdr/demo/DemoTest.java @@ -1,9 +1,9 @@ package com.ediagnosis.cdr.demo; import com.ediagnosis.cdr.CdrApplication; -import com.ediagnosis.cdr.dataCollect.dao.BusinessDataDao; -import com.ediagnosis.cdr.dataCollect.dao.dto.*; -import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataIntegration.dao.BusinessDataDao; +import com.ediagnosis.cdr.dataIntegration.dao.dto.*; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; import com.mybatisflex.core.paginate.Page; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -- 2.18.1