社区相关优化 4

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

@@ -21,17 +21,7 @@ public interface IndexCalConstant {
     String USER_ID="USER_ID";
     String YEAR_ID = "YEAR_ID";
 
-    String COMMUNITY_GOVERN = "zhilinengli";
-
-    String COMMUNITY_PARTY = "dangjiannengli";
-
-    String COMMUNITY_SERVICE = "fuwunengli";
-
-    String COMMUNITY_SERVICE_AVG = "shequxiajisywgfwnldfpjz";
-
-    String COMMUNITY_GOVERN_AVG = "shequxiashusywgzlnlhzpjz";
-
-    String COMMUNITY_PARTY_AVG = "xiashusuoyouwgddjnlpjz";
+    String COMMUNITY_LEVEL = "community";
 
     String COMMUNITY_RELATE = "shequxiangguan";
 

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

@@ -18,7 +18,7 @@ import com.epmet.entity.screen.ScreenCustomerGridEntity;
 import com.epmet.entity.stats.DimAgencyEntity;
 import com.epmet.service.StatsDemoService;
 import com.epmet.service.indexcal.GridCorreLationService;
-import com.epmet.service.screen.IndexCalculateCommunityService;
+import com.epmet.service.indexcal.IndexCalculateCommunityService;
 import com.epmet.service.stats.DimAgencyService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.java

@@ -71,5 +71,5 @@ public interface FactIndexGovrnAblityOrgMonthlyDao extends BaseDao<FactIndexGovr
      * @author zxc
      * @date 2020/8/26 1:40 下午
      */
-    List<Map<String,Object>> selectCommunityGovernAbility(@Param("customerId")String customerId, @Param("monthId")String monthId);
+    List<Map<String,Object>> selectCommunityGovernAbility(@Param("customerId")String customerId, @Param("monthId")String monthId,@Param("level")String level);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/IndexCalculateCommunityService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/IndexCalculateCommunityService.java

@@ -1,9 +1,4 @@
-package com.epmet.service.screen;
-
-import com.epmet.dto.screen.result.CommunityGovernAbilityCalculateResultDTO;
-import com.epmet.dto.screen.result.CommunityPublishArticleCountCalculateResultDTO;
-
-import java.util.List;
+package com.epmet.service.indexcal;
 
 /**
  * @Author zxc

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/IndexCalculateCommunityServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/IndexCalculateCommunityServiceImpl.java

@@ -1,4 +1,4 @@
-package com.epmet.service.screen.impl;
+package com.epmet.service.indexcal.impl;
 
 import com.alibaba.druid.util.StringUtils;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -13,8 +13,8 @@ import com.epmet.dto.screen.FactIndexCommunityScoreDTO;
 import com.epmet.dto.screen.result.*;
 import com.epmet.entity.screen.IndexGroupDetailEntity;
 import com.epmet.eum.IndexCodeEnum;
+import com.epmet.service.indexcal.IndexCalculateCommunityService;
 import com.epmet.service.indexcal.IndexCodeFieldReService;
-import com.epmet.service.screen.IndexCalculateCommunityService;
 import com.epmet.service.screen.IndexGroupDetailService;
 import com.epmet.support.normalizing.*;
 import com.epmet.support.normalizing.batch.BatchScoreCalculator;
@@ -160,7 +160,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                     });
                 }
             } else {
-                List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbility(customerId, monthId);
+                List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbility(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL);
                 if (communityGovernAbility.size() == NumConstant.ONE) {
                     // TODO
                 } else if (communityGovernAbility.size() > NumConstant.ONE) {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/IndexCalculateServiceImpl.java

@@ -10,7 +10,7 @@ import com.epmet.redis.IndexCodeFieldReRedis;
 import com.epmet.service.indexcal.CpcIndexCalculateService;
 import com.epmet.service.indexcal.GridCorreLationService;
 import com.epmet.service.indexcal.IndexCalculateService;
-import com.epmet.service.screen.IndexCalculateCommunityService;
+import com.epmet.service.indexcal.IndexCalculateCommunityService;
 import com.epmet.util.DimIdGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;