init

src/main/java/com/ediagnosis/cdr/controller/BusinessDataSystemController.java

 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;

src/main/java/com/ediagnosis/cdr/controller/BusinessDataTableFieldController.java

 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;

src/main/java/com/ediagnosis/cdr/dao/DimDataSummaryRepository.java

 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;

src/main/java/com/ediagnosis/cdr/dataCollect/AbstractRunner.java

+package com.ediagnosis.cdr.dataCollect;
+
+public  abstract class AbstractRunner implements CollectService{
+    @Override
+    public void run() {
+
+    }
+
+
+}

src/main/java/com/ediagnosis/cdr/dataCollect/CollectService.java

+package com.ediagnosis.cdr.dataCollect;
+//todo: 待完善的业务行为
+public interface CollectService {
+
+
+    void run();
+
+    Object call();
+}

src/main/java/com/ediagnosis/cdr/dataCollect/CollectSourceRepository.java

+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<BusinessDataSystem> queryPage(BusinessDataSystemQueryDTO queryDTO) {
+//        return bizSystemDao.queryPage(queryDTO);
+        return null;
+    }
+}

src/main/java/com/ediagnosis/cdr/dataCollect/DefautlCollectService.java

+package com.ediagnosis.cdr.dataCollect;
+
+public class DefautlCollectService extends AbstractRunner implements CollectService {
+
+    @Override
+    public Object call() {
+        return null;
+    }
+}

src/main/java/com/ediagnosis/cdr/dataCollect/ProxyCollectService.java

+package com.ediagnosis.cdr.dataCollect;
+
+public class ProxyCollectService extends DefautlCollectService{
+}

src/main/java/com/ediagnosis/cdr/dataCollect/dao/BizSystemDao.java

+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<BusinessDataSystem> 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);
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/CollectSourceController.java

+package com.ediagnosis.cdr.dataCollect.endpoint;
+
+public class CollectSourceController {
+}

src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/DataCollectApi.java

+package com.ediagnosis.cdr.dataCollect.endpoint;
+//todo: 可能存在的rpc接口
+public interface DataCollectApi {
+}

src/main/java/com/ediagnosis/cdr/service/BusinessDataSystemService.java

 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;

src/main/java/com/ediagnosis/cdr/service/BusinessDataTableFieldService.java

 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;
 

src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSourceServiceImpl.java

 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;

src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSystemServiceImpl.java

 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;

src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableFieldServiceImpl.java

 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;

src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableServiceImpl.java

 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;

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.dao.mapper.BusinessDataSourceMapper">
-  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dao.entity.BusinessDataSource">
+<mapper namespace="com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataSourceMapper">
+  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataCollect.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.dao.mapper.BusinessDataSystemMapper">
-  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dao.entity.BusinessDataSystem">
+<mapper namespace="com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataSystemMapper">
+  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataCollect.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.dao.mapper.BusinessDataTableFieldMapper">
-  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dao.entity.BusinessDataTableField">
+<mapper namespace="com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataTableFieldMapper">
+  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataCollect.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.dao.mapper.BusinessDataTableMapper">
-  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dao.entity.BusinessDataTable">
+<mapper namespace="com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataTableMapper">
+  <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTable">
     <!--@mbg.generated-->
     <!--@Table business_data_table-->
     <id column="id" jdbcType="BIGINT" property="id" />

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

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ediagnosis.cdr.dao.mapper.DimDataSummaryMapper">
+<mapper namespace="com.ediagnosis.cdr.dataCollect.dao.mapper.DimDataSummaryMapper">
 
-    <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dao.entity.DimDataSummaryEntity">
+    <resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataCollect.dao.entity.DimDataSummaryEntity">
             <id property="id" column="id" />
             <result property="name" column="name" />
             <result property="code" column="code" />

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;

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;