批量计算分值：新增方法，计算每个样本的所有指标的总得分

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

@@ -190,7 +190,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
         //构造入参
         List<IndexInputVO> indexInputVOS = this.getIndexInputVOList(indexMap);
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
-        return batchScoreCalculator.exec(indexInputVOS);
+        return batchScoreCalculator.getScoreDetailOfIndexId(indexInputVOS);
     }
 
     /**

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

@@ -130,7 +130,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                         IndexInputVO<Integer> index1VO = new IndexInputVO<>(indexGroup.getIndexId(), ll, indexGroup.getWeight(), sc1);
                         List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO);
                         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
-                        List<IndexOutputVO> result = batchScoreCalculator.exec(indexInputVOS);
+                        List<IndexOutputVO> result = batchScoreCalculator.getScoreDetailOfIndexId(indexInputVOS);
                         result.get(NumConstant.ZERO).getIndexScoreVOs().forEach(agency -> {
                             communityPublishArticle.forEach(publish -> {
                                 if (publish.getAgencyId().equals(agency.getSampleId())){

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

@@ -3,18 +3,20 @@ package com.epmet.support.normalizing.batch;
 import com.epmet.support.normalizing.ScoreCalculator;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
 public class BatchScoreCalculator {
 
     /**
-     * 执行计算
+     * 执行计算，每个指标中每个样本的得分明细
      * @return 每一条都是一个指标的，所有样本对应的，得分值
      */
-    public List<IndexOutputVO> exec(List<IndexInputVO> indexInputVOS) {
+    public List<IndexOutputVO> getScoreDetailOfIndexId(List<IndexInputVO> indexInputVOS) {
 
         return indexInputVOS.stream().map(i -> {
+            // 每个指标循环一次
             String indexId = i.getIndexId();
             List<SampleValue> indexValueVOs = i.getIndexValueVOs();
             BigDecimal weight = i.getWeight();
@@ -30,4 +32,34 @@ public class BatchScoreCalculator {
         }).collect(Collectors.toList());
     }
 
+    /**
+     * 执行计算，以样本的所有指标总得分
+     * @param indexInputVOS
+     * @return
+     */
+    public HashMap<String, BigDecimal> getScoreCountOfSampleId(List<IndexInputVO> indexInputVOS) {
+
+        // 每个样本的总得分
+        HashMap<String, BigDecimal> scoreCountOfSamples = new HashMap<>();
+
+        for (IndexInputVO idx : indexInputVOS) {
+            // 每个指标循环一次
+            List<SampleValue> indexValueVOs = idx.getIndexValueVOs();
+            BigDecimal weight = idx.getWeight();
+            ScoreCalculator scoreCalculator = idx.getScoreCalculator();
+
+            for (SampleValue vo : indexValueVOs) {
+                String sampleId = vo.getSampleId();
+                BigDecimal score = scoreCalculator.normalize(vo.getSampleValue(), weight);
+                if (scoreCountOfSamples.containsKey(sampleId)) {
+                    BigDecimal newScore = scoreCountOfSamples.get(sampleId).add(score);
+                    scoreCountOfSamples.put(sampleId, newScore);
+                } else {
+                    scoreCountOfSamples.put(sampleId, score);
+                }
+            }
+        }
+
+        return scoreCountOfSamples;
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/normalizing/DemoScoreCal.java

@@ -9,6 +9,7 @@ import org.junit.Test;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 public class DemoScoreCal {
@@ -83,7 +84,7 @@ public class DemoScoreCal {
         List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO);
 
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
-        List<IndexOutputVO> result = batchScoreCalculator.exec(indexInputVOS);
+        List<IndexOutputVO> result = batchScoreCalculator.getScoreDetailOfIndexId(indexInputVOS);
 
         System.err.println("--------------------------------");
         result.stream().forEach(r -> System.out.println(r));
@@ -109,7 +110,7 @@ public class DemoScoreCal {
         List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO);
 
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
-        List<IndexOutputVO> result = batchScoreCalculator.exec(indexInputVOS);
+        List<IndexOutputVO> result = batchScoreCalculator.getScoreDetailOfIndexId(indexInputVOS);
 
         System.err.println("--------------------------------");
         result.stream().forEach(r -> System.out.println(r));
@@ -117,5 +118,32 @@ public class DemoScoreCal {
         System.err.println("--------------------------------");
     }
 
+    @Test
+    public void testBigDecimalBatchCalculateGroupBySampleId() throws InterruptedException {
+        //{4,8,1,3,2}
+
+        // 每个指标需要单独的分支计算器，因为每个指标的最大最小值是不同的
+        ScoreCalculator sc1 = new BigDecimalScoreCalculator(new BigDecimal(1), new BigDecimal(8), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.NEGATIVE);
+        ScoreCalculator sc2 = new BigDecimalScoreCalculator(new BigDecimal(1), new BigDecimal(8), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.NEGATIVE);
+
+        List<SampleValue> index1SampleValues = Arrays.asList(new SampleValue<>("id1", new BigDecimal(4)), new SampleValue<>("id2", new BigDecimal(1)), new SampleValue<>("id3", new BigDecimal(8)));
+        List<SampleValue> index2SampleValues = Arrays.asList(new SampleValue<>("id1", new BigDecimal(1)), new SampleValue<>("id2", new BigDecimal(8)), new SampleValue<>("id3", new BigDecimal(3)));
+
+        // 每个指标的信息，包括样本列表，权重，指标标记
+        IndexInputVO index1VO = new IndexInputVO("aaa", index1SampleValues, new BigDecimal(1), sc1);
+        IndexInputVO index2VO = new IndexInputVO("bbb", index2SampleValues, new BigDecimal(1), sc2);
+
+        List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO);
+
+        BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
+        HashMap<String, BigDecimal> result = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
+
+        System.err.println("--------------------------------");
+        result.forEach((key, value) -> {
+            System.out.println(key.concat("的得分为:").concat(value.toString()));
+        });
+        System.err.println("--------------------------------");
+    }
+
 
 }