[add] 优化时间优化

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/controller/StrategyControlController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.ws.rs.core.MediaType;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 /**

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

@@ -468,9 +468,6 @@ public class StrategyControlServiceImpl implements StrategyControlService {
         }
         // 绿波优化次数
         long current = System.currentTimeMillis();
-        int greenOptCount = 0;
-        int greenOptTime = 0;
-        long endTime = current;
         LambdaQueryWrapper<StrategyGreenOptHistEntity> greenQuery = new LambdaQueryWrapper<>();
         greenQuery.ge(StrategyGreenOptHistEntity::getControlTime, midNight);
         greenQuery.eq(StrategyGreenOptHistEntity::getResponseCode, 200);
@@ -480,6 +477,9 @@ public class StrategyControlServiceImpl implements StrategyControlService {
             Map<Integer, List<StrategyGreenOptHistEntity>> listMap = entities.stream().collect(Collectors.groupingBy(StrategyGreenOptHistEntity::getGreenId));
             for (Map.Entry<Integer, List<StrategyGreenOptHistEntity>> entry : listMap.entrySet()) {
                 Integer greenId = entry.getKey();
+                int greenOptCount = 0;
+                int greenOptTime = 0;
+                long endTime = current;
                 List<StrategyGreenOptHistEntity> value = entry.getValue();
                 // 策略正常结束
                 StrategyGreenOptHistEntity last = value.get(0);
@@ -505,10 +505,12 @@ public class StrategyControlServiceImpl implements StrategyControlService {
                     }
                     endTime = controlLong;
                 }
+                optCount += greenOptCount;
+                optTime += greenOptTime;
             }
         }
-        strategyOptTimesVO.setCount(optCount + greenOptCount);
-        strategyOptTimesVO.setTimes(optTime + greenOptTime);
+        strategyOptTimesVO.setCount(optCount);
+        strategyOptTimesVO.setTimes(optTime);
         return JsonViewObject.newInstance().success(strategyOptTimesVO);
     }