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

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

@@ -78,7 +78,7 @@ public class IndexCalculateController {
      * 处理暂停中的计算
      */
     @PostMapping("process-pendding-cals")
-    public void processPenddingCalculate() {
+    public Result processPenddingCalculate() {
         String keyPrefix = RedisKeys.getCustomerStatsCalKeyPrefix();
         Set<String> calFlagKeys = redisUtils.keys(keyPrefix.concat("*"));
         calFlagKeys.forEach(key -> {
@@ -91,6 +91,8 @@ public class IndexCalculateController {
                 indexCalculate(form);
             }
         });
+
+        return new Result();
     }
 
     /**

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

@@ -170,7 +170,7 @@ public class DemoScoreCal {
         List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO, index3VO, index4VO);
 
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
-        HashMap<String, BigDecimal> result = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
+        HashMap<String, CalculateResult> result = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
 
         HashMap<String, CalculateResult> result2 = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
 
@@ -244,13 +244,8 @@ public class DemoScoreCal {
 
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         System.out.println("param:" + JSON.toJSONString(indexInputVOS));
-        HashMap<String, BigDecimal> result = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
         HashMap<String, CalculateResult> result2 = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
 
-        System.err.println("----------------1----------------");
-        result.forEach((key, value) -> {
-            System.out.println(key.concat("的得分为:").concat(value.toString()));
-        });
         System.err.println("-----------------2---------------");
 
         System.err.println("----------------11111111----------------");