Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java

@@ -8,8 +8,10 @@
 
 package com.epmet.commons.tools.feign;
 
+import feign.Logger;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -18,6 +20,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Enumeration;
 
+
 /**
  * Feign调用，携带header
  *
@@ -47,4 +50,9 @@ public class FeignConfig implements RequestInterceptor {
         }
 
     }
+
+    @Bean
+    Logger.Level feignLoggerLevel() {
+        return Logger.Level.FULL;//控制台会输出debug日志
+    }
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java

@@ -19,6 +19,7 @@ import org.joda.time.format.DateTimeFormatter;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.ZoneId;
 import java.util.*;
 
 /**
@@ -595,6 +596,12 @@ public class DateUtils {
         return StrConstant.EPMETY_STR;
     }
 
+    /**
+     * @Description  根据dateId获取时间集合
+     * @param dateId
+     * @author zxc
+     * @date 2020/9/22 9:06 上午
+     */
     public static TimeListResultDTO getTimeList(String dateId){
         TimeListResultDTO result = new TimeListResultDTO();
         result.setDateId(dateId);
@@ -613,4 +620,24 @@ public class DateUtils {
         }
         return result;
     }
+
+    /**
+     * @Description  根据monthId【yyyyMM】获取上一个月份ID
+     * @param monthId
+     * @author zxc
+     * @date 2020/9/21 2:43 下午
+     */
+    public static String minusMonthId(String monthId){
+        String minusMonthId = null;
+        SimpleDateFormat sft = new SimpleDateFormat("yyyyMM");
+        try {
+            Date parse = sft.parse(monthId);
+            java.time.LocalDate birth = parse.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+            java.time.LocalDate localDate = birth.minusMonths(NumConstant.ONE);
+            minusMonthId = localDate.toString().substring(NumConstant.ZERO, NumConstant.FOUR).concat(localDate.toString().substring(NumConstant.FIVE, NumConstant.SEVEN));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return minusMonthId;
+    }
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/ExtractConstant.java

@@ -32,4 +32,6 @@ public interface ExtractConstant {
 
     String EVALUATE_PERFECT = "perfect";
 
+    String CUSTOMER_INFO_NULL = "客户【%s】未查出网格信息";
+
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java

@@ -193,7 +193,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      */
     @Override
     public Result factOriginExtractAll(ExtractFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "extractAll", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "factOriginExtractAll", formDTO);
     }
 
     /**
@@ -205,6 +205,6 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      */
     @Override
     public Result indexOriginExtractAll(ExtractIndexFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "extractAll", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "indexOriginExtractAll", formDTO);
     }
 }

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.extract.todata.FactOriginProjectLogDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
 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/controller/FactOriginExtractController.java

@@ -4,8 +4,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.extract.form.ExtractFormDTO;
-import com.epmet.service.evaluationindex.extract.*;
-import com.epmet.util.DimIdGenerator;
+import com.epmet.service.evaluationindex.extract.todata.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -13,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -45,14 +44,12 @@ public class FactOriginExtractController {
     @PostMapping("extractall")
     public Result extractAll(@RequestBody ExtractFormDTO extractFormDTO) {
         if (StringUtils.isNotBlank(extractFormDTO.getStartDate()) && StringUtils.isNotBlank(extractFormDTO.getEndDate())) {
-            Date startDate = DateUtils.stringToDate(extractFormDTO.getStartDate(), "yyyyMMdd");
-            Date endDate = DateUtils.stringToDate(extractFormDTO.getEndDate(), "yyyyMMdd");
-            do {
-                String dateDimId = DimIdGenerator.getDateDimId(startDate);
+            List<String> daysBetween = DateUtils.getDaysBetween(extractFormDTO.getStartDate(), extractFormDTO.getEndDate());
+            for (int i = 0; i < daysBetween.size(); i++) {
+                String dateDimId = daysBetween.get(i);
                 extractFormDTO.setDateId(dateDimId);
                 factOriginExtractService.extractAll(extractFormDTO);
-                startDate = DateUtils.addDateDays(DateUtils.stringToDate(extractFormDTO.getStartDate(), "yyyyMMdd"), 1);
-            } while (endDate.compareTo(startDate) >= 0);
+            }
         } else {
             factOriginExtractService.extractAll(extractFormDTO);
         }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexServiceAbilityGridMonthlyService.java

@@ -1,31 +0,0 @@
-package com.epmet.service.evaluationindex.extract;
-
-import com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity;
-
-import java.util.List;
-
-/**
- * 服务能力-网格相关事实表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-09-19
- */
-public interface FactIndexServiceAbilityGridMonthlyService{
-    /**
-     * @return java.util.List<com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity>
-     * @param customerId
-     * @author yinzuomei
-     * @description 查询出所有的网格，初始化好 服务能力-网格相关事实表 各个指标值赋值为0
-     * @Date 2020/9/21 9:38 
-     **/
-    List<FactIndexServiceAblityGridMonthlyEntity> initAllGridList(String customerId);
-
-    /**
-     * @return void
-     * @param list
-     * @author yinzuomei
-     * @description 批量插入网格相关-服务能力指标表
-     * @Date 2020/9/21 10:05
-     **/
-    void insertBatchEntity(List<FactIndexServiceAblityGridMonthlyEntity> list);
-}

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.extract.todata.*;
 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,21 +1,20 @@
-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;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.ExtractConstant;
 import com.epmet.constant.IndexCalConstant;
 import com.epmet.constant.ProjectEvaluateConstant;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDao;
-import com.epmet.dao.partymember.PartyMemberDao;
 import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO;
 import com.epmet.dto.extract.form.GridIssueCountResultDTO;
 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.extract.todata.*;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyService;
@@ -34,11 +33,6 @@ import org.springframework.util.CollectionUtils;
 import java.math.BigDecimal;
 import java.text.NumberFormat;
 import java.util.ArrayList;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -76,7 +70,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
     @Autowired
     private FactIndexGovrnAblityOrgMonthlyService governAbilityOrgMonthlyService;
     @Autowired
-    private FactIndexServiceAbilityGridMonthlyService factIndexServiceAbilityGridMonthlyService;
+    private FactIndexServiceAblityGridMonthlyService factIndexServiceAbilityGridMonthlyService;
     @Autowired
     private FactIndexServiceAblityGridMonthlyService factIndexServiceAblityGridMonthlyService;
     @Autowired
@@ -97,7 +91,8 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
     public Boolean calGridIndexPartyAbility(String customerId, String monthId) {
         List<PartyAbilityGridMonthlyFormDTO> result = governAbilityDao.selectAllGridInfoToParty(customerId);
         if (CollectionUtils.isEmpty(result)){
-            throw new RenException("客户【"+customerId+"】未查出网格信息");
+            log.warn(String.format(ExtractConstant.CUSTOMER_INFO_NULL,customerId));
+            return true;
         }
         // 网格群众用户数 , 网格党员用户数
         List<GridUserCountResultDTO> gridUserCountList = userGridMonthlyService.selectGridUserCount(customerId, monthId);
@@ -112,7 +107,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
         // 网格的发文数量
         List<PublishCountResultDTO> publishCountList = articlePublishedGridDailyService.selectArticlePublishCount(customerId, monthId);
         // 网格议题转项目率
-        List<GridIssueCountResultDTO> gridIssueTotalList = issueExtractService.selectIssueTotalTwoMonth(customerId, monthId, minusMonthId(monthId));
+        List<GridIssueCountResultDTO> gridIssueTotalList = issueExtractService.selectIssueTotalTwoMonth(customerId, monthId, DateUtils.minusMonthId(monthId));
         List<GridProjectCountResultDTO> gridProjectTotalList = issueExtractService.selectGridProjectCount(customerId, monthId, ExtractConstant.SHIFT_PROJECT);
         List<GridProjectCountResultDTO> gridIssueShiftProjectRatio = getGridIssueShiftProjectRatio(gridIssueTotalList, gridProjectTotalList);
         // 建群党员数
@@ -251,14 +246,15 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
 
         List<GovernAbilityGridMonthlyFormDTO> result = governAbilityDao.selectAllGridInfo(customerId);
         if (CollectionUtils.isEmpty(result)){
-            throw new RenException("客户【"+customerId+"】未查出网格信息");
+            log.warn(String.format(ExtractConstant.CUSTOMER_INFO_NULL,customerId));
+            return true;
         }
         //网格总议题数目，网格人均议题数目
         List<GridIssueCountResultDTO> gridIssueTotalList = issueExtractService.selectIssueTotal(customerId, monthId);
         //网格总项目数
         List<GridProjectCountResultDTO> gridProjectTotalList = issueExtractService.selectGridProjectCount(customerId, monthId, ExtractConstant.SHIFT_PROJECT);
         //网格议题转项目率
-        List<GridIssueCountResultDTO> gridIssueCountList = issueExtractService.selectIssueTotalTwoMonth(customerId, monthId, minusMonthId(monthId));
+        List<GridIssueCountResultDTO> gridIssueCountList = issueExtractService.selectIssueTotalTwoMonth(customerId, monthId, DateUtils.minusMonthId(monthId));
         List<GridProjectCountResultDTO> gridIssueShiftProjectRatio = getGridIssueShiftProjectRatio(gridIssueCountList, gridProjectTotalList);
         //网格自治项目数 从议题创建到项目关闭，包括处理人，自始至终没有出过议题所属网格
         List<AutoNoMyResultDTO> projectAutoNoMyList = projectLogService.selectProjectAutoNoMy(customerId, monthId);
@@ -582,23 +578,4 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
         }while (delNum > NumConstant.ZERO);
     }
 
-    /**
-     * @Description  根据monthId【yyyyMM】获取上一个月份ID
-     * @param monthId
-     * @author zxc
-     * @date 2020/9/21 2:43 下午
-     */
-    public String minusMonthId(String monthId){
-        String minusMonthId = null;
-        SimpleDateFormat sft = new SimpleDateFormat("yyyyMM");
-        try {
-            Date parse = sft.parse(monthId);
-            LocalDate birth = parse.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-            LocalDate localDate = birth.minusMonths(NumConstant.ONE);
-            minusMonthId = localDate.toString().substring(NumConstant.ZERO, NumConstant.FOUR).concat(localDate.toString().substring(NumConstant.FIVE, NumConstant.SEVEN));
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return minusMonthId;
-    }
 }

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;
@@ -8,12 +8,12 @@ import com.epmet.dto.stats.DimAgencyDTO;
 import com.epmet.dto.stats.FactArticlePublishedAgencyDailyDTO;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyEntity;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyEntity;
-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.extract.todata.FactOriginProjectLogDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectOrgPeriodDailyService;
 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,19 +1,17 @@
-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;
 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.extract.todata.FactOriginProjectLogDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
 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;
@@ -8,12 +8,12 @@ import com.epmet.dto.stats.DimAgencyDTO;
 import com.epmet.dto.stats.FactArticlePublishedAgencyDailyDTO;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyEntity;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyEntity;
-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.extract.todata.FactOriginProjectLogDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectOrgPeriodDailyService;
 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.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.evaluationindex.extract.dataToIndex.*;
 import com.epmet.service.stats.DimCustomerService;
 import com.epmet.util.DimIdGenerator;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -31,7 +27,7 @@ import java.util.concurrent.*;
 public class IndexOriginExtractServiceImpl implements IndexOriginExtractService {
     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
             .setNameFormat("indexOriginExtract-pool-%d").build();
-    ExecutorService threadPool = new ThreadPoolExecutor(2, 8,
+    ExecutorService threadPool = new ThreadPoolExecutor(1, 1,
             10L, TimeUnit.MINUTES,
             new LinkedBlockingQueue<>(500), namedThreadFactory, new ThreadPoolExecutor.CallerRunsPolicy());
 

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

@@ -1,52 +0,0 @@
-package com.epmet.service.evaluationindex.extract.impl;
-
-import com.epmet.commons.dynamic.datasource.annotation.DataSource;
-import com.epmet.constant.DataSourceConstant;
-import com.epmet.dao.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyDao;
-import com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity;
-import com.epmet.service.evaluationindex.extract.FactIndexServiceAbilityGridMonthlyService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 服务能力-网格相关事实表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-09-19
- */
-@Service
-@Slf4j
-@DataSource(DataSourceConstant.EVALUATION_INDEX)
-public class FactIndexServiceAbilityGridMonthlyServiceImpl implements FactIndexServiceAbilityGridMonthlyService {
-    @Autowired
-    private FactIndexServiceAblityGridMonthlyDao baseDao;
-
-    /**
-     * @param customerId
-     * @return java.util.List<com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity>
-     * @author yinzuomei
-     * @description 查询出所有的网格，初始化好 服务能力-网格相关事实表 各个指标值赋值为0
-     * @Date 2020/9/21 9:38
-     **/
-    @Override
-    @DataSource(DataSourceConstant.EVALUATION_INDEX)
-    public List<FactIndexServiceAblityGridMonthlyEntity> initAllGridList(String customerId) {
-        return baseDao.initAllGridList(customerId);
-    }
-
-    /**
-     * @param list
-     * @return void
-     * @author yinzuomei
-     * @description 批量插入网格相关-服务能力指标表
-     * @Date 2020/9/21 10:05
-     **/
-    @Override
-    @DataSource(DataSourceConstant.EVALUATION_INDEX)
-    public void insertBatchEntity(List<FactIndexServiceAblityGridMonthlyEntity> list) {
-        baseDao.insertBatchEntity(list);
-    }
-}

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

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.dto.extract.form.ExtractFormDTO;
 

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

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.entity.evaluationindex.extract.FactOriginGroupMainDailyEntity;

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

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;

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

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;

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

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;

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

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;

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

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.extract.form.ExtractFormDTO;

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

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.dto.extract.result.PartyCreateGroupCountResultDTO;
 

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

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.dto.extract.form.ExtractFormDTO;
 import com.epmet.dto.extract.form.GridIssueCountResultDTO;

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

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 
 import com.epmet.dto.extract.form.ExtractFormDTO;

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

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract;
+package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.dto.extract.form.ExtractFormDTO;
 

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

@@ -1,10 +1,10 @@
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 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.ExtractFormDTO;
-import com.epmet.service.evaluationindex.extract.*;
+import com.epmet.service.evaluationindex.extract.todata.*;
 import com.epmet.service.stats.DimCustomerService;
 import com.epmet.util.DimIdGenerator;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -27,7 +27,7 @@ import java.util.concurrent.*;
 public class FactOriginExtractServiceImpl implements FactOriginExtractService {
     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
             .setNameFormat("factOriginExtract-pool-%d").build();
-    ExecutorService threadPool = new ThreadPoolExecutor(4, 8,
+    ExecutorService threadPool = new ThreadPoolExecutor(1, 1,
             10L, TimeUnit.MINUTES,
             new LinkedBlockingQueue<>(500), namedThreadFactory, new ThreadPoolExecutor.CallerRunsPolicy());
 
@@ -53,13 +53,14 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
         List<String> customerIds = new ArrayList<>();
         if (StringUtils.isNotBlank(customerId)) {
             customerIds.add(customerId);
-        }
-        int pageNo = NumConstant.ONE;
-        int pageSize = NumConstant.ONE_HUNDRED;
-        customerIds = dimCustomerService.selectCustomerIdPage(pageNo, pageSize);
-        if (CollectionUtils.isEmpty(customerIds)) {
-            log.error("extractAll 获取客户Id为空");
-            return;
+        } else {
+            int pageNo = NumConstant.ONE;
+            int pageSize = NumConstant.ONE_HUNDRED;
+            customerIds = dimCustomerService.selectCustomerIdPage(pageNo, pageSize);
+            if (CollectionUtils.isEmpty(customerIds)) {
+                log.error("extractAll 获取客户Id为空");
+                return;
+            }
         }
 
         String finalDateId = dateId;
@@ -67,7 +68,7 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
             ExtractFormDTO param = new ExtractFormDTO();
             param.setCustomerId(cId);
             param.setDateId(finalDateId);
-           // log.warn();
+            log.debug("extractAll param:{}", JSON.toJSONString(param));
             submitJob(param);
         });
 

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

@@ -15,12 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.dao.evaluationindex.extract.FactOriginGroupMainDailyDao;
 import com.epmet.entity.evaluationindex.extract.FactOriginGroupMainDailyEntity;
-import com.epmet.service.evaluationindex.extract.FactOriginGroupMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginGroupMainDailyService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

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

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -31,7 +31,7 @@ import com.epmet.dao.evaluationindex.extract.FactOriginProjectOrgPeriodDailyDao;
 import com.epmet.dto.extract.FactOriginProjectLogDailyDTO;
 import com.epmet.dto.extract.result.*;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectLogDailyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -31,7 +31,7 @@ import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -6,7 +6,7 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginProjectOrgPeriodDailyDao;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectOrgPeriodDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectOrgPeriodDailyService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

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

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -23,7 +23,7 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginTopicLogDailyDao;
 import com.epmet.dto.extract.result.PartyActiveResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
-import com.epmet.service.evaluationindex.extract.FactOriginTopicLogDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicLogDailyService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 

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

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -34,7 +34,7 @@ import com.epmet.dto.org.GridInfoDTO;
 import com.epmet.dto.topic.TopicOriginInfoDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
-import com.epmet.service.evaluationindex.extract.FactOriginTopicMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
 import com.epmet.service.org.CustomerGridService;
 import com.epmet.service.topic.TopicService;
 import com.epmet.service.user.UserService;

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

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -9,7 +9,7 @@ import com.epmet.dto.extract.form.GridHeartedFormDTO;
 import com.epmet.dto.extract.result.PartyCreateGroupCountResultDTO;
 import com.epmet.dto.group.result.ExtractGroupMemberActionRecordResultDTO;
 import com.epmet.dto.stats.result.GridAttributesResultDTO;
-import com.epmet.service.evaluationindex.extract.GroupExtractService;
+import com.epmet.service.evaluationindex.extract.todata.GroupExtractService;
 import com.epmet.service.group.GroupDataService;
 import com.epmet.service.stats.DimGridService;
 import com.epmet.service.user.UserService;

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

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.dto.form.TimeListResultDTO;
@@ -16,7 +16,7 @@ import com.epmet.dto.extract.form.IssueLogDailyFormDTO;
 import com.epmet.dto.extract.form.IssueMainDailyFormDTO;
 import com.epmet.dto.extract.result.*;
 import com.epmet.service.Issue.IssueService;
-import com.epmet.service.evaluationindex.extract.IssueExtractService;
+import com.epmet.service.evaluationindex.extract.todata.IssueExtractService;
 import com.epmet.service.topic.TopicService;
 import com.epmet.service.user.UserService;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -22,9 +22,9 @@ import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyE
 import com.epmet.entity.project.ProjectProcessEntity;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.Issue.IssueService;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService;
-import com.epmet.service.evaluationindex.extract.FactOriginProjectMainDailyService;
-import com.epmet.service.evaluationindex.extract.ProjectExtractService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectLogDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.ProjectExtractService;
 import com.epmet.service.partymember.PartyMemberService;
 import com.epmet.service.project.ProjectProcessService;
 import com.epmet.service.project.ProjectService;

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

@@ -1,4 +1,4 @@
-package com.epmet.service.evaluationindex.extract.impl;
+package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -7,7 +7,7 @@ import com.epmet.dao.evaluationindex.extract.FactOriginProjectOrgPeriodDailyDao;
 import com.epmet.dto.extract.form.ExtractFormDTO;
 import com.epmet.dto.project.result.ProjectOrgPeriodResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
-import com.epmet.service.evaluationindex.extract.ProjectPeriodExtractService;
+import com.epmet.service.evaluationindex.extract.todata.ProjectPeriodExtractService;
 import com.epmet.service.project.ProjectProcessService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/.gitignore

@@ -0,0 +1,31 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**
+!**/src/test/**
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+
+### VS Code ###
+.vscode/

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexServiceAblityGridMonthlyService.java

@@ -21,6 +21,8 @@ package com.epmet.service.evaluationindex.indexcoll;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity;
 
+import java.util.List;
+
 
 /**
  * 服务能力-网格相关事实表
@@ -38,4 +40,22 @@ public interface FactIndexServiceAblityGridMonthlyService extends BaseService<Fa
      * @Date 2020/9/21 16:38
      **/
     void deleteBatchIndexServiceAblityGridMonthly(String customerId, String monthId);
+
+    /**
+     * @return java.util.List<com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity>
+     * @param customerId
+     * @author yinzuomei
+     * @description 查询出所有的网格，初始化好 服务能力-网格相关事实表 各个指标值赋值为0
+     * @Date 2020/9/21 9:38
+     **/
+    List<FactIndexServiceAblityGridMonthlyEntity> initAllGridList(String customerId);
+
+    /**
+     * @return void
+     * @param list
+     * @author yinzuomei
+     * @description 批量插入网格相关-服务能力指标表
+     * @Date 2020/9/21 10:05
+     **/
+    void insertBatchEntity(List<FactIndexServiceAblityGridMonthlyEntity> list);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexServiceAblityGridMonthlyServiceImpl.java

@@ -26,6 +26,8 @@ import com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMont
 import com.epmet.service.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 服务能力-网格相关事实表
  *
@@ -51,4 +53,30 @@ public class FactIndexServiceAblityGridMonthlyServiceImpl extends BaseServiceImp
             deleteNum = baseDao.deleteFactIndexServiceAblityGridMonthly(customerId, monthId);
         } while (deleteNum > NumConstant.ZERO);
     }
+
+    /**
+     * @param customerId
+     * @return java.util.List<com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity>
+     * @author yinzuomei
+     * @description 查询出所有的网格，初始化好 服务能力-网格相关事实表 各个指标值赋值为0
+     * @Date 2020/9/21 9:38
+     **/
+    @Override
+    @DataSource(DataSourceConstant.EVALUATION_INDEX)
+    public List<FactIndexServiceAblityGridMonthlyEntity> initAllGridList(String customerId) {
+        return baseDao.initAllGridList(customerId);
+    }
+
+    /**
+     * @param list
+     * @return void
+     * @author yinzuomei
+     * @description 批量插入网格相关-服务能力指标表
+     * @Date 2020/9/21 10:05
+     **/
+    @Override
+    @DataSource(DataSourceConstant.EVALUATION_INDEX)
+    public void insertBatchEntity(List<FactIndexServiceAblityGridMonthlyEntity> list) {
+        baseDao.insertBatchEntity(list);
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCpcBaseDataService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenCpcBaseDataEntity;
+
+/**
+ * 基层党建-党员基本情况
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenCpcBaseDataService extends BaseService<ScreenCpcBaseDataEntity> {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerAgencyService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity;
+
+/**
+ * 组织机构信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenCustomerAgencyService extends BaseService<ScreenCustomerAgencyEntity> {
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerDeptService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenCustomerDeptEntity;
+
+/**
+ * 部门信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenCustomerDeptService extends BaseService<ScreenCustomerDeptEntity> {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenCustomerGridEntity;
+
+/**
+ * 网格(党支部)信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenCustomerGridService extends BaseService<ScreenCustomerGridEntity> {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenDifficultyDataService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
+
+/**
+ * 基层治理-难点堵点(耗时最长|设计部门最多|处理次数)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenDifficultyDataService extends BaseService<ScreenDifficultyDataEntity> {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenEventDataService.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenEventDataEntity;
+
+/**
+ * 中央区-事件数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenEventDataService extends BaseService<ScreenEventDataEntity> {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenEventImgDataService.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenEventImgDataEntity;
+
+/**
+ * 中央区-事件数据图片数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenEventImgDataService extends BaseService<ScreenEventImgDataEntity> {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenGovernRankDataService.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity;
+
+/**
+ * 基层治理-治理能力排行数据(按月统计)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenGovernRankDataService extends BaseService<ScreenGovernRankDataEntity> {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenOrgRankDataService.java

@@ -0,0 +1,30 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenOrgRankDataEntity;
+
+/**
+ * 党建引领-组织先进排行榜
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenOrgRankDataService extends BaseService<ScreenOrgRankDataEntity> {
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenPartyBranchDataService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenPartyBranchDataEntity;
+
+/**
+ * 基层党建-建设情况数据（支部，联建,志愿服务)按月
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenPartyBranchDataService extends BaseService<ScreenPartyBranchDataEntity> {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenPartyLinkMassesDataService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenPartyLinkMassesDataEntity;
+
+/**
+ * 党建引领-党员联系群众数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenPartyLinkMassesDataService extends BaseService<ScreenPartyLinkMassesDataEntity> {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenPartyUserRankDataService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenPartyUserRankDataEntity;
+
+/**
+ * 党建引领｜基层治理-市民（党员）积分排行榜
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenPartyUserRankDataService extends BaseService<ScreenPartyUserRankDataEntity> {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenPioneerDataService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenPioneerDataEntity;
+
+/**
+ * 党建引领-先锋模范数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenPioneerDataService extends BaseService<ScreenPioneerDataEntity> {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenPublicPartiTotalDataService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenPublicPartiTotalDataEntity;
+
+/**
+ * 公众参与-各类(话题|议题|项目|注册人数|参与人数)总数
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenPublicPartiTotalDataService extends BaseService<ScreenPublicPartiTotalDataEntity> {
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenUserJoinService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenUserJoinEntity;
+
+/**
+ * 基层治理-公众参与
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenUserJoinService extends BaseService<ScreenUserJoinEntity> {
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenUserTotalDataService.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.screen.ScreenUserTotalDataEntity;
+
+/**
+ * 中央区-各类(用户|党员|党群|话题|议题|项目)总数
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+public interface ScreenUserTotalDataService extends BaseService<ScreenUserTotalDataEntity> {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCpcBaseDataServiceImpl.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenCpcBaseDataDao;
+import com.epmet.entity.evaluationindex.screen.ScreenCpcBaseDataEntity;
+import com.epmet.service.evaluationindex.screen.ScreenCpcBaseDataService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 基层党建-党员基本情况
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenCpcBaseDataServiceImpl extends BaseServiceImpl<ScreenCpcBaseDataDao, ScreenCpcBaseDataEntity> implements ScreenCpcBaseDataService {
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java

@@ -0,0 +1,35 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
+import com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity;
+import com.epmet.service.evaluationindex.screen.ScreenCustomerAgencyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 组织机构信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenCustomerAgencyServiceImpl extends BaseServiceImpl<ScreenCustomerAgencyDao, ScreenCustomerAgencyEntity> implements ScreenCustomerAgencyService {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenCustomerDeptDao;
+import com.epmet.entity.evaluationindex.screen.ScreenCustomerDeptEntity;
+import com.epmet.service.evaluationindex.screen.ScreenCustomerDeptService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 部门信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenCustomerDeptServiceImpl extends BaseServiceImpl<ScreenCustomerDeptDao, ScreenCustomerDeptEntity> implements ScreenCustomerDeptService {
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenCustomerGridDao;
+import com.epmet.entity.evaluationindex.screen.ScreenCustomerGridEntity;
+import com.epmet.service.evaluationindex.screen.ScreenCustomerGridService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 网格(党支部)信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenCustomerGridServiceImpl extends BaseServiceImpl<ScreenCustomerGridDao, ScreenCustomerGridEntity> implements ScreenCustomerGridService {
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenDifficultyDataDao;
+import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
+import com.epmet.service.evaluationindex.screen.ScreenDifficultyDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 基层治理-难点堵点(耗时最长|设计部门最多|处理次数)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenDifficultyDataServiceImpl extends BaseServiceImpl<ScreenDifficultyDataDao, ScreenDifficultyDataEntity> implements ScreenDifficultyDataService {
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenEventDataServiceImpl.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenEventDataDao;
+import com.epmet.entity.evaluationindex.screen.ScreenEventDataEntity;
+import com.epmet.service.evaluationindex.screen.ScreenEventDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 中央区-事件数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenEventDataServiceImpl extends BaseServiceImpl<ScreenEventDataDao, ScreenEventDataEntity> implements ScreenEventDataService {
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenEventImgDataServiceImpl.java

@@ -0,0 +1,35 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenEventImgDataDao;
+import com.epmet.entity.evaluationindex.screen.ScreenEventImgDataEntity;
+import com.epmet.service.evaluationindex.screen.ScreenEventImgDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 中央区-事件数据图片数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenEventImgDataServiceImpl extends BaseServiceImpl<ScreenEventImgDataDao, ScreenEventImgDataEntity> implements ScreenEventImgDataService {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataServiceImpl.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenGovernRankDataDao;
+import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity;
+import com.epmet.service.evaluationindex.screen.ScreenGovernRankDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 基层治理-治理能力排行数据(按月统计)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenGovernRankDataServiceImpl extends BaseServiceImpl<ScreenGovernRankDataDao, ScreenGovernRankDataEntity> implements ScreenGovernRankDataService {
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenOrgRankDataServiceImpl.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenOrgRankDataDao;
+import com.epmet.entity.evaluationindex.screen.ScreenOrgRankDataEntity;
+import com.epmet.service.evaluationindex.screen.ScreenOrgRankDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 党建引领-组织先进排行榜
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenOrgRankDataServiceImpl extends BaseServiceImpl<ScreenOrgRankDataDao, ScreenOrgRankDataEntity> implements ScreenOrgRankDataService {
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPartyBranchDataServiceImpl.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenPartyBranchDataDao;
+import com.epmet.entity.evaluationindex.screen.ScreenPartyBranchDataEntity;
+import com.epmet.service.evaluationindex.screen.ScreenPartyBranchDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 基层党建-建设情况数据（支部，联建,志愿服务)按月
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenPartyBranchDataServiceImpl extends BaseServiceImpl<ScreenPartyBranchDataDao, ScreenPartyBranchDataEntity> implements ScreenPartyBranchDataService {
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPartyLinkMassesDataServiceImpl.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenPartyLinkMassesDataDao;
+import com.epmet.entity.evaluationindex.screen.ScreenPartyLinkMassesDataEntity;
+import com.epmet.service.evaluationindex.screen.ScreenPartyLinkMassesDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 党建引领-党员联系群众数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenPartyLinkMassesDataServiceImpl extends BaseServiceImpl<ScreenPartyLinkMassesDataDao, ScreenPartyLinkMassesDataEntity> implements ScreenPartyLinkMassesDataService {
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPartyUserRankDataServiceImpl.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenPartyUserRankDataDao;
+import com.epmet.entity.evaluationindex.screen.ScreenPartyUserRankDataEntity;
+import com.epmet.service.evaluationindex.screen.ScreenPartyUserRankDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 党建引领｜基层治理-市民（党员）积分排行榜
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenPartyUserRankDataServiceImpl extends BaseServiceImpl<ScreenPartyUserRankDataDao, ScreenPartyUserRankDataEntity> implements ScreenPartyUserRankDataService {
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPioneerDataServiceImpl.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenPioneerDataDao;
+import com.epmet.entity.evaluationindex.screen.ScreenPioneerDataEntity;
+import com.epmet.service.evaluationindex.screen.ScreenPioneerDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 党建引领-先锋模范数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenPioneerDataServiceImpl extends BaseServiceImpl<ScreenPioneerDataDao, ScreenPioneerDataEntity> implements ScreenPioneerDataService {
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPublicPartiTotalDataServiceImpl.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenPublicPartiTotalDataDao;
+import com.epmet.entity.evaluationindex.screen.ScreenPublicPartiTotalDataEntity;
+import com.epmet.service.evaluationindex.screen.ScreenPublicPartiTotalDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 公众参与-各类(话题|议题|项目|注册人数|参与人数)总数
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenPublicPartiTotalDataServiceImpl extends BaseServiceImpl<ScreenPublicPartiTotalDataDao, ScreenPublicPartiTotalDataEntity> implements ScreenPublicPartiTotalDataService {
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenUserJoinDao;
+import com.epmet.entity.evaluationindex.screen.ScreenUserJoinEntity;
+import com.epmet.service.evaluationindex.screen.ScreenUserJoinService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 基层治理-公众参与
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenUserJoinServiceImpl extends BaseServiceImpl<ScreenUserJoinDao, ScreenUserJoinEntity> implements ScreenUserJoinService {
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserTotalDataServiceImpl.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.screen.ScreenUserTotalDataDao;
+import com.epmet.entity.evaluationindex.screen.ScreenUserTotalDataEntity;
+import com.epmet.service.evaluationindex.screen.ScreenUserTotalDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 中央区-各类(用户|党员|党群|话题|议题|项目)总数
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-22
+ */
+@Service
+public class ScreenUserTotalDataServiceImpl extends BaseServiceImpl<ScreenUserTotalDataDao, ScreenUserTotalDataEntity> implements ScreenUserTotalDataService {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml

@@ -143,6 +143,7 @@
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="DEBUG"/>
+        <logger name="com.epmet.feign" level="INFO"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>