From 6a337c0205c0bc1a892232761ec7bfcf19488dcb Mon Sep 17 00:00:00 2001 From: yutao <3082046177@qq.com> Date: Mon, 4 Aug 2025 16:08:00 +0800 Subject: [PATCH] init --- .../BusinessDataSystemController.java | 2 +- .../BusinessDataTableFieldController.java | 2 +- .../cdr/dao/DimDataSummaryRepository.java | 4 +-- .../cdr/dataCollect/AbstractRunner.java | 10 ++++++ .../cdr/dataCollect/CollectService.java | 9 +++++ .../dataCollect/CollectSourceRepository.java | 24 +++++++++++++ .../dataCollect/DefautlCollectService.java | 9 +++++ .../cdr/dataCollect/ProxyCollectService.java | 4 +++ .../cdr/dataCollect/dao/BizSystemDao.java | 34 +++++++++++++++++++ .../dao/entity/BusinessDataSource.java | 2 +- .../dao/entity/BusinessDataSystem.java | 2 +- .../dao/entity/BusinessDataTable.java | 2 +- .../dao/entity/BusinessDataTableField.java | 2 +- .../dao/entity/DimDataSummaryEntity.java | 2 +- .../dao/mapper/BusinessDataSourceMapper.java | 4 +-- .../dao/mapper/BusinessDataSystemMapper.java | 4 +-- .../mapper/BusinessDataTableFieldMapper.java | 4 +-- .../dao/mapper/BusinessDataTableMapper.java | 4 +-- .../dao/mapper/DimDataSummaryMapper.java | 4 +-- .../endpoint/CollectSourceController.java | 4 +++ .../dataCollect/endpoint/DataCollectApi.java | 4 +++ .../service/BusinessDataSystemService.java | 2 +- .../BusinessDataTableFieldService.java | 2 +- .../impl/BusinessDataSourceServiceImpl.java | 6 ++-- .../impl/BusinessDataSystemServiceImpl.java | 4 +-- .../BusinessDataTableFieldServiceImpl.java | 4 +-- .../impl/BusinessDataTableServiceImpl.java | 8 ++--- .../mapper/BusinessDataSourceMapper.xml | 4 +-- .../mapper/BusinessDataSystemMapper.xml | 4 +-- .../mapper/BusinessDataTableFieldMapper.xml | 4 +-- .../mapper/BusinessDataTableMapper.xml | 4 +-- .../generator/mapper/DimDataSummaryMapper.xml | 4 +-- .../com/ediagnosis/cdr/dao/MapperTest.java | 6 ++-- .../com/ediagnosis/cdr/demo/DemoTest.java | 2 +- 34 files changed, 144 insertions(+), 46 deletions(-) create mode 100644 src/main/java/com/ediagnosis/cdr/dataCollect/AbstractRunner.java create mode 100644 src/main/java/com/ediagnosis/cdr/dataCollect/CollectService.java create mode 100644 src/main/java/com/ediagnosis/cdr/dataCollect/CollectSourceRepository.java create mode 100644 src/main/java/com/ediagnosis/cdr/dataCollect/DefautlCollectService.java create mode 100644 src/main/java/com/ediagnosis/cdr/dataCollect/ProxyCollectService.java create mode 100644 src/main/java/com/ediagnosis/cdr/dataCollect/dao/BizSystemDao.java rename src/main/java/com/ediagnosis/cdr/{ => dataCollect}/dao/entity/BusinessDataSource.java (97%) rename src/main/java/com/ediagnosis/cdr/{ => dataCollect}/dao/entity/BusinessDataSystem.java (95%) rename src/main/java/com/ediagnosis/cdr/{ => dataCollect}/dao/entity/BusinessDataTable.java (96%) rename src/main/java/com/ediagnosis/cdr/{ => dataCollect}/dao/entity/BusinessDataTableField.java (96%) rename src/main/java/com/ediagnosis/cdr/{ => dataCollect}/dao/entity/DimDataSummaryEntity.java (96%) rename src/main/java/com/ediagnosis/cdr/{ => dataCollect}/dao/mapper/BusinessDataSourceMapper.java (85%) rename src/main/java/com/ediagnosis/cdr/{ => dataCollect}/dao/mapper/BusinessDataSystemMapper.java (77%) rename src/main/java/com/ediagnosis/cdr/{ => dataCollect}/dao/mapper/BusinessDataTableFieldMapper.java (77%) rename src/main/java/com/ediagnosis/cdr/{ => dataCollect}/dao/mapper/BusinessDataTableMapper.java (77%) rename src/main/java/com/ediagnosis/cdr/{ => dataCollect}/dao/mapper/DimDataSummaryMapper.java (61%) create mode 100644 src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/CollectSourceController.java create mode 100644 src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/DataCollectApi.java diff --git a/src/main/java/com/ediagnosis/cdr/controller/BusinessDataSystemController.java b/src/main/java/com/ediagnosis/cdr/controller/BusinessDataSystemController.java index 7783d83..382ffb0 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 56a6f8b..d27a5ac 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 64a0c4e..252c45a 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 0000000..e864566 --- /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 0000000..e353d46 --- /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 0000000..1322ef2 --- /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 0000000..f7c8d98 --- /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 0000000..e078663 --- /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 0000000..42f11db --- /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 2c3ed86..079b30a 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 a4bfd46..347edb0 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 e328d36..36662d5 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 8481f4d..4a69d73 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 735f222..19ee3d3 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 34ecda8..3aa4d2a 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 f655526..210c9b3 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 5c7ed18..0ee2843 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 b54c1ca..41a4d3f 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 4d8fb3d..5f13de3 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 0000000..44578d1 --- /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 0000000..4442a0a --- /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 a9c2b2c..700acd0 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 2d6bc61..5fabef2 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 8faefe6..a8abc63 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 67091b8..a21ad77 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 ab39865..821059e 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 b1a2265..e48738a 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 c30bc88..1c67b68 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 2bed50f..a605d18 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 9951e2c..db6c4df 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 df36447..7685dc7 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 d16ef85..f09776f 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 6d75e21..8f26a7b 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 dc708ce..4417367 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; -- 2.18.1