init

src/main/java/com/ediagnosis/cdr/util/PageConvertUtils.java → src/main/java/com/ediagnosis/cdr/context/PageConvertUtils.java

-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;
 

src/main/java/com/ediagnosis/cdr/context/package-info.java

+/**
+ * 存放具有公共使用属性的组件。
+ * 额外开放的包：values 存放值对象
+ */
+package com.ediagnosis.cdr.context;
+

src/main/java/com/ediagnosis/cdr/context/value/Page.java

-package com.ediagnosis.cdr.context.value;
-
-import java.util.List;
-
-public class Page<T> {
-    private long pageNo;
-    private long pageSize;
-    private long totalCount;
-    private List<T> content;
-    private long totalPage;
-
-    public Page() {
-    }
-
-    public Page(long pageNo, long pageSize,
-                long totalCount, List<T> 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<T> 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<T> content) {
-        this.content = content;
-    }
-
-    public void setTotalPage(long totalPage) {
-        this.totalPage = totalPage;
-    }
-
-
-}

src/main/java/com/ediagnosis/cdr/value/PageVo.java → src/main/java/com/ediagnosis/cdr/context/values/PageVo.java

-package com.ediagnosis.cdr.value;
+package com.ediagnosis.cdr.context.values;
 
 import java.util.List;
 

src/main/java/com/ediagnosis/cdr/context/value/Response.java → src/main/java/com/ediagnosis/cdr/context/values/Response.java

-package com.ediagnosis.cdr.context.value;
+package com.ediagnosis.cdr.context.values;
 
 
 import java.io.Serializable;

src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataApi.java → src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessDataApi.java

-package com.ediagnosis.cdr.dataCollect;
+package com.ediagnosis.cdr.dataIntegration;
 
 import org.springframework.stereotype.Component;
 

src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataController.java → src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessDataController.java

-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;

src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSourceController.java → src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSourceController.java

-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;

src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSystemController.java → src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSystemController.java

-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;

src/main/java/com/ediagnosis/cdr/dataCollect/BusinessTableController.java → src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessTableController.java

