[add] AI路口查询逻辑优化

signal-optimize-service/pom.xml

@@ -18,6 +18,11 @@
     </properties>
 
     <dependencies>
+        <!--客户端负载均衡loadbalancer-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-spring-boot-starter</artifactId>

signal-optimize-service/src/main/java/net/wanji/opt/common/enums/EventStatusEnum.java

@@ -16,8 +16,9 @@ public enum EventStatusEnum {
     ZERO(0, "未处理"),
     ONE(1, "分析中"),
     TWO(2, "优化中"),
-    THREE(3, "优化中"),
-    FOUR(4, "已结束");
+    THREE(3, "优化完"),
+    // 信控没有已结束，优化完
+    FOUR(4, "优化完");
     private Integer code;
     private String desc;
 

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

@@ -92,9 +92,9 @@ public class CrossIndexServiceImpl implements CrossIndexService {
         if (!CollectionUtils.isEmpty(list)) {
             for (StrategyCrossResultEntity entity : list) {
                 CrossOptResult crossOptResult = new CrossOptResult();
-                Date date = DateUtil.parse(entity.getIssueTime(), "yyyy-MM-dd HH:mm:ss");
+                Date date = entity.getIssueTime();
+                //Date date = DateUtil.parse(entity.getIssueTime(), "yyyy-MM-dd HH:mm:ss");
                 crossOptResult.setTimeStamp(date);
-                String timingPlan = entity.getTimingPlan();
                 Integer countDown = entity.getCountDown();
                 if (entity.getCurrentAlgo() == 2) {
                     countDown = 5;
@@ -127,9 +127,18 @@ public class CrossIndexServiceImpl implements CrossIndexService {
                     aiOptResultVO.setStrategy(currentAlgo);
                     // 失衡 均衡调控，其他效率提升
                     aiOptResultVO.setOptMethod(Objects.equals(1, currentAlgo) ? StrategyControlEnum.ONE.getMethod() : StrategyControlEnum.TWO.getMethod());
-                    // 失衡 优化中，其他，优化完
-                    Integer optStatus = Objects.equals(1, currentAlgo) ? OptStatusEnum.ONE.getCode() : OptStatusEnum.TWO.getCode();
-                    aiOptResultVO.setOptStatus(optStatus);
+                    // 失衡 优化中，15分钟内，优化中，其他，优化完
+                    aiOptResultVO.setOptStatus(OptStatusEnum.TWO.getCode());
+                    if (Objects.equals(1, currentAlgo)) {
+                        Date issueTimeDate = resultEntity.getIssueTime();
+                        //Date issueTimeDate = DateUtils.parseDate(issueTime);
+                        long optTime = issueTimeDate.getTime();
+                        long currentTimeMillis = System.currentTimeMillis();
+                        long offset = currentTimeMillis - optTime;
+                        if (offset <= 15 * 60 * 1000) {
+                            aiOptResultVO.setOptStatus(OptStatusEnum.ONE.getCode());
+                        }
+                    }
                     aiOptResultVO.setOptStatusName(Objects.equals(1, currentAlgo) ? OptStatusEnum.ONE.getDesc() : OptStatusEnum.TWO.getDesc());
                     if (Objects.isNull(currentAlgo)) {
                         aiOptResultVO.setOptStatus(-1);

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/pojo/StrategyCrossResultEntity.java

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import net.wanji.common.utils.tool.DateUtil;
+
+import java.util.Date;
 
 /**
  * @author duanruiming
@@ -24,10 +27,10 @@ public class StrategyCrossResultEntity {
     private Integer currentAlgo;
     @TableField("request_time")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private String requestTime;
+    private Date requestTime;
     @TableField("issue_time")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private String issueTime;
+    private Date issueTime;
     @TableField("response_code")
     private Integer responseCode;
     @TableField("timing_plan")

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

@@ -210,7 +210,9 @@ public class StrategyControlServiceImpl implements StrategyControlService {
                 histVO.setWkt(coordinateByCrossId.replace("POINT(", "").replace(" ", ",").replace(")", ""));
                 histVO.setStrategy(resultEntity.getCurrentAlgo());
                 histVO.setStrategyName(StrategyCrossAlgoEnum.getDescByCode(resultEntity.getCurrentAlgo()));
-                histVO.setOptTime(resultEntity.getIssueTime());
+                Date issueTime = resultEntity.getIssueTime();
+                String format = net.wanji.common.utils.tool.DateUtil.format(issueTime, Constants.DATE_FORMAT.valueOf("yyyy-MM-dd HH:mm:ss"));
+                histVO.setOptTime(format);
                 histVO.setResult(Objects.equals(200, resultEntity.getResponseCode()) ? "成功" : "失败");
                 results.add(histVO);
             }