Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data

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_LEVEL = "community";
-
-    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_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/dao/indexcoll/FactIndexPartyAblityOrgMonthlyDao.java

@@ -81,5 +81,5 @@ public interface FactIndexPartyAblityOrgMonthlyDao extends BaseDao<FactIndexPart
      * @author zxc
      * @date 2020/8/26 10:49 上午
      */
-    List<Map<String,Object>> selectPublishArticleCountMap(@Param("customerId")String customerId, @Param("monthId")String monthId);
+    List<Map<String,Object>> selectPublishArticleCountMap(@Param("customerId")String customerId, @Param("monthId")String monthId,@Param("level")String level);
 }

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

@@ -74,5 +74,14 @@ public interface FactIndexServiceAblityOrgMonthlyDao extends BaseDao<FactIndexSe
      * @date 2020/8/31 2:15 下午
      */
     List<CommunityActivityCountResultDTO> selectActivityCount(@Param("customerId")String customerId, @Param("monthId")String monthId);
-    List<Map<String,Object>> selectActivityCountMap(@Param("customerId")String customerId, @Param("monthId")String monthId);
+
+    /**
+     * @Description  社区活动组织次数
+     * @param customerId
+     * @param monthId
+     * @param level
+     * @author zxc
+     * @date 2020/9/2 2:09 下午
+     */
+    List<Map<String,Object>> selectActivityCountMap(@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;
+package com.epmet.service.indexcal;
-
-import com.epmet.dto.screen.result.CommunityGovernAbilityCalculateResultDTO;
-import com.epmet.dto.screen.result.CommunityPublishArticleCountCalculateResultDTO;
-
-import java.util.List;
 
 /**
  * @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;
@@ -93,7 +93,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                 });
             } else {
                 // 社区名义发文数量
-                List<Map<String, Object>> mapList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMap(customerId, monthId);
+                List<Map<String, Object>> mapList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMap(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL);
                 if (CollectionUtils.isEmpty(mapList)) {
                     log.error("查询社区名义发文数量集合为空");
                     return;
@@ -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) {
@@ -228,9 +228,9 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                     });
                 }
             } else {
-                List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMap(customerId, monthId);
+                List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMap(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL);
                 if (CollectionUtils.isEmpty(communityActivityCountList)) {
-                    log.error("");
+                    log.error("查询社区活动组织次数集合为空");
                     return;
                 }
                 if (communityActivityCountList.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;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/BigDecimalScoreCalculator.java

@@ -61,7 +61,7 @@ public class BigDecimalScoreCalculator extends ScoreCalculator {
         this.maxValue = maxSourceValue;
         this.correlation = correlation;
         prepare4BoundaryValue();
-        System.out.println("最小值："+minScore+"；最大值："+maxScore);
+        System.out.println("归一区间最小值："+minScore+"；归一区间最大值："+maxScore+";样本最小值："+minSourceValue+";样本最大值："+maxSourceValue);
     }
 
     @Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreConstants.java

@@ -7,7 +7,7 @@ import java.math.BigDecimal;
  */
 public class ScoreConstants {
 
-    public static final BigDecimal MIN_SCORE = new BigDecimal(1);
+    public static final BigDecimal MIN_SCORE = new BigDecimal(0);
     public static final BigDecimal MAX_SCORE = new BigDecimal(100);
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml

@@ -104,7 +104,7 @@
             fact_index_govrn_ablity_org_monthly
         WHERE
             del_flag = '0'
-          AND data_type = 'community'
+          AND data_type = #{level}
           AND customer_id = #{customerId}
           AND month_id = #{monthId}
     </select>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexPartyAblityOrgMonthlyDao.xml

@@ -104,7 +104,7 @@
             fact_index_party_ablity_org_monthly
         WHERE
             del_flag = '0'
-          AND data_type = 'community'
+          AND data_type = #{level}
           AND customer_id = #{customerId}
           AND month_id = #{monthId}
     </select>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexServiceAblityOrgMonthlyDao.xml

@@ -104,7 +104,7 @@
             fact_index_service_ablity_org_monthly
         WHERE
             del_flag = '0'
-          AND data_type = 'community'
+          AND data_type = #{level}
           AND customer_id = #{customerId}
           AND month_id = #{monthId}
     </select>