-package com.ediagnosis.cdr.dataCollect;
+package com.ediagnosis.cdr.dataIntegration;
 
 /**
  * @author monojun

src/main/java/com/ediagnosis/cdr/dataCollect/dao/BusinessDataDao.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/BusinessDataDao.java

-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;

src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSourceDTO.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceDTO.java

-package com.ediagnosis.cdr.dataCollect.dao.dto;
+package com.ediagnosis.cdr.dataIntegration.dao.dto;
 
 import lombok.Data;
 

src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSourceQueryDTO.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceQueryDTO.java

-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;

src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSystemDTO.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemDTO.java

-package com.ediagnosis.cdr.dataCollect.dao.dto;
+package com.ediagnosis.cdr.dataIntegration.dao.dto;
 
 import lombok.Data;
 

src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSystemQueryDTO.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemQueryDTO.java

-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;
 
 /**

src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableDTO.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableDTO.java

-package com.ediagnosis.cdr.dataCollect.dao.dto;
+package com.ediagnosis.cdr.dataIntegration.dao.dto;
 
 import lombok.Data;
 

src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableFieldQueryDTO.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableFieldQueryDTO.java

-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;

src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableQueryDTO.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableQueryDTO.java

-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;

src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSource.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSource.java

-package com.ediagnosis.cdr.dataCollect.dao.entity;
+package com.ediagnosis.cdr.dataIntegration.dao.entity;
 
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;

src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSystem.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSystem.java

-package com.ediagnosis.cdr.dataCollect.dao.entity;
+package com.ediagnosis.cdr.dataIntegration.dao.entity;
 
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;

src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTable.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTable.java

-package com.ediagnosis.cdr.dataCollect.dao.entity;
+package com.ediagnosis.cdr.dataIntegration.dao.entity;
 
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;

src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTableField.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTableField.java

-package com.ediagnosis.cdr.dataCollect.dao.entity;
+package com.ediagnosis.cdr.dataIntegration.dao.entity;
 
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;

src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSourceMapper.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSourceMapper.java

-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;

src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSystemMapper.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSystemMapper.java

-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;

src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableFieldMapper.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableFieldMapper.java

-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;

src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableMapper.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableMapper.java

-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;

src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessDataRepository.java → src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessDataRepository.java

-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;

src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessSystemRepository.java → src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessSystemRepository.java

-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;

src/main/java/com/ediagnosis/cdr/dataIntegration/CacheableTableDefinitionRepository.java → src/main/java/com/ediagnosis/cdr/dataIntegration/inner/CacheableTableDefinitionRepository.java

-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;

src/main/java/com/ediagnosis/cdr/dataIntegration/DefaultTableDefinitionRepository.java → src/main/java/com/ediagnosis/cdr/dataIntegration/inner/DefaultTableDefinitionRepository.java

-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;

src/main/java/com/ediagnosis/cdr/dataIntegration/TableDefinitionRepository.java → src/main/java/com/ediagnosis/cdr/dataIntegration/inner/TableDefinitionRepository.java

-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;

src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSourceVo.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSourceVo.java

-package com.ediagnosis.cdr.dataCollect.endpoint.vo;
+package com.ediagnosis.cdr.dataIntegration.value;
 
 import lombok.Data;
 

src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSystemVo.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSystemVo.java

-package com.ediagnosis.cdr.dataCollect.endpoint.vo;
+package com.ediagnosis.cdr.dataIntegration.value;
 
 import lombok.Data;
 

src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataTableFieldVo.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableFieldVo.java

-package com.ediagnosis.cdr.dataCollect.endpoint.vo;
+package com.ediagnosis.cdr.dataIntegration.value;
 
 import lombok.Data;
 

src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataTableVo.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableVo.java

-package com.ediagnosis.cdr.dataCollect.endpoint.vo;
+package com.ediagnosis.cdr.dataIntegration.value;
 
 import lombok.Data;
 

src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceQueryParam.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSourceQueryParam.java

-package com.ediagnosis.cdr.dataCollect.endpoint.param;
+package com.ediagnosis.cdr.dataIntegration.value.param;
 
 import lombok.Data;
 

src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemAddParam.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemAddParam.java

-package com.ediagnosis.cdr.dataCollect.endpoint.param;
+package com.ediagnosis.cdr.dataIntegration.value.param;
 
 import lombok.Data;
 

src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemDeleteParam.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemDeleteParam.java

-package com.ediagnosis.cdr.dataCollect.endpoint.param;
+package com.ediagnosis.cdr.dataIntegration.value.param;
 
 import lombok.Data;
 

src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemQueryParam.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemQueryParam.java

-package com.ediagnosis.cdr.dataCollect.endpoint.param;
+package com.ediagnosis.cdr.dataIntegration.value.param;
 
 import lombok.Data;
 

src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemUpdateParam.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemUpdateParam.java

-package com.ediagnosis.cdr.dataCollect.endpoint.param;
+package com.ediagnosis.cdr.dataIntegration.value.param;
 
 import lombok.Data;
 

src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableFieldQueryParam.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableFieldQueryParam.java

-package com.ediagnosis.cdr.dataCollect.endpoint.param;
+package com.ediagnosis.cdr.dataIntegration.value.param;
 
 import lombok.Data;
 

src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableQueryParam.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableQueryParam.java

-package com.ediagnosis.cdr.dataCollect.endpoint.param;
+package com.ediagnosis.cdr.dataIntegration.value.param;
 
 import lombok.Data;
 

src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/PageQuery.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/PageQuery.java

-package com.ediagnosis.cdr.dataCollect.endpoint.param;
+package com.ediagnosis.cdr.dataIntegration.value.param;
 
 import lombok.Data;
 

src/main/java/com/ediagnosis/cdr/dataGovernance/dataModel/ModelDefinitionRepository.java → src/main/java/com/ediagnosis/cdr/dataModel/ModelDefinitionRepository.java

-package com.ediagnosis.cdr.dataGovernance.dataModel;
+package com.ediagnosis.cdr.dataModel;
 
 import org.springframework.stereotype.Component;
 

src/main/java/com/ediagnosis/cdr/dataService/DwsRepository.java

 package com.ediagnosis.cdr.dataService;
 
 
-import com.ediagnosis.cdr.context.value.Page;
 import com.mybatisflex.core.row.Row;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/IndicatorRepository.java → src/main/java/com/ediagnosis/cdr/indicator/IndicatorRepository.java

-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;

src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/IndicatorDao.java → src/main/java/com/ediagnosis/cdr/indicator/dao/IndicatorDao.java

-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;

src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/entity/IndicatorEntity.java → src/main/java/com/ediagnosis/cdr/indicator/dao/entity/IndicatorEntity.java

-package com.ediagnosis.cdr.dataGovernance.indicator.dao.entity;
+package com.ediagnosis.cdr.indicator.dao.entity;
 
 
 import com.mybatisflex.annotation.Id;

src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/dao/mapper/IndicatorMapper.java → src/main/java/com/ediagnosis/cdr/indicator/dao/mapper/IndicatorMapper.java

-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;
 

src/main/java/com/ediagnosis/cdr/dashBoard/statistics/StatisticsController.java → src/main/java/com/ediagnosis/cdr/indicator/statistics/StatisticsController.java

-package com.ediagnosis.cdr.dashBoard.statistics;
+package com.ediagnosis.cdr.indicator.statistics;
 
 import org.springframework.web.bind.annotation.RestController;
 

src/main/java/com/ediagnosis/cdr/dashBoard/statistics/StatisticsService.java → src/main/java/com/ediagnosis/cdr/indicator/statistics/StatisticsService.java

-package com.ediagnosis.cdr.dashBoard.statistics;
+package com.ediagnosis.cdr.indicator.statistics;
 
 public interface StatisticsService {
 

src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractDataSourceCountService.java → src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/AbstractDataSourceCountService.java

-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 {
 

src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractRowCountService.java → src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/AbstractRowCountService.java

-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

src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/AbstractSourceBizTableCountService.java → src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/AbstractSourceBizTableCountService.java

-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 {
 

src/main/java/com/ediagnosis/cdr/dashBoard/statistics/impl/CacheableStatisticsService.java → src/main/java/com/ediagnosis/cdr/indicator/statistics/impl/CacheableStatisticsService.java

-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

src/main/java/com/ediagnosis/cdr/dataGovernance/indicator/value/Indicator.java → src/main/java/com/ediagnosis/cdr/indicator/value/Indicator.java

-package com.ediagnosis.cdr.dataGovernance.indicator.value;
+package com.ediagnosis.cdr.indicator.value;
 
 import java.time.LocalDateTime;
 

src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/DashBoardController.java → src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/DashBoardController.java

-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;

src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitor.java → src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/HostMonitor.java

-package com.ediagnosis.cdr.dashBoard.hostMonitor;
+package com.ediagnosis.cdr.maintenance.hostMonitor;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitorValue.java → src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/HostMonitorValue.java

-package com.ediagnosis.cdr.dashBoard.hostMonitor;
+package com.ediagnosis.cdr.maintenance.hostMonitor;
 
 public record HostMonitorValue(
         HostValue host,

src/main/java/com/ediagnosis/cdr/dashBoard/hostMonitor/HostMonitorValueRepository.java → src/main/java/com/ediagnosis/cdr/maintenance/hostMonitor/HostMonitorValueRepository.java

-package com.ediagnosis.cdr.dashBoard.hostMonitor;
+package com.ediagnosis.cdr.maintenance.hostMonitor;
 
 import org.springframework.stereotype.Component;
 

src/main/java/com/ediagnosis/cdr/package-info.java

+/**
+ * 分包原则：
+ *         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

src/main/resources/generator/mapper/BusinessDataSourceMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataSourceMapper">
-  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSource">
+<mapper namespace="com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataSourceMapper">
+  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSource">
     <!--@mbg.generated-->
     <!--@Table business_data_source-->
     <id column="id" jdbcType="BIGINT" property="id" />

src/main/resources/generator/mapper/BusinessDataSystemMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataSystemMapper">
-  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem">
+<mapper namespace="com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataSystemMapper">
+  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem">
     <!--@mbg.generated-->
     <!--@Table business_data_system-->
     <id column="id" jdbcType="BIGINT" property="id" />

src/main/resources/generator/mapper/BusinessDataTableFieldMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataTableFieldMapper">
-  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTableField">
+<mapper namespace="com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataTableFieldMapper">
+  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTableField">
     <!--@mbg.generated-->
     <!--@Table business_data_table_field-->
     <id column="id" jdbcType="BIGINT" property="id" />

src/main/resources/generator/mapper/BusinessDataTableMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataTableMapper">
-  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTable">
+<mapper namespace="com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataTableMapper">
+  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTable">
     <!--@mbg.generated-->
     <!--@Table business_data_table-->
     <id column="id" jdbcType="BIGINT" property="id" />

src/test/java/com/ediagnosis/cdr/dao/MapperTest.java

 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;

src/test/java/com/ediagnosis/cdr/demo/DemoTest.java

 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;