[add] 方案优化曲线无数据优化

signal-optimize-service/src/main/java/net/wanji/opt/common/enums/CrossOptStrategyEnum.java → signal-optimize-service/src/main/java/net/wanji/opt/common/enums/CrossOptResultStrategyEnum.java

@@ -9,8 +9,9 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum CrossOptStrategyEnum {
-    ZERO(0, "无策略"),
+public enum CrossOptResultStrategyEnum {
+    // 优化策略
+    ZERO(0, "均衡调控"),
     ONE(1, "绿灯空放"),
     TWO(2, "失衡"),
     THREE(3, "溢出");
@@ -19,11 +20,11 @@ public enum CrossOptStrategyEnum {
     private String desc;
 
     public static String getDesc(int code) {
-        for (CrossOptStrategyEnum value : CrossOptStrategyEnum.values()) {
+        for (CrossOptResultStrategyEnum value : CrossOptResultStrategyEnum.values()) {
             if (code == value.code) {
                 return value.getDesc();
             }
         }
-        return "无策略";
+        return CrossOptResultStrategyEnum.ZERO.getDesc();
     }
 }

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

@@ -10,7 +10,7 @@ import net.wanji.databus.dao.mapper.CrossDataRealtimeMapper;
 import net.wanji.databus.dao.mapper.CrossDirDataHistMapper;
 import net.wanji.databus.dao.mapper.CrossDirDataRealtimeMapper;
 import net.wanji.databus.po.*;
-import net.wanji.opt.common.enums.CrossOptStrategyEnum;
+import net.wanji.opt.common.enums.CrossOptResultStrategyEnum;
 import net.wanji.opt.common.enums.OptStatusEnum;
 import net.wanji.opt.common.enums.StrategyControlEnum;
 import net.wanji.opt.dao.mapper.HoloEventMapper;
@@ -95,7 +95,6 @@ public class CrossIndexServiceImpl implements CrossIndexService {
             for (StrategyCrossResultEntity entity : list) {
                 CrossOptResult crossOptResult = new CrossOptResult();
                 Date date = entity.getIssueTime();
-                //Date date = DateUtil.parse(entity.getIssueTime(), "yyyy-MM-dd HH:mm:ss");
                 crossOptResult.setTimeStamp(date);
                 Integer countDown = entity.getCountDown();
                 if (entity.getCurrentAlgo() == 2) {
@@ -104,9 +103,17 @@ public class CrossIndexServiceImpl implements CrossIndexService {
                 crossOptResult.setCountDown(countDown);
                 Integer currentAlgo = entity.getCurrentAlgo();
                 crossOptResult.setStrategy(currentAlgo);
-                crossOptResult.setStrategyName(CrossOptStrategyEnum.getDesc(currentAlgo));
+                crossOptResult.setStrategyName(CrossOptResultStrategyEnum.getDesc(currentAlgo));
                 crossOptResults.add(crossOptResult);
             }
+        } else {
+            // 如果当前时间没有数据
+            CrossOptResult crossOptResult = new CrossOptResult();
+            crossOptResult.setTimeStamp(new Date());
+            crossOptResult.setCountDown(0);
+            crossOptResult.setStrategy(0);
+            crossOptResult.setStrategyName(CrossOptResultStrategyEnum.getDesc(0));
+            crossOptResults.add(crossOptResult);
         }
         return crossOptResults;
     }
@@ -172,13 +179,13 @@ public class CrossIndexServiceImpl implements CrossIndexService {
             for (Map.Entry<Integer, List<StrategyCrossResultEntity>> entry : listMap.entrySet()) {
                 Integer currentAlgo = entry.getKey();
                 List<StrategyCrossResultEntity> value = entry.getValue();
-                if (Objects.equals(currentAlgo, CrossOptStrategyEnum.ONE.getCode())) {
+                if (Objects.equals(currentAlgo, CrossOptResultStrategyEnum.ONE.getCode())) {
                     crossStatusCountVO.setPhaseEmptyCount(value.size());
                 }
-                if (Objects.equals(currentAlgo, CrossOptStrategyEnum.TWO.getCode())) {
+                if (Objects.equals(currentAlgo, CrossOptResultStrategyEnum.TWO.getCode())) {
                     crossStatusCountVO.setUnbalanceCount(value.size());
                 }
-                if (Objects.equals(currentAlgo, CrossOptStrategyEnum.THREE.getCode())) {
+                if (Objects.equals(currentAlgo, CrossOptResultStrategyEnum.THREE.getCode())) {
                     crossStatusCountVO.setOverFlowCount(value.size());
                 }
             }