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 5dc154aa88fa5dce5e32b270e9fcac0790952a73..2ddcd05d5e9fb1aacaef79bc4ccae435377fbdfd 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 0000000000000000000000000000000000000000..7ea69875d8797913f162f043539f0d8dc5d7ac2a --- /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 6d67eecc07b7cd33406ba9ebad4f66ad7002f21a..0000000000000000000000000000000000000000 --- 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 fc4438ac1de5eeb18538639f51ad7d1769240a54..b9fa1505cb5109600384242fd5b8d8b9da974c52 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 3a76ec49d0bb0e5b83d47bff96ce588fabf5fb33..a6a5876d90b354e97a280fc12d2f72d334e53612 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 b9947dcee51c9a3941c27b26379f6a9fd3ad3d01..a3e40124b8c6984a16fed17bf71af26551e14dce 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 c15626471573ad64cfca48bd1c50787a6364938e..b1a99b059f113b0b75f21491c6c711aacd1acdea 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 488ccbbfc0057b7f6c243598b5a0db2cd8656bd2..a90106bbab70557eeddf8107a0baff18150d289d 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 631e867c111983932970cc05725b04c6f589f35c..de1e61a3191fabd451d79c4a0da20fd26224a05d 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 4c0529cc8f24eac6a9aea7cdf5d4f6269c37a451..2e217c32c4d644b288d4e8e9669ab15b340733a3 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 0e4e2b0444eb37de4d6ca9f84c2e276bfddef575..d4d7f3019a2bfd6a5fa3392f60266746f22910bc 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 00b9dc0c5a4335ca016f6a6932aa1b583c4edd38..d2da22e7a69e0a0bb4b10f3abc876c0b145aed3a 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 e2989418e976db65980ab9de06f49356d9fd2ec8..486afe768440bf4a3ed7de1584340afa334b4305 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 5e2bc3d063c71eb900eebbc95cacd8f5be92b3bd..a811f0230c88580b06946e66a12aad485f5eb105 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 9832247a4079394431ca83cd50ed8c25af0286c3..438c0b67d7f4b28508684ab2c5fcb98b0d5fc4c9 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 935ff83e2978d71cd3b1a212a47f01f6c47e02d4..dd83db357bbb0719f433ac2c3e9977ca43c98594 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 56f52116b0301fe568658bccf9046fdea922db36..60f8ba8e818339e5a47723da4d61386b60000299 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 f0a49f41ec9ef345db026508c149d5034e3816d8..81c006fbfc5d634cc5f574c4dbdd52ef4bb9a888 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 79ac5ac1c5afaf6a766faa73044fed14455a9e9a..94252dc2faa51637c434efc8899a72f7d19f1401 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 168199c2052bf83d8bb5448c36a54b399fcafa5a..d98419e072269df2a047db740bb98d3df4f1f15a 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 597d10d7a8d0caf209a61bb1453ce30f16370d2e..a778f7c5105186f99c5790f9994c8c3098bac292 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 a2509c0a17461ad45043f0543548302e9a648838..2beac5575c16ac8d5eaee28471cbc8c367763209 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 97994e377a0adfc28c92ac0683b4c4ea7c01032d..a9885562b92c2823116bbc2b45708d2d824b8408 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 4e56b423d6d0d14bb92e384901bfc84778e6fb64..fd410991970039dfe7b5eb955c7cddb6e9c515ce 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 e886a84c331f9f7c62fdaf0fdfdb41e704524ca8..af158af38690fdfa734b3e5637d678af8a0e93c0 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 4320472d8e077e2bbdbad6a48f738bcac0acb397..eda203813d949759015376ff58814033d85211b8 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 b8dc93f6f1144d7a1bcfcb0528e5e1cf7d734b9b..27301ebf2252bb6dfd93956dcbc2e5796eef843a 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 83be93bebbec748d5f38e537ccaae7647ab3a836..f57836f8718e7c8d39877322ebf99d66170bd2c4 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 65793b810e80b22b95fea21d33a7d978bd598133..d4dea77819b9ce4b15fd56b4a7326484201c9395 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 8f780edbee2e17a4dc0d950d8bad8bfe07f78979..ca86e0b7bf79d300a1e3c369d5f31cce03ae70c3 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 4fab08b51fc14b8e55a3c107b139a55be8bd40ad..edb7a273c96782c84398c6fe1c07c8e3ac31d035 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 10d5bf3ae49825d9e041dc03e7af13a8f23e4f4b..e466155a9a0c367c74867124274dfbb9558d7e36 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 a3cb847cc47e6793a6ca96b3011dbc3c832493f9..fe5a0f5a2c6d36ea593cf3361f40b16d9e833847 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 6a0d2f5839ffa7fef36e5f6b30892d5133db69fa..95abbb65a7e2e600bf4ba26ee59a785c0422c99a 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 3f814a3ed57fdc54d874b1abff81eee9a443fbc8..20dd72cfb614d16f28a0d86d32b6eac8896f2ebe 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 b21d4c342905ee85297e7661546b949f09c0f561..2ef44a0895bcb2383ca68b1baf3324e148132f59 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 f7ab46de3c5e3ee62238bff0ffa1b16759a731af..bbea953607f15ffb5205a009a342d5be4bf55447 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 3ed8e7edb0819aaa718bf472602c62272f6c9158..8c7ec4ced902a59d8510c36d813a2d8610d6ec92 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 2424007c5d05200ed05ea0ff00a76f4b9f49c33e..d59c84282d97b374f78acca13463552ef4bdfbac 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 bbd50b1f850c662eaeaeefce0fbe8baf7b455523..e3977ca0891ff8f4f15315ef708637c308e11321 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 e3d0a2af1bbe189567e8083ab2129e16a4167124..d2ba3c4cf9b80e79d92ce08b71f8ae751eb033d3 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 6da57c027a2b035be49ec002edf904f4b6a181b9..03d14eb7a74f81917917fc76c89e38ed27ddcaa8 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 739e0a24f09298808f1cb63a5a1a5632c94f2a15..3f5b694fee019511beeb897bd748b0c95a639542 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 5109707297c440f5445d243779bd42fc77e16e3b..e4424269d9f7fe74c11a9d659f98426d57c403c6 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 ee1e03e5f4e3d3cfd092acf0da00ce8e17a8173e..f5b46efa7353b35cd26bfb21849e762f0f48055c 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 dbc89887db44b1801feb46fa935aef55a736f2bd..36e6fab3d47bf23086f98d1f1fd700af5754f47f 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 c702ead051275cb25dc367c37912cede6d4fddaf..511e1bde59b85f2cabe000da314605b570e83e92 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 dc67a9f7705226f35d0e594fd01edc92178e1980..61db09c7538b95ac3dcfdcd8e5635ca91a82f5b1 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 2b1e2e9ea7804d26ee085e99ad7afb9a47d82e8c..e14bccbfdd48fc847837d9fdd60c41f340c81ce1 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 4d87d84e19ec83fe13fc4e608289fe14619c0af4..e6acac85fd80eb347c9db6b49a886574aaadb24f 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 7259c7ad48543b37dc5bab168224ae9ab768d5fc..02386511c80d3c4f84fab91b11e7b35e2a5298ee 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 77de5e784032232651fea032700fadd33ecf67b2..2e4c24088b36299140bc489850115d2b3b12d119 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 de0093602b67c87aa045e9828ea5e56995fe9dec..c1a7a62d403c9bc646ee402677c6d1cdb7f57190 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 a9a97b94bae75261042d8ee6273dfbb3226931e6..d78b7b82de607bf560068c367afae4ff5e6f1d29 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 f2d061d80de40b70ef719565b2e30a71ca57704f..ce42eb632b3ecd29b7f428179c2bd02041bf88be 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 8c24a21f36bd7f3597b7d679f01d1f75e3c7691b..63309cf3b9f57d6e41a393b67bf69ca5c5a30056 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 723240b672a3fbca92746691635f9cc860f16f04..fe8c13aa3ee7c919eedd4e21a76483c771e353a9 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 02de83703c2ca6e9efdb3c6f62eb419e4777e7b6..bbbddc6d915cfc8ce9733d8330ebcb425324d845 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 a9d5235347e1fc8f4338c672861aaf653f572566..8d8674b302ca789ee4111eb75919fb59c05d6694 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 2a239d9c0fa991d02ac763743bd55b0df18e0501..da942260415e4f37a4003c21e799bb50c1aa4cc1 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 0000000000000000000000000000000000000000..6c59ab889a28759a6aaf5db534d22a24caeb880d --- /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 8f93e8ff1ce645cf9c72063984abd13f10d52b85..75887b650253084af69b4686e0cd0a1e50f017f9 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 a605d18d7323d870ab0479d534d4910f4e5fddcc..f0a463e873850e331b7b278dad643f680126d91f 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 db6c4dfc574ee67e735d900a89cf620fabbce50f..0d076c1923e95ba9445832a0d41da934328753ee 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 7685dc7032eb22361618ab55b271ffd70e822f27..6e60630269cd56549e06e26289f706a84bf2adda 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 3eb473d140181b981d81dff990310c7bc7f84e47..a36bf4010aeade6eef53fbf4c278e12587457bce 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 5ad7429a9e880c377aa7fbb4e19fa51491f386d2..5d8ab5f875d5d2c44b40c1d25ea3a6a42e5fee09 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;