From ee00f86b5b6aa0f2725e3bb43eaf5acae8df134b Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 1 Sep 2020 10:27:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E5=BD=92=E4=B8=80=E7=AE=97=E6=B3=95=E6=9E=84=E9=80=A0=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexcal/impl/CpcIndexCalculateServiceImpl.java  | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/CpcIndexCalculateServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/CpcIndexCalculateServiceImpl.java
index aa937dc3d6..26ed23abaa 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/CpcIndexCalculateServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/CpcIndexCalculateServiceImpl.java
@@ -221,13 +221,6 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
     private Map<String, IndexInputVO<BigDecimal>> buildIndexInputVO(List<IndexGroupDetailEntity> indexList, Map<String, Object> minAndMaxMap) {
         Map<String, IndexInputVO<BigDecimal>> map = new HashMap<>();
         for (IndexGroupDetailEntity index : indexList) {
-            IndexInputVO indexInputVO = new IndexInputVO();
-            // 指标code
-            indexInputVO.setIndexId(index.getIndexCode());
-            //权重
-            indexInputVO.setWeight(index.getWeight());
-            //阈值
-            indexInputVO.setThreshold(index.getThreshold());
             BigDecimal minValue = null;
             BigDecimal maxValue = null;
 
@@ -247,10 +240,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
                     ScoreConstants.MAX_SCORE,
                     Correlation.getCorrelation(index.getCorrelation())
             );
-            indexInputVO.setScoreCalculator(scoreCalculator);
-            List<SampleValue<BigDecimal>> sampleValueList = new ArrayList<>();
-            indexInputVO.setIndexValueVOs(sampleValueList);
-
+            IndexInputVO indexInputVO = new IndexInputVO(index.getIndexCode(),new ArrayList<SampleValue<BigDecimal>>(),index.getWeight(),index.getThreshold(),scoreCalculator);
             map.put(index.getIndexCode(), indexInputVO);
         }
         return map;