[update] 运行评价-干线方案拥堵指数改为小数

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/MainlineEvaluateServiceImpl.java

@@ -26,6 +26,8 @@ import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -1322,7 +1324,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
                             .min();
                     int value = (int) (minAverage.orElse(0.0) * 100);
 
-                    curveElement.setValue(value);
+                    curveElement.setValue((double) value);
                     curveElementList.add(curveElement);
                 }
             } else if (Objects.equals(metricName, StrategyAndMetricsEnum.Metrics.STOP_TIMES.getDescription())) {
@@ -1342,7 +1344,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
 
                     int value = (int) sumOfAverages;
 
-                    curveElement.setValue(value);
+                    curveElement.setValue((double) value);
                     curveElementList.add(curveElement);
                 }
             } else if (Objects.equals(metricName, StrategyAndMetricsEnum.Metrics.AVERAGE_DELAY.getDescription())) {
@@ -1362,7 +1364,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
 
                     int value = (int) sumOfAverages;
 
-                    curveElement.setValue(value);
+                    curveElement.setValue( (double)value);
                     curveElementList.add(curveElement);
                 }
             } else if (Objects.equals(metricName, StrategyAndMetricsEnum.Metrics.AVERAGE_SPEED.getDescription())) {
@@ -1382,7 +1384,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
 
                     int value = (int) sumOfAverages;
 
-                    curveElement.setValue(value);
+                    curveElement.setValue((double)value);
                     curveElementList.add(curveElement);
                 }
             } else if (Objects.equals(metricName, StrategyAndMetricsEnum.Metrics.MAX_QUEUE_LENGTH.getDescription())) {
@@ -1402,7 +1404,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
 
                     int value = (int) sumOfMax;
 
-                    curveElement.setValue(value);
+                    curveElement.setValue((double)value);
                     curveElementList.add(curveElement);
                 }
             } else if (Objects.equals(metricName, StrategyAndMetricsEnum.Metrics.TRAFFIC_INDEX.getDescription())) {
@@ -1419,10 +1421,9 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
                                     .average()
                                     .orElse(0.0))
                             .average().orElse(0.0);
-
-                    int value = (int) sumOfAverages;
-
-                    curveElement.setValue(value);
+                    BigDecimal bd = new BigDecimal(sumOfAverages).setScale(2, RoundingMode.HALF_UP);
+                    double rounded = bd.doubleValue();
+                    curveElement.setValue(rounded);
                     curveElementList.add(curveElement);
                 }
             }
@@ -1450,9 +1451,9 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
             }
             if (CollectionUtil.isNotEmpty(greenwaveHistPOListHourMinute)) {
                 int value = calculateAverageNotRatio(greenwaveHistPOListHourMinute, function);
-                curveElement.setValue(value);
+                curveElement.setValue((double)value);
             } else {
-                curveElement.setValue(0);
+                curveElement.setValue((double)0);
             }
             curveElementList.add(curveElement);
         }
@@ -1505,9 +1506,9 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
             }
             if (CollectionUtil.isNotEmpty(greenwaveHistPOListHourMinute)) {
                 int value = calculateAverage(greenwaveHistPOListHourMinute, function);
-                curveElement.setValue(value);
+                curveElement.setValue((double)value);
             } else {
-                curveElement.setValue(0);
+                curveElement.setValue((double)0);
             }
             curveElementList.add(curveElement);
         }

signal-optimize-service/src/main/java/net/wanji/opt/vo/MainlineSchemeEvaluateVO.java

@@ -37,7 +37,7 @@ public class MainlineSchemeEvaluateVO {
         private String metricTime;
 
         @ApiModelProperty(value = "数值")
-        private Integer value;
+        private Double value;
     }
 
 }