diff --git a/src/main/java/com/ediagnosis/cdr/controller/BusinessDataSystemController.java b/src/main/java/com/ediagnosis/cdr/controller/BusinessDataSystemController.java index 7783d839c9c17308e89e1c125dc85465362740b3..382ffb0888b3ed38fd95fbb7c445438762e94f2e 100644 --- a/src/main/java/com/ediagnosis/cdr/controller/BusinessDataSystemController.java +++ b/src/main/java/com/ediagnosis/cdr/controller/BusinessDataSystemController.java @@ -1,6 +1,6 @@ package com.ediagnosis.cdr.controller; -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; import com.ediagnosis.cdr.model.dto.BusinessDataSystemQueryDTO; import com.ediagnosis.cdr.model.param.BusinessDataSystemQueryParam; import com.ediagnosis.cdr.model.vo.BusinessDataSystemVo; diff --git a/src/main/java/com/ediagnosis/cdr/controller/BusinessDataTableFieldController.java b/src/main/java/com/ediagnosis/cdr/controller/BusinessDataTableFieldController.java index 56a6f8b690a609e5df48fec7d8d6e60b41f33df5..d27a5ac1bb12c9ddab04f963f6c957a26efc034c 100644 --- a/src/main/java/com/ediagnosis/cdr/controller/BusinessDataTableFieldController.java +++ b/src/main/java/com/ediagnosis/cdr/controller/BusinessDataTableFieldController.java @@ -1,6 +1,6 @@ package com.ediagnosis.cdr.controller; -import com.ediagnosis.cdr.dao.entity.BusinessDataTableField; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTableField; import com.ediagnosis.cdr.model.dto.BusinessDataTableFieldQueryDTO; import com.ediagnosis.cdr.model.param.BusinessDataTableFieldQueryParam; import com.ediagnosis.cdr.model.vo.BusinessDataTableFieldVo; diff --git a/src/main/java/com/ediagnosis/cdr/dao/DimDataSummaryRepository.java b/src/main/java/com/ediagnosis/cdr/dao/DimDataSummaryRepository.java index 64a0c4e134b8696a99b245ba1dda663fafe21618..252c45a0d6267c7efc441d9f8c425f5f3a2a3bd4 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/DimDataSummaryRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dao/DimDataSummaryRepository.java @@ -1,7 +1,7 @@ package com.ediagnosis.cdr.dao; -import com.ediagnosis.cdr.dao.entity.DimDataSummaryEntity; -import com.ediagnosis.cdr.dao.mapper.DimDataSummaryMapper; +import com.ediagnosis.cdr.dataCollect.dao.entity.DimDataSummaryEntity; +import com.ediagnosis.cdr.dataCollect.dao.mapper.DimDataSummaryMapper; import com.ediagnosis.cdr.domain.DimDataSummary; import com.ediagnosis.cdr.context.TimeUtil; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/AbstractRunner.java b/src/main/java/com/ediagnosis/cdr/dataCollect/AbstractRunner.java new file mode 100644 index 0000000000000000000000000000000000000000..e864566d7cc9d0e227a06536dd5d17f6d939e8a4 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/AbstractRunner.java @@ -0,0 +1,10 @@ +package com.ediagnosis.cdr.dataCollect; + +public abstract class AbstractRunner implements CollectService{ + @Override + public void run() { + + } + + +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/CollectService.java b/src/main/java/com/ediagnosis/cdr/dataCollect/CollectService.java new file mode 100644 index 0000000000000000000000000000000000000000..e353d46d524990829c6a99a48ca207cf515a172d --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/CollectService.java @@ -0,0 +1,9 @@ +package com.ediagnosis.cdr.dataCollect; +//todo: 待完善的业务行为 +public interface CollectService { + + + void run(); + + Object call(); +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/CollectSourceRepository.java b/src/main/java/com/ediagnosis/cdr/dataCollect/CollectSourceRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..1322ef2b90b5ab9e370536f2774849efbcd8042a --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/CollectSourceRepository.java @@ -0,0 +1,24 @@ +package com.ediagnosis.cdr.dataCollect; + +import com.ediagnosis.cdr.dataCollect.dao.BizSystemDao; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.model.dto.BusinessDataSystemQueryDTO; +import com.ediagnosis.cdr.value.PageVo; +import org.springframework.stereotype.Component; + +@Component +public class CollectSourceRepository { + + private final BizSystemDao bizSystemDao; + + + public CollectSourceRepository(BizSystemDao bizSystemDao) { + this.bizSystemDao = bizSystemDao; + } + +// todo:增加缓存、验证等业务领域的行为 + public PageVo queryPage(BusinessDataSystemQueryDTO queryDTO) { +// return bizSystemDao.queryPage(queryDTO); + return null; + } +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/DefautlCollectService.java b/src/main/java/com/ediagnosis/cdr/dataCollect/DefautlCollectService.java new file mode 100644 index 0000000000000000000000000000000000000000..f7c8d98245a1365b34c461a63061d683c877a000 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/DefautlCollectService.java @@ -0,0 +1,9 @@ +package com.ediagnosis.cdr.dataCollect; + +public class DefautlCollectService extends AbstractRunner implements CollectService { + + @Override + public Object call() { + return null; + } +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/ProxyCollectService.java b/src/main/java/com/ediagnosis/cdr/dataCollect/ProxyCollectService.java new file mode 100644 index 0000000000000000000000000000000000000000..e078663fb377a91514437003f60a25bfd84fb275 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/ProxyCollectService.java @@ -0,0 +1,4 @@ +package com.ediagnosis.cdr.dataCollect; + +public class ProxyCollectService extends DefautlCollectService{ +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/BizSystemDao.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/BizSystemDao.java new file mode 100644 index 0000000000000000000000000000000000000000..42f11dbb9ac2841252d182479734cbbe1ad8b38e --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/BizSystemDao.java @@ -0,0 +1,34 @@ +package com.ediagnosis.cdr.dataCollect.dao; + +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataSystemMapper; +import com.ediagnosis.cdr.model.dto.BusinessDataSystemDTO; +import com.ediagnosis.cdr.model.dto.BusinessDataSystemQueryDTO; +import com.mybatisflex.core.paginate.Page; +import com.mybatisflex.core.query.QueryWrapper; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +import java.util.Date; +@Component +public class BizSystemDao { + + private final BusinessDataSystemMapper dataSystemMapper; + + public BizSystemDao(BusinessDataSystemMapper dataSystemMapper) { + this.dataSystemMapper = dataSystemMapper; + } + + +// todo: 将page转换为pageVo,实体对象转换为业务对象 + + public Page queryPage(BusinessDataSystemQueryDTO queryDTO) { + QueryWrapper queryWrapper = QueryWrapper.create(); + if (StringUtils.hasText(queryDTO.getName())) { + queryWrapper.like(BusinessDataSystem::getName, queryDTO.getName()); + } + queryWrapper.orderBy(BusinessDataSystem::getId, false); + return dataSystemMapper.paginate(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper); + } +} diff --git a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataSource.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSource.java similarity index 97% rename from src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataSource.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSource.java index 2c3ed86f6c7c18412905cbeacf778847f8560d37..079b30ad60f81b0d2777bf5eb54155a628d5fbd6 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataSource.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSource.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dao.entity; +package com.ediagnosis.cdr.dataCollect.dao.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; diff --git a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataSystem.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSystem.java similarity index 95% rename from src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataSystem.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSystem.java index a4bfd46d0cdb3f6326effd746ee60ce35be9478d..347edb0b7c2f07c65aa94f8b65f4824df03ec91d 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataSystem.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSystem.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dao.entity; +package com.ediagnosis.cdr.dataCollect.dao.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; diff --git a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataTable.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTable.java similarity index 96% rename from src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataTable.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTable.java index e328d36ed4c19f2651de9cdc6b44a66f42c7f0f7..36662d5de83057edd8782b51db704078f3fecf02 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataTable.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTable.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dao.entity; +package com.ediagnosis.cdr.dataCollect.dao.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; diff --git a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataTableField.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTableField.java similarity index 96% rename from src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataTableField.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTableField.java index 8481f4d1d614b16e58d3a14ff14c134c60c331f3..4a69d733ae6daf7d8ae89b24b153040fc88788ed 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataTableField.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTableField.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dao.entity; +package com.ediagnosis.cdr.dataCollect.dao.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; diff --git a/src/main/java/com/ediagnosis/cdr/dao/entity/DimDataSummaryEntity.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/DimDataSummaryEntity.java similarity index 96% rename from src/main/java/com/ediagnosis/cdr/dao/entity/DimDataSummaryEntity.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/DimDataSummaryEntity.java index 735f2222c763b3534876761526d9f74ade53b002..19ee3d3e4b3544f20573bfcff37692d4c04ffdae 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/entity/DimDataSummaryEntity.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/DimDataSummaryEntity.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dao.entity; +package com.ediagnosis.cdr.dataCollect.dao.entity; import com.mybatisflex.annotation.Id; diff --git a/src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataSourceMapper.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSourceMapper.java similarity index 85% rename from src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataSourceMapper.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSourceMapper.java index 34ecda879075cacd633c7508ca0870611e8429b3..3aa4d2adfd119b6037e290aa882b5263fab2fe74 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataSourceMapper.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSourceMapper.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dao.mapper; +package com.ediagnosis.cdr.dataCollect.dao.mapper; -import com.ediagnosis.cdr.dao.entity.BusinessDataSource; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSource; import com.ediagnosis.cdr.model.dto.BusinessDataSourceDTO; import com.ediagnosis.cdr.model.dto.BusinessDataSourceQueryDTO; import com.mybatisflex.core.BaseMapper; diff --git a/src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataSystemMapper.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSystemMapper.java similarity index 77% rename from src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataSystemMapper.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSystemMapper.java index f655526baf094edcadb9f821746448a25f9a0989..210c9b37ae041080c4cf8642be39e567e619307e 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataSystemMapper.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSystemMapper.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dao.mapper; +package com.ediagnosis.cdr.dataCollect.dao.mapper; -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; import java.util.List; diff --git a/src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataTableFieldMapper.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableFieldMapper.java similarity index 77% rename from src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataTableFieldMapper.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableFieldMapper.java index 5c7ed18fe523f48c5a94eba971ca0e53aaccb09f..0ee28438a9e61eafd5344058916824dcb2866ef1 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataTableFieldMapper.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableFieldMapper.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dao.mapper; +package com.ediagnosis.cdr.dataCollect.dao.mapper; -import com.ediagnosis.cdr.dao.entity.BusinessDataTableField; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTableField; import java.util.List; diff --git a/src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataTableMapper.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableMapper.java similarity index 77% rename from src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataTableMapper.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableMapper.java index b54c1ca4d9e870494c4023f6240069d7e4906d46..41a4d3feaa9fb4f606376027d43074420f98c520 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataTableMapper.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableMapper.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dao.mapper; +package com.ediagnosis.cdr.dataCollect.dao.mapper; -import com.ediagnosis.cdr.dao.entity.BusinessDataTable; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTable; import java.util.List; import com.mybatisflex.core.BaseMapper; diff --git a/src/main/java/com/ediagnosis/cdr/dao/mapper/DimDataSummaryMapper.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/DimDataSummaryMapper.java similarity index 61% rename from src/main/java/com/ediagnosis/cdr/dao/mapper/DimDataSummaryMapper.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/DimDataSummaryMapper.java index 4d8fb3d8c4f62026c725e0d2cebdf53c6e149240..5f13de3ceb827c8ee427d52e4c26f52b2f8644de 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/mapper/DimDataSummaryMapper.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/DimDataSummaryMapper.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.dao.mapper; +package com.ediagnosis.cdr.dataCollect.dao.mapper; -import com.ediagnosis.cdr.dao.entity.DimDataSummaryEntity; +import com.ediagnosis.cdr.dataCollect.dao.entity.DimDataSummaryEntity; import com.mybatisflex.core.BaseMapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/CollectSourceController.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/CollectSourceController.java new file mode 100644 index 0000000000000000000000000000000000000000..44578d16ffb1cb979507daa03942f0a90b574712 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/CollectSourceController.java @@ -0,0 +1,4 @@ +package com.ediagnosis.cdr.dataCollect.endpoint; + +public class CollectSourceController { +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/DataCollectApi.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/DataCollectApi.java new file mode 100644 index 0000000000000000000000000000000000000000..4442a0afe24a80b65f3120748b478e142fc9100c --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/DataCollectApi.java @@ -0,0 +1,4 @@ +package com.ediagnosis.cdr.dataCollect.endpoint; +//todo: 可能存在的rpc接口 +public interface DataCollectApi { +} diff --git a/src/main/java/com/ediagnosis/cdr/service/BusinessDataSystemService.java b/src/main/java/com/ediagnosis/cdr/service/BusinessDataSystemService.java index a9c2b2c7308e58796d513aa0ed07211a6d9738ad..700acd0f625a8a8d19228f3e8873f408ccf0c2fc 100644 --- a/src/main/java/com/ediagnosis/cdr/service/BusinessDataSystemService.java +++ b/src/main/java/com/ediagnosis/cdr/service/BusinessDataSystemService.java @@ -1,6 +1,6 @@ package com.ediagnosis.cdr.service; -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; import com.ediagnosis.cdr.model.dto.BusinessDataSystemDTO; import com.ediagnosis.cdr.model.dto.BusinessDataSystemQueryDTO; import com.mybatisflex.core.paginate.Page; diff --git a/src/main/java/com/ediagnosis/cdr/service/BusinessDataTableFieldService.java b/src/main/java/com/ediagnosis/cdr/service/BusinessDataTableFieldService.java index 2d6bc619506d4079990a50e3e4fde3437971b0f2..5fabef2ebd57ffa755855fd5992edcddb7b14b61 100644 --- a/src/main/java/com/ediagnosis/cdr/service/BusinessDataTableFieldService.java +++ b/src/main/java/com/ediagnosis/cdr/service/BusinessDataTableFieldService.java @@ -1,6 +1,6 @@ package com.ediagnosis.cdr.service; -import com.ediagnosis.cdr.dao.entity.BusinessDataTableField; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTableField; import com.ediagnosis.cdr.model.dto.BusinessDataTableFieldQueryDTO; import com.mybatisflex.core.paginate.Page; diff --git a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSourceServiceImpl.java b/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSourceServiceImpl.java index 8faefe6cf18f5dbbefef0bd45d207a3ccdcacb40..a8abc63b1050d9c23460972635bd4534e3750542 100644 --- a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSourceServiceImpl.java +++ b/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSourceServiceImpl.java @@ -1,8 +1,8 @@ package com.ediagnosis.cdr.service.impl; -import com.ediagnosis.cdr.dao.entity.BusinessDataSource; -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dao.mapper.BusinessDataSourceMapper; +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.model.dto.BusinessDataSourceDTO; import com.ediagnosis.cdr.model.dto.BusinessDataSourceQueryDTO; import com.ediagnosis.cdr.service.BusinessDataSourceService; diff --git a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSystemServiceImpl.java b/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSystemServiceImpl.java index 67091b8aa1bf67cb4b6abccdb005aca6140eacc9..a21ad779643289dc0f1b92fc350104f1c5bce698 100644 --- a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSystemServiceImpl.java +++ b/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSystemServiceImpl.java @@ -1,7 +1,7 @@ package com.ediagnosis.cdr.service.impl; -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dao.mapper.BusinessDataSystemMapper; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataSystemMapper; import com.ediagnosis.cdr.model.dto.BusinessDataSystemDTO; import com.ediagnosis.cdr.model.dto.BusinessDataSystemQueryDTO; import com.ediagnosis.cdr.service.BusinessDataSystemService; diff --git a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableFieldServiceImpl.java b/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableFieldServiceImpl.java index ab398652aed6a3dd5aa68ccbcb58c1d1c5fd8f5f..821059e938e9637feb2a212c820dc0e58ed2c425 100644 --- a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableFieldServiceImpl.java +++ b/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableFieldServiceImpl.java @@ -1,7 +1,7 @@ package com.ediagnosis.cdr.service.impl; -import com.ediagnosis.cdr.dao.entity.BusinessDataTableField; -import com.ediagnosis.cdr.dao.mapper.BusinessDataTableFieldMapper; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTableField; +import com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataTableFieldMapper; import com.ediagnosis.cdr.model.dto.BusinessDataTableFieldQueryDTO; import com.ediagnosis.cdr.service.BusinessDataTableFieldService; import com.mybatisflex.core.paginate.Page; diff --git a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableServiceImpl.java b/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableServiceImpl.java index b1a2265092bc3a43edd3213abc97c6934002092f..e48738a8406d16f08ef8f6178efb2221304bba56 100644 --- a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableServiceImpl.java +++ b/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableServiceImpl.java @@ -1,9 +1,9 @@ package com.ediagnosis.cdr.service.impl; -import com.ediagnosis.cdr.dao.entity.BusinessDataSource; -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dao.entity.BusinessDataTable; -import com.ediagnosis.cdr.dao.mapper.BusinessDataTableMapper; +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.mapper.BusinessDataTableMapper; import com.ediagnosis.cdr.model.dto.BusinessDataTableDTO; import com.ediagnosis.cdr.model.dto.BusinessDataTableQueryDTO; import com.ediagnosis.cdr.service.BusinessDataTableService; diff --git a/src/main/resources/generator/mapper/BusinessDataSourceMapper.xml b/src/main/resources/generator/mapper/BusinessDataSourceMapper.xml index c30bc88942398ceb0079ee8f6574d5d19eec8af3..1c67b68688d33e6983913404e6ce6eff30eec68f 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 2bed50f2e1c1e11a4d3982da21b8cdb55cf4c248..a605d18d7323d870ab0479d534d4910f4e5fddcc 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 9951e2c504c7a71f77a8d2401a559b2a9894854a..db6c4dfc574ee67e735d900a89cf620fabbce50f 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 df36447a0a4d9e309f37fd902b3b4aeabe5c0600..7685dc7032eb22361618ab55b271ffd70e822f27 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/main/resources/generator/mapper/DimDataSummaryMapper.xml b/src/main/resources/generator/mapper/DimDataSummaryMapper.xml index d16ef85ba3f6355c9ee83e0d4abd176497febf5d..f09776f104dcf3a5c899eb34addf4d6ff590a2bf 100644 --- a/src/main/resources/generator/mapper/DimDataSummaryMapper.xml +++ b/src/main/resources/generator/mapper/DimDataSummaryMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java b/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java index 6d75e213379d1293c15c4f55d5da62ec71d1f4ec..8f26a7becb9ec9455609688b972020ead81ef54b 100644 --- a/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java +++ b/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java @@ -2,9 +2,9 @@ package com.ediagnosis.cdr.dao; import com.alibaba.fastjson.JSON; import com.ediagnosis.cdr.CdrApplication; -import com.ediagnosis.cdr.dao.entity.BusinessDataSource; -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dao.mapper.BusinessDataSourceMapper; +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.model.dto.BusinessDataSourceDTO; import com.ediagnosis.cdr.model.dto.BusinessDataSourceQueryDTO; import com.mybatisflex.core.paginate.Page; diff --git a/src/test/java/com/ediagnosis/cdr/demo/DemoTest.java b/src/test/java/com/ediagnosis/cdr/demo/DemoTest.java index dc708ce2a4f79980f9388feb90679b662ade4d0b..441736780533d4eaa0ddaf67afdc26078a687503 100644 --- a/src/test/java/com/ediagnosis/cdr/demo/DemoTest.java +++ b/src/test/java/com/ediagnosis/cdr/demo/DemoTest.java @@ -2,7 +2,7 @@ package com.ediagnosis.cdr.demo; import com.alibaba.fastjson.JSON; import com.ediagnosis.cdr.CdrApplication; -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; import com.ediagnosis.cdr.model.dto.BusinessDataSystemDTO; import com.ediagnosis.cdr.model.dto.BusinessDataSystemQueryDTO; import com.ediagnosis.cdr.model.dto.BusinessDataTableDTO;