diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java index b7499bd76f..b9491f1cf2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java +++ b/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 calFlagKeys = redisUtils.keys(keyPrefix.concat("*")); calFlagKeys.forEach(key -> { @@ -91,6 +91,8 @@ public class IndexCalculateController { indexCalculate(form); } }); + + return new Result(); } /** diff --git a/epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/normalizing/DemoScoreCal.java b/epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/normalizing/DemoScoreCal.java index 37b70e5297..16549e9b47 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/normalizing/DemoScoreCal.java +++ b/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 indexInputVOS = Arrays.asList(index1VO, index2VO, index3VO, index4VO); BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator(); - HashMap result = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS); + HashMap result = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS); HashMap result2 = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS); @@ -244,13 +244,8 @@ public class DemoScoreCal { BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator(); System.out.println("param:" + JSON.toJSONString(indexInputVOS)); - HashMap result = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS); HashMap 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----------------");