统计库到指标值表，代码迁移到dataToIndex包下

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -28,13 +28,13 @@ import com.epmet.entity.stats.DimCustomerEntity;
 import com.epmet.entity.stats.DimDateEntity;
 import com.epmet.entity.stats.DimMonthEntity;
 import com.epmet.service.StatsDemoService;
-import com.epmet.service.evaluationindex.extract.CalCpcIndexService;
-import com.epmet.service.evaluationindex.extract.CalGridIndexService;
 import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService;
 import com.epmet.service.evaluationindex.extract.FactOriginTopicMainDailyService;
+import com.epmet.service.evaluationindex.extract.dataToIndex.CalCpcIndexService;
+import com.epmet.service.evaluationindex.extract.dataToIndex.CalGridIndexService;
+import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollCommunityService;
+import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollStreetService;
 import com.epmet.service.evaluationindex.indexcal.*;
-import com.epmet.service.evaluationindex.indexcoll.IndexCollCommunityService;
-import com.epmet.service.evaluationindex.indexcoll.IndexCollStreetService;
 import com.epmet.service.stats.DimAgencyService;
 import com.epmet.service.stats.DimCustomerPartymemberService;
 import lombok.extern.slf4j.Slf4j;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/CalCpcIndexService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/CalCpcIndexService.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.dataToIndex;
 
 /**
  * 党员相关

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/CalGridIndexService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/CalGridIndexService.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.dataToIndex;
 
 /**
  * @Author zxc

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/IndexCollCommunityService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/IndexCollCommunityService.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.indexcoll;
+package com.epmet.service.evaluationindex.extract.dataToIndex;
 
 /**
  * 社区相关统计

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/IndexCollDistrictDepartmentService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/IndexCollDistrictDepartmentService.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.indexcoll;
+package com.epmet.service.evaluationindex.extract.dataToIndex;
 
 /**
  * 区直部门相关统计

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/IndexCollDistrictService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/IndexCollDistrictService.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.indexcoll;
+package com.epmet.service.evaluationindex.extract.dataToIndex;
 
 /**
  * 全区相关统计

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/IndexCollStreetService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/IndexCollStreetService.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.indexcoll;
+package com.epmet.service.evaluationindex.extract.dataToIndex;
 
 /**
  * 街道相关统计

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalCpcIndexServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java

@@ -1,10 +1,11 @@
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.dataToIndex.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.IndexCalConstant;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityCpcMonthlyEntity;
 import com.epmet.service.evaluationindex.extract.*;
+import com.epmet.service.evaluationindex.extract.dataToIndex.CalCpcIndexService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityCpcMonthlyService;
 import com.epmet.service.stats.DimCustomerPartymemberService;
 import lombok.extern.slf4j.Slf4j;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.dataToIndex.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -15,6 +15,7 @@ import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
 import com.epmet.dto.extract.result.*;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity;
 import com.epmet.service.evaluationindex.extract.*;
+import com.epmet.service.evaluationindex.extract.dataToIndex.CalGridIndexService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyService;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/IndexCollCommunityServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollCommunityServiceImpl.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.indexcoll.impl;
+package com.epmet.service.evaluationindex.extract.dataToIndex.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -11,9 +11,9 @@ import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthly
 import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService;
 import com.epmet.service.evaluationindex.extract.FactOriginProjectMainDailyService;
 import com.epmet.service.evaluationindex.extract.FactOriginProjectOrgPeriodDailyService;
+import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollCommunityService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService;
-import com.epmet.service.evaluationindex.indexcoll.IndexCollCommunityService;
 import com.epmet.service.stats.DimAgencyService;
 import com.epmet.service.stats.FactArticlePublishedAgencyDailyService;
 import com.epmet.util.DimIdGenerator;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/IndexCollDistrictDepartmentServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollDistrictDepartmentServiceImpl.java

@@ -1,9 +1,7 @@
-package com.epmet.service.evaluationindex.indexcoll.impl;
+package com.epmet.service.evaluationindex.extract.dataToIndex.impl;
 
-import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginProjectOrgPeriodDailyDao;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
@@ -11,9 +9,9 @@ import com.epmet.dto.stats.DimDepartmentDTO;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityDeptMonthlyEntity;
 import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService;
 import com.epmet.service.evaluationindex.extract.FactOriginProjectMainDailyService;
+import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollDistrictDepartmentService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityDeptMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService;
-import com.epmet.service.evaluationindex.indexcoll.IndexCollDistrictDepartmentService;
 import com.epmet.service.stats.DimDepartmentService;
 import com.epmet.service.stats.FactArticlePublishedDepartmentDailyService;
 import com.epmet.util.DimIdGenerator;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/IndexCollDistrictServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollDistrictServiceImpl.java

@@ -1,8 +1,8 @@
-package com.epmet.service.evaluationindex.indexcoll.impl;
+package com.epmet.service.evaluationindex.extract.dataToIndex.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.service.evaluationindex.indexcoll.IndexCollDistrictService;
+import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollDistrictService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/IndexCollStreetServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollStreetServiceImpl.java

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.indexcoll.impl;
+package com.epmet.service.evaluationindex.extract.dataToIndex.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -11,9 +11,9 @@ import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthly
 import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService;
 import com.epmet.service.evaluationindex.extract.FactOriginProjectMainDailyService;
 import com.epmet.service.evaluationindex.extract.FactOriginProjectOrgPeriodDailyService;
+import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollStreetService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService;
-import com.epmet.service.evaluationindex.indexcoll.IndexCollStreetService;
 import com.epmet.service.stats.DimAgencyService;
 import com.epmet.service.stats.FactArticlePublishedAgencyDailyService;
 import com.epmet.util.DimIdGenerator;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java

@@ -4,11 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dto.extract.form.ExtractIndexFormDTO;
-import com.epmet.service.evaluationindex.extract.CalCpcIndexService;
+import com.epmet.service.evaluationindex.extract.dataToIndex.*;
-import com.epmet.service.evaluationindex.extract.CalGridIndexService;
-import com.epmet.service.evaluationindex.extract.dataToIndex.IndexOriginExtractService;
-import com.epmet.service.evaluationindex.indexcoll.IndexCollCommunityService;
-import com.epmet.service.evaluationindex.indexcoll.IndexCollStreetService;
 import com.epmet.service.stats.DimCustomerService;
 import com.epmet.util.DimIdGenerator;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;