[add] 优化监测优化次数更新

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

@@ -212,7 +212,8 @@ public class StrategyControlServiceImpl implements StrategyControlService {
             log.error("优化策略查询失败：", e);
             JsonViewObject.newInstance().fail("优化策略查询失败");
         }
-        List<StrategyControlHistVO> sorted = results.stream().sorted(Comparator.comparing(StrategyControlHistVO::getOptTime).reversed()).collect(Collectors.toList());
+        List<StrategyControlHistVO> sorted = results.stream().sorted(Comparator.comparing(StrategyControlHistVO::getOptTime).reversed())
+                .limit(3000).collect(Collectors.toList());
         return JsonViewObject.newInstance().success(sorted);
     }
 
@@ -388,7 +389,7 @@ public class StrategyControlServiceImpl implements StrategyControlService {
     }
 
     @Override
-    public JsonViewObject strategyOptTimes() throws Exception {
+    public JsonViewObject  strategyOptTimes() throws Exception {
         String timeUrl = "http://37.12.182.29:15020/decisionPage/MonitorStrategyOptimizationInfo/getData";
         String timeResult = OkHttpClientUtil.get(timeUrl);
         ObjectMapper mapper = JacksonUtils.getInstance();
@@ -398,21 +399,15 @@ public class StrategyControlServiceImpl implements StrategyControlService {
             List<StrategyOptTimesDTO.Detail> content = dto.getContent();
             if (!CollectionUtils.isEmpty(content)) {
                 Double totalTime = 0.0;
+                int count = 0;
                 for (StrategyOptTimesDTO.Detail item : content) {
                     totalTime += item.getOptimizeTime();
+                    count += item.getExecuteNum();
                 }
-                Double temp = Math.floor(totalTime / 3600);
-                strategyOptTimesVO.setTimes(temp.intValue());
+                strategyOptTimesVO.setTimes(totalTime.intValue());
+                strategyOptTimesVO.setCount(count);
             }
         }
-        String countUrl = "http://37.12.182.29:15020/decisionPage/MonitorRadarIndicatorsInfo/getRadarCountData";
-        String countResult = OkHttpClientUtil.get(countUrl);
-        if (StringUtils.isNotBlank(countResult)) {
-            StrategyOptCountDTO strategyOptCountDTO = mapper.readValue(countResult, StrategyOptCountDTO.class);
-            StrategyOptCountDTO.Detail content = strategyOptCountDTO.getContent();
-            int count = content.getCongestionNum() + content.getEmptyPassNum() + content.getSpilloverNum() + content.getUnbalanceNum();
-            strategyOptTimesVO.setCount(count);
-        }
         return JsonViewObject.newInstance().success(strategyOptTimesVO);
     }