信控优化-问题路口增加正常路口

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/trend/CrossDirDataHistMapper.java

@@ -14,5 +14,5 @@ import java.util.List;
 @Repository
 public interface CrossDirDataHistMapper {
 
-    List<CrossDirDataHistPO> selectByCrossIdAndTimestamp(String crossId, long preSeconds, long afterSeconds);
+    List<CrossDirDataHistPO> selectByCrossIdAndTimestamp(String crossId, long preSeconds);
 }

signal-optimize-service/src/main/java/net/wanji/opt/dto/trend/AbnormalCrossListDTO.java

@@ -7,7 +7,7 @@ import lombok.Data;
 @Data
 @ApiModel(value = "AbnormalCrossListDTO", description = "问题路口列表输入参数")
 public class AbnormalCrossListDTO {
-    @ApiModelProperty(value = "路口状态 1失衡 2拥堵 3溢出", notes = "", required = false)
+    @ApiModelProperty(value = "路口状态 0正常 1失衡 2拥堵 3溢出", notes = "", required = false)
     private Integer status;
     @ApiModelProperty(value = "路口名称", notes = "", required = false)
     private String name;

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

@@ -212,12 +212,14 @@ public class TrendServiceImpl implements TrendService {
 
     private List<AbnormalCrossDetailVO.DirDataElement> buildDirData(String crossId) {
         List<AbnormalCrossDetailVO.DirDataElement> dirData = new ArrayList<>();
-        // 获取当前时间前后20分钟的10位时间戳
+        // 获取当前时间之前40分钟的10位时间戳
         long currentSeconds = DateUtil.currentSeconds();
-        long preSeconds = currentSeconds - 20 * 60;
-        long afterSeconds = currentSeconds + 20 * 60;
+
+        // todo 演示用，固定当前时间为 2023-02-11 10:30:00
+        currentSeconds = 1676082600L;
+        long preSeconds = currentSeconds - 40 * 60;
         List<CrossDirDataHistPO> crossDirDataHistPOList =
-                crossDirDataHistMapper.selectByCrossIdAndTimestamp(crossId, preSeconds, afterSeconds);
+                crossDirDataHistMapper.selectByCrossIdAndTimestamp(crossId, preSeconds);
 
         for (CrossDirDataHistPO crossDirDataHistPO : crossDirDataHistPOList) {
             AbnormalCrossDetailVO.DirDataElement dirDataElement = new AbnormalCrossDetailVO.DirDataElement();
@@ -279,12 +281,15 @@ public class TrendServiceImpl implements TrendService {
     private static void buildAbnormalCrossStats(AbnormalCrossVO abnormalCrossVO,
                                                 List<AbnormalCrossListVO> abnormalCrossListVOList) {
         AbnormalCrossStats abnormalCrossStats = new AbnormalCrossStats();
+        Integer normal = abnormalCrossStats.getNormal();
         Integer unbalance = abnormalCrossStats.getUnbalance();
         Integer congestion = abnormalCrossStats.getCongestion();
         Integer spillover = abnormalCrossStats.getSpillover();
         for (AbnormalCrossListVO abnormalCrossListVO : abnormalCrossListVOList) {
             Integer realtimeStatus = abnormalCrossListVO.getRealtimeStatus();
-            if (realtimeStatus == 1) {
+            if (realtimeStatus == 0) {
+                normal += 1;
+            } else if (realtimeStatus == 1) {
                 unbalance += 1;
             } else if (realtimeStatus == 2) {
                 congestion += 1;
@@ -301,6 +306,7 @@ public class TrendServiceImpl implements TrendService {
                 spillover += 1;
             }
         }
+        abnormalCrossStats.setNormal(normal);
         abnormalCrossStats.setUnbalance(unbalance);
         abnormalCrossStats.setCongestion(congestion);
         abnormalCrossStats.setSpillover(spillover);

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

@@ -17,7 +17,7 @@ import java.util.List;
 @NoArgsConstructor
 @ApiModel(value = "AbnormalCrossListVO", description = "问题路口详情")
 public class AbnormalCrossDetailVO {
-    @ApiModelProperty(value = "路口状态：1失衡；2拥堵；3溢出")
+    @ApiModelProperty(value = "路口状态：0正常；1失衡；2拥堵；3溢出")
     private Integer crossStatus;
     @ApiModelProperty(value = "最大排队")
     private Double crossQueueLength;

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

@@ -24,7 +24,7 @@ public class AbnormalCrossListVO {
     private String congestionDirs;
     @ApiModelProperty(value = "溢出方向 如 1,2,3")
     private String spilloverDirs;
-    @ApiModelProperty(value = "路口状态 1失衡 2拥堵 3溢出")
+    @ApiModelProperty(value = "路口状态 0正常 1失衡 2拥堵 3溢出")
     private Integer realtimeStatus;
     @ApiModelProperty(value = "开始时间 格式 08:20:23")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm:ss", timezone = "GMT+8")

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

@@ -13,6 +13,8 @@ import lombok.NoArgsConstructor;
 @Data
 @ApiModel(value = "AbnormalCrossStats", description = "问题路口统计信息")
 public class AbnormalCrossStats {
+    @ApiModelProperty(value = "正常数量")
+    private Integer normal = 0;
     @ApiModelProperty(value = "失衡数量")
     private Integer unbalance = 0;
     @ApiModelProperty(value = "拥堵数量")

signal-optimize-service/src/main/resources/mapper/trend/CrossDataRealtimeMapper.xml

@@ -22,7 +22,7 @@
                 and t1.type = #{type}
             </if>
             <if test="status == null">
-                and t1.status in (1, 2, 3)
+                and t1.status in (0, 1, 2, 3)
             </if>
         </where>
     </select>

signal-optimize-service/src/main/resources/mapper/trend/CrossDirDataHist.xml

@@ -9,7 +9,6 @@
         from t_cross_dir_data_hist
         where cross_id = #{crossId} and in_out_type = 1
           and batch_time <![CDATA[ >= ]]> #{preSeconds}
-          and batch_time <![CDATA[ <= ]]> #{afterSeconds}
         order by batch_time
     </select>
 </mapper>