新增交通流量参数

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/implv2/CrossServiceImpl.java

@@ -93,7 +93,7 @@ public class CrossServiceImpl implements CrossService {
         params.put("endDate", date + " 23:59:59");
         params.put("groupType", groupType);
         params.put("objectType", objectType);
-        // 方向级时多传一个dir参数
+
         if (objectType == 1) params.put("dir", condition);
         if (objectType == 2) params.put("dir", condition.split(":")[0]);
         if (objectType == 3) params.put("dir", condition.split(":")[0]);
@@ -114,6 +114,7 @@ public class CrossServiceImpl implements CrossService {
             cd.setStopTimes(c.getStopTimes());
             cd.setQueueLength(c.getAvgQueueLength());
             cd.setLaneNo(c.getLaneNo());
+            cd.setFlow(c.getFlow());
 
             results.add(cd);
         }

signal-optimize-service/src/main/java/net/wanji/opt/vo2/CrossStatusDistributionVO.java

@@ -3,10 +3,6 @@ package net.wanji.opt.vo2;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.wanji.opt.synthesis.pojo.CrossStatusDisOptTimeEntity;
-
-import java.util.Date;
-import java.util.List;
 
 @Data
 @ApiModel(value = "CrossStatusDistributionVO", description = "监测详情-路口事件详情-路口状态分布")
@@ -31,4 +27,6 @@ public class CrossStatusDistributionVO {
     private Integer turnType;
     @ApiModelProperty(value = "转向功能描述", notes = "")
     private String turnTypeName;
+    @ApiModelProperty(value = "交通流量")
+    private Integer flow;
 }