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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java

@@ -11,6 +11,7 @@ import org.springframework.core.env.Environment;
  * @date 2020-07-03 11:14
  **/
 public enum EnvEnum {
+	LOCAL("local", "本地环境"),
 	DEV("dev", "开发环境"),
 	TEST("test", "体验环境"),
 	PROD("prod", "生产环境"),

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

@@ -2,6 +2,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
+import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
@@ -24,10 +25,7 @@ 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;
@@ -186,7 +184,7 @@ public class IndexCalculateController {
             future.cancel(true);
             redisUtils.delete(RedisKeys.getCustomerStatsCalFlag(customerId));
             futureMap.remove(customerId);
-            HttpClientManager.getInstance().sendAlarmMsg(String.format("数据统计服务-中止计算成功，customerId:%s", customerId));
+            HttpClientManager.getInstance().sendAlarmMsg(String.format(EnvEnum.getCurrentEnv().getName() + "数据统计服务-中止计算成功，customerId:%s", customerId));
         }
         return new Result();
     }
@@ -195,7 +193,7 @@ public class IndexCalculateController {
     public Result<Boolean> calculateAll(@RequestBody CalculateCommonFormDTO formDTO) {
         long start = System.currentTimeMillis();
         Boolean aBoolean = indexCalculateService.indexCalculate(formDTO);
-        HttpClientManager.getInstance().sendAlarmMsg("客户Id：" + formDTO.getCustomerId() + ",calculateAll全部指标计算完成,是否成功：" + aBoolean + "，总耗时：" + (System.currentTimeMillis() - start) / 1000 + "秒");
+        HttpClientManager.getInstance().sendAlarmMsg(EnvEnum.getCurrentEnv().getName() + "客户Id：" + formDTO.getCustomerId() + ",calculateAll全部指标计算完成,是否成功：" + aBoolean + "，总耗时：" + (System.currentTimeMillis() - start) / 1000 + "秒");
         if (aBoolean) {
             return new Result<Boolean>().ok(true);
         }

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

@@ -57,8 +57,8 @@ public class BatchScoreCalculator {
             for (SampleValue vo : indexValueVOs) {
                 String sampleId = vo.getSampleId();
                 //归一后的值
-                BigDecimal normalizeValue = getFinalSampleValue(vo.getSampleValue(), threshold);
-                BigDecimal score = scoreCalculator.normalize(normalizeValue, weight).setScale(6, RoundingMode.HALF_UP);
+                BigDecimal normalizeValue = scoreCalculator.normalize(getFinalSampleValue(vo.getSampleValue(), threshold));
+                BigDecimal score = normalizeValue.multiply(weight).setScale(6, RoundingMode.HALF_UP);
                 CalculateResult result = scoreCountOfSamples.get(sampleId);
 
                 if (result == null) {
@@ -78,40 +78,6 @@ public class BatchScoreCalculator {
         return scoreCountOfSamples;
     }
 
-    /**
-     * 执行计算，以样本的所有指标总得分
-     *
-     * @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();
-            BigDecimal threshold = idx.getThreshold();
-
-            for (SampleValue vo : indexValueVOs) {
-                String sampleId = vo.getSampleId();
-                BigDecimal score = scoreCalculator.normalize(getFinalSampleValue(vo.getSampleValue(), threshold), weight);
-                if (scoreCountOfSamples.containsKey(sampleId)) {
-                    BigDecimal newScore = scoreCountOfSamples.get(sampleId).add(score).setScale(6, RoundingMode.HALF_UP);
-                    scoreCountOfSamples.put(sampleId, newScore);
-                } else {
-                    score.setScale(6, RoundingMode.HALF_UP);
-                    scoreCountOfSamples.put(sampleId, score);
-                }
-            }
-        }
-
-        return scoreCountOfSamples;
-    }
-
     /**
      * 获取最终样本值
      *

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenIndexDataMonthlyDao.xml

@@ -71,9 +71,9 @@
             PARENT_ID parentId,
             ORG_NAME orgName,
             SUM(INDEX_TOTAL) / #{monthCount} as indexTotal,
-            SUM(PARTY_DEV_ABLITY) / #{monthCount} as partyDevAblity,
-            SUM(SERVICE_ABLITY) / #{monthCount} as serviceAblity,
-            SUM(GOVERN_ABLITY) / #{monthCount} as governAblity
+            SUM(PARTY_DEV_ABLITY  * PARTY_DEV_WEIGHT) / #{monthCount} as partyDevAblity,
+            SUM(SERVICE_ABLITY * SERVICE_ABLITY_WEIGHT) / #{monthCount} as serviceAblity,
+            SUM(GOVERN_ABLITY * GOVERN_ABLITY_WEIGHT) / #{monthCount} as governAblity
          FROM screen_index_data_monthly
          WHERE DEL_FLAG = '0'
          AND YEAR_ID = #{yearId}

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

@@ -172,11 +172,20 @@ public class DemoScoreCal {
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         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("----------------123123123123----------------");
+        result2.forEach((key, value) -> {
+            System.out.println(key.concat("的得分为:").concat(value.toString()));
+        });
+        System.err.println("-----------------2---------------");
     }