Merge branch 'dev_screen_data' into dev_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -325,6 +325,14 @@ public class RedisKeys {
 	 * @return
 	 */
 	public static String getCustomerStatsCalFlag(String customerId) {
-		return String.format(rootPrefix + "stats:calflag:%s", customerId);
+		return getCustomerStatsCalKeyPrefix().concat(":").concat(customerId);
+	}
+
+	/**
+	 * 获取计算标记的key前缀
+	 * @return
+	 */
+	public static String getCustomerStatsCalKeyPrefix() {
+		return rootPrefix.concat("stats:calflag");
 	}
 }

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

@@ -0,0 +1,13 @@
+package com.epmet.constant;
+
+/**
+ * 计算状态
+ * calculating:正在计算中。有实例正在计算
+ * pendding:计算暂停，说明计算过程中实例发生重启，等待重新计算
+ */
+public interface CalculateStatus {
+
+    String PENDDING = "pendding";
+    String CALCULATING = "calculating";
+
+}

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

@@ -2,13 +2,16 @@ package com.epmet.controller;
 
 import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.constant.CalculateStatus;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
+import com.epmet.model.CalculateFlagModel;
 import com.epmet.service.evaluationindex.indexcal.CpcIndexCalculateService;
 import com.epmet.service.evaluationindex.indexcal.IndexCalculateService;
 import com.epmet.util.DimIdGenerator;
@@ -21,10 +24,14 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.*;
 
 /**
@@ -59,20 +66,41 @@ public class IndexCalculateController {
     private Map<String, Future> futureMap = new HashMap<>();
 
     @PreDestroy
-    public void clearDataCalFlag() {
+    public void saveCalStatus() {
-        // 实例销毁之前，将正在本实例中执行计算的客户列表的计算状态清空
+        // 实例销毁之前，将正在本实例中执行计算的客户列表的计算状态修改为pendding，等待其他实例重新计算
         futureMap.forEach((customerId, future) -> {
-            redisUtils.delete(RedisKeys.getCustomerStatsCalFlag(customerId));
+            CalculateFlagModel flag = (CalculateFlagModel) redisUtils.get(RedisKeys.getCustomerStatsCalFlag(customerId));
+            flag.setStatus(CalculateStatus.PENDDING);
+            redisUtils.set(RedisKeys.getCustomerStatsCalFlag(customerId), flag);
+            log.info("客户【%s】正在执行计算，实例发生重启，修改计算状态为:calculation->pendding", customerId);
         });
     }
 
+    /**
+     * 处理暂停中的计算
+     */
+    @PostMapping("process-pendding-cals")
+    public void processPenddingCalculate() {
+        String keyPrefix = RedisKeys.getCustomerStatsCalKeyPrefix();
+        Set<String> calFlagKeys = redisUtils.keys(keyPrefix.concat("*"));
+        calFlagKeys.forEach(key -> {
+            CalculateFlagModel flag = (CalculateFlagModel) redisUtils.get(key);
+            if (flag != null && CalculateStatus.PENDDING.equals(flag.getStatus())) {
+                // 找到状态是pendding的key，执行计算
+                CalculateCommonFormDTO form = new CalculateCommonFormDTO();
+                form.setCustomerId(flag.getForm().getCustomerId());
+                form.setMonthId(flag.getForm().getMonthId());
+                indexCalculate(form);
+            }
+        });
+    }
 
     /**
      * 按照客户计算所有指标(按照月份)
      *
      * @param formDTO
      * @return com.epmet.commons.tools.utils.Result
-     * @Author zhangyong
+     * @Author zhangyongç
      * @Date 10:52 2020-08-20
      **/
     @ExternalAppRequestAuth
@@ -80,34 +108,66 @@ public class IndexCalculateController {
     public Result<Boolean> indexCalculate(ExternalAppRequestParam externalAppRequestParam, @RequestBody CalculateCommonFormDTO formDTO) {
         String customerId = externalAppRequestParam.getCustomerId();
         //String customerId = "epmettest";
-        Boolean executing = (Boolean) redisUtils.get(RedisKeys.getCustomerStatsCalFlag(customerId));
+        formDTO.setCustomerId(customerId);
-        if (executing == null || !executing) {
+        indexCalculate(formDTO);
+        return new Result<Boolean>().ok(true);
+    }
+
+    /**
+     * 指标计算
+     * @param formDTO
+     */
+    private void indexCalculate(CalculateCommonFormDTO formDTO) {
+        CalculateFlagModel executeFlag = (CalculateFlagModel) redisUtils.get(RedisKeys.getCustomerStatsCalFlag(formDTO.getCustomerId()));
+        if (executeFlag == null || !CalculateStatus.CALCULATING.equals(executeFlag.getStatus())) {
+            // 可以计算
             synchronized (statsCalLock) {
-                Boolean executing2 = (Boolean) redisUtils.get(RedisKeys.getCustomerStatsCalFlag(customerId));
+                CalculateFlagModel executingFlag2 = (CalculateFlagModel) redisUtils.get(RedisKeys.getCustomerStatsCalFlag(formDTO.getCustomerId()));
-                if (executing2 != null && executing2) {
+                if (executingFlag2 != null && CalculateStatus.CALCULATING.equals(executingFlag2.getStatus())) {
-                    log.error(String.format("该客户正在执行计算，请勿重复提交计算请求。", customerId));
+                    //log.error(String.format("客户【%s】正在执行计算，请勿重复提交计算请求。", customerId));
-                    return new Result<Boolean>().ok(false);
+                    throw new RenException(String.format("客户【%s】正在执行计算，请勿重复提交计算请求。", formDTO.getCustomerId()));
                 }
-                Future<?> future = singleThreadPool.submit(() -> {
+                // 提交异步计算
-                    formDTO.setCustomerId(customerId);
+                submitCalculate(formDTO);
-                    long start = System.currentTimeMillis();
-                    Boolean aBoolean = indexCalculateService.indexCalculate(formDTO);
-                    if (aBoolean) {
-                        log.error("客户Id：{},全部指标计算完成，总耗时：{}秒", customerId, (System.currentTimeMillis() - start) / 1000);
-                    }
-                    redisUtils.delete(RedisKeys.getCustomerStatsCalFlag(customerId));
-                    futureMap.remove(customerId);
-                });
-                futureMap.put(customerId, future);
-                redisUtils.set(RedisKeys.getCustomerStatsCalFlag(customerId), true);
             }
         } else {
-            log.error(String.format("该客户正在执行计算，请勿重复提交计算请求。", customerId));
+            throw new RenException(String.format("客户【%s】正在执行计算，请勿重复提交计算请求。", formDTO.getCustomerId()));
-            return new Result<Boolean>().ok(false);
         }
+    }
+
+    /**
+     * 提交异步计算
+     * @param formDTO
+     * @return
+     */
+    private void submitCalculate(CalculateCommonFormDTO formDTO) {
+        Future<?> future = singleThreadPool.submit(() -> {
+            long start = System.currentTimeMillis();
+            Boolean aBoolean = indexCalculateService.indexCalculate(formDTO);
+            if (aBoolean) {
+                log.error("客户Id：{},全部指标计算完成，总耗时：{}秒", formDTO.getCustomerId(), (System.currentTimeMillis() - start) / 1000);
+            }
 
+            redisUtils.delete(RedisKeys.getCustomerStatsCalFlag(formDTO.getCustomerId()));
+            futureMap.remove(formDTO.getCustomerId());
 
-        return new Result<Boolean>().ok(true);
+            //测试代码
+            //try {
+            //    Thread.sleep(20000l);
+            //    System.out.println(System.currentTimeMillis());
+            //} catch (InterruptedException e) {
+            //    e.printStackTrace();
+            //}
+            //redisUtils.delete(RedisKeys.getCustomerStatsCalFlag(formDTO.getCustomerId()));
+            //futureMap.remove(formDTO.getCustomerId());
+        });
+
+        futureMap.put(formDTO.getCustomerId(), future);
+
+        CalculateFlagModel flag = new CalculateFlagModel();
+        flag.setStatus(CalculateStatus.CALCULATING);
+        flag.setForm(formDTO);
+        redisUtils.set(RedisKeys.getCustomerStatsCalFlag(formDTO.getCustomerId()), flag);
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/CalculateFlagModel.java

@@ -0,0 +1,20 @@
+package com.epmet.model;
+
+import com.epmet.dto.indexcal.CalculateCommonFormDTO;
+import lombok.Data;
+
+@Data
+public class CalculateFlagModel {
+
+    /**
+     * 提交计算时候的参数
+     */
+    private CalculateCommonFormDTO form;
+
+    /**
+     * 计算状态
+     * CalculateStatus.java
+     */
+    private String status;
+
+}

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

@@ -69,6 +69,33 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
     @Autowired
     private CommunitySubScoreDao communitySubScoreDao;
 
+    /**
+     * @param customerId
+     * @param monthId
+     * @Description 计算社区相关总分
+     * @author zxc
+     * @date 2020/9/1 4:12 下午
+     */
+    public Boolean calCommunityAll(String customerId, String monthId) {
+        Boolean aBoolean = communityPartyCalculate(customerId, monthId);//党建能力
+        if (!aBoolean.equals(true)) {
+            throw new RenException("calculate community-party-ability failure ......");
+        }
+        Boolean bBoolean = communityGovernAbilityCalculate(customerId, monthId);// 治理能力
+        if (!bBoolean.equals(true)) {
+            throw new RenException("calculate community-govern-ability failure ......");
+        }
+        Boolean cBoolean = communityServiceAbilityCalculate(customerId, monthId);// 服务能力
+        if (!cBoolean.equals(true)) {
+            throw new RenException("calculate community-service-ability failure ......");
+        }
+        Boolean dBoolean = communityRelate(customerId, monthId);
+        if (!dBoolean.equals(true)) {
+            throw new RenException("calculate community-all insert failure ......");
+        }
+        return true;
+    }
+
     /**
      * @param customerId
      * @Description 社区名义发文数量计算【党建能力】
@@ -91,7 +118,6 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                 List<SubGridAvgResultDTO> subGridPartyAvgScore = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode());
                 if (CollectionUtils.isEmpty(subGridPartyAvgScore)) {
                     log.error(IndexCalConstant.GRID_PARTY_AVG_NULL);
-                    return;
                 } else {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridPartyAvgScore.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubGridAvgResultDTO>> subPartyAvgList = ListUtils.partition(subGridPartyAvgScore, IndexCalConstant.PAGE_SIZE);
@@ -112,7 +138,6 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                 List<Map<String, Object>> publishArticleCountList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMap(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL);
                 if (CollectionUtils.isEmpty(publishArticleCountList)) {
                     log.error(IndexCalConstant.COMMUNITY_PUBLISH_ARTICLE_LIST_NULL);
-                    return;
                 }
                 String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                 if (StringUtils.isEmpty(fieldNameByIndexCode)) {
@@ -166,7 +191,6 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                 List<SubGridAvgResultDTO> subGridGovernAvg = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
                 if (CollectionUtils.isEmpty(subGridGovernAvg)){
                     log.error("社区下级治理能力平均分集合为空");
-                    return;
                 }else{
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridGovernAvg.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubGridAvgResultDTO>> governAvg = ListUtils.partition(subGridGovernAvg, IndexCalConstant.PAGE_SIZE);
@@ -187,7 +211,6 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                 List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbility(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL);
                 if (CollectionUtils.isEmpty(communityGovernAbility)){
                     log.error(IndexCalConstant.COMMUNITY_GOVERN_ABILITY_NULL);
-                    return;
                 }else{
                     String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                     if (StringUtils.isEmpty(fieldNameByIndexCode)) {
@@ -241,7 +264,6 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                 List<SubGridAvgResultDTO> subGridServiceAvg = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode());
                 if (CollectionUtils.isEmpty(subGridServiceAvg)) {
                     log.error("查询社区下级所有网格服务能力得分平均值集合为空");
-                    //todo return;
                 } else {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridServiceAvg.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubGridAvgResultDTO>> serviceAvgList = ListUtils.partition(subGridServiceAvg, IndexCalConstant.PAGE_SIZE);
@@ -261,7 +283,6 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                 List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMap(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL);
                 if (CollectionUtils.isEmpty(communityActivityCountList)) {
                     log.error(IndexCalConstant.COMMUNITY_SERVICE_ABILITY_NULL);
-                    return;
                 }else{
                     String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                     if (StringUtils.isEmpty(fieldNameByIndexCode)) {
@@ -336,33 +357,6 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         return true;
     }
 
-    /**
-     * @param customerId
-     * @param monthId
-     * @Description 计算社区相关总分
-     * @author zxc
-     * @date 2020/9/1 4:12 下午
-     */
-    public Boolean calCommunityAll(String customerId, String monthId) {
-        Boolean aBoolean = communityPartyCalculate(customerId, monthId);//党建能力
-        if (!aBoolean.equals(true)) {
-            throw new RenException("calculate community-party-ability failure ......");
-        }
-        Boolean bBoolean = communityGovernAbilityCalculate(customerId, monthId);// 治理能力
-        if (!bBoolean.equals(true)) {
-            throw new RenException("calculate community-govern-ability failure ......");
-        }
-        Boolean cBoolean = communityServiceAbilityCalculate(customerId, monthId);// 服务能力
-        if (!cBoolean.equals(true)) {
-            throw new RenException("calculate community-service-ability failure ......");
-        }
-        Boolean dBoolean = communityRelate(customerId, monthId);
-        if (!dBoolean.equals(true)) {
-            throw new RenException("calculate community-all insert failure ......");
-        }
-        return true;
-    }
-
     /**
      * @param list
      * @Description BigDecimal类型获取最大数和最小数

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

@@ -116,7 +116,6 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                 List<SubAgencyScoreAvgResultDTO> subGridPartyAvgScore = agencyScoreDao.selectAgencyScoreAvg(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL);
                 if (CollectionUtils.isEmpty(subGridPartyAvgScore)) {
                     log.error(IndexCalConstant.DISTRICT_PARTY_AVG_NULL);
-                    return;
                 } else if (subGridPartyAvgScore.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridPartyAvgScore.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubAgencyScoreAvgResultDTO>> subPartyAvgList = ListUtils.partition(subGridPartyAvgScore, IndexCalConstant.PAGE_SIZE);
@@ -137,7 +136,6 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                 List<Map<String, Object>> publishArticleCountList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMap(customerId, monthId,IndexCalConstant.DISTRICT_LEVEL);
                 if (CollectionUtils.isEmpty(publishArticleCountList)) {
                     log.error(IndexCalConstant.DISTRICT_PUBLISH_ARTICLE_LIST_NULL);
-                    return;
                 }
                 String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                 if (StringUtils.isEmpty(fieldNameByIndexCode)) {
@@ -191,7 +189,6 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                 List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvg(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL);
                 if (CollectionUtils.isEmpty(districtGovernAvgList)) {
                     log.error("查询所有街道治理能力平均值集合为空");
-                    return;
                 } else{
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(districtGovernAvgList.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubAgencyScoreAvgResultDTO>> governAvg = ListUtils.partition(districtGovernAvgList, IndexCalConstant.PAGE_SIZE);
@@ -211,7 +208,6 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                 List<SubAgencyScoreAvgResultDTO> deptScoreAvgList = deptScoreDao.selectGovernDeptScoreAvg(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
                 if (CollectionUtils.isEmpty(deptScoreAvgList)) {
                     log.error("查询所有直属部门治理能力平均值集合为空");
-                    //return;
                 } else{
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(deptScoreAvgList.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubAgencyScoreAvgResultDTO>> governAvg = ListUtils.partition(deptScoreAvgList, IndexCalConstant.PAGE_SIZE);
@@ -261,7 +257,6 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                 List<SubAgencyScoreAvgResultDTO> subStreetAvgList = agencyScoreDao.selectAgencyScoreAvg(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL);
                 if (CollectionUtils.isEmpty(subStreetAvgList)) {
                     log.error("查询区下属街道服务能力汇总平均值集合为空");
-                    return;
                 } else{
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subStreetAvgList.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubAgencyScoreAvgResultDTO>> serviceAvgList = ListUtils.partition(subStreetAvgList, IndexCalConstant.PAGE_SIZE);

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

@@ -119,7 +119,6 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 List<SubCommunityAvgResultDTO> subCommPartyAvgScore = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode());
                 if (CollectionUtils.isEmpty(subCommPartyAvgScore)) {
                     log.error(IndexCalConstant.COMMUNITY_PARTY_AVG_NULL);
-                    //todo return;
                 } else if (subCommPartyAvgScore.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subCommPartyAvgScore.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     Integer indexEnd = NumConstant.TEN;
@@ -141,7 +140,6 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 List<Map<String, Object>> mapList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMap(customerId, monthId, IndexCalConstant.STREET_LEVEL);
                 if (CollectionUtils.isEmpty(mapList)) {
                     log.error(IndexCalConstant.STREET_PUBLISH_ARTICLE_LIST_NULL);
-                    return;
                 }
                 String fieldName = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                 if (StringUtils.isEmpty(fieldName)) {
@@ -194,7 +192,6 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 List<SubCommunityAvgResultDTO> subGridGovernAvg = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
                 if (CollectionUtils.isEmpty(subGridGovernAvg)){
                     log.error("查询街道下属所有社区治理能力汇总为空");
-                    //todo return;
                 }else if (subGridGovernAvg.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridGovernAvg.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubCommunityAvgResultDTO>> governAvg = ListUtils.partition(subGridGovernAvg, IndexCalConstant.PAGE_SIZE);
@@ -215,7 +212,6 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbility(customerId, monthId,IndexCalConstant.STREET_LEVEL);
                 if (CollectionUtils.isEmpty(communityGovernAbility)){
                     log.error(IndexCalConstant.STREET_GOVERN_ABILITY_NULL);
-                    return;
                 }else{
                     String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                     if (StringUtils.isEmpty(fieldNameByIndexCode)) {
@@ -269,7 +265,6 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 List<SubCommunityAvgResultDTO> subCommServiceAvg = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode());
                 if (CollectionUtils.isEmpty(subCommServiceAvg)) {
                     log.error("查询街道下属社区服务能力得分平均值为空");
-                    //todo return;
                 } else if (subCommServiceAvg.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subCommServiceAvg.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubCommunityAvgResultDTO>> serviceAvgList = ListUtils.partition(subCommServiceAvg, IndexCalConstant.PAGE_SIZE);
@@ -289,7 +284,6 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMap(customerId, monthId,IndexCalConstant.STREET_LEVEL);
                 if (CollectionUtils.isEmpty(communityActivityCountList)) {
                     log.error(IndexCalConstant.STREET_SERVICE_ABILITY_NULL);
-                    return;
                 }else{
                     String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                     if (StringUtils.isEmpty(fieldNameByIndexCode)) {

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

@@ -37,7 +37,7 @@ public class BatchScoreCalculator {
     }
 
     /**
-     * 执行计算，以样本的所有指标总得分及明细分数值
+     * 执行计算，以样本的所有指标总得分（原始值）及明细分数（归一后的值 不乘以权重）值
      *
      * @param indexInputVOS
      * @return
@@ -56,7 +56,9 @@ public class BatchScoreCalculator {
             //遍历该指标下的每个数据
             for (SampleValue vo : indexValueVOs) {
                 String sampleId = vo.getSampleId();
-                BigDecimal score = scoreCalculator.normalize(getFinalSampleValue(vo.getSampleValue(), threshold), weight).setScale(6, RoundingMode.HALF_UP);
+                //归一后的值
+                BigDecimal normalizeValue = getFinalSampleValue(vo.getSampleValue(), threshold);
+                BigDecimal score = scoreCalculator.normalize(normalizeValue, weight).setScale(6, RoundingMode.HALF_UP);
                 CalculateResult result = scoreCountOfSamples.get(sampleId);
 
                 if (result == null) {
@@ -67,7 +69,7 @@ public class BatchScoreCalculator {
                     result.setDetails(new ArrayList<>());
                     scoreCountOfSamples.put(sampleId, result);
                 }
-                IndexScoreVo sampleScore = new IndexScoreVo(idx.getIndexId(), idx.getAllParentIndexCode(), score, idx.getWeight());
+                IndexScoreVo sampleScore = new IndexScoreVo(idx.getIndexId(), idx.getAllParentIndexCode(), normalizeValue, idx.getWeight());
                 result.getDetails().add(sampleScore);
                 result.setTotalScore(result.getTotalScore().add(score).setScale(6, RoundingMode.HALF_UP));
             }