[update] 方案管理，路口方向添加状态持续时长

signal-control-service/src/main/java/net/wanji/web/dto/DirListElement.java

@@ -17,6 +17,8 @@ public class DirListElement {
     private Double traffic_index;
     @ApiModelProperty(value = "排队长度", required = true)
     private Double length;
+    @ApiModelProperty(value = "持续时间（单位：分钟）",notes = "")
+    private Integer duration ;
     @ApiModelProperty(value = "是否有行人过街：0否；1是", required = true)
     private Integer isPersonCross;
     private List<LaneListElement> laneList;

signal-control-service/src/main/java/net/wanji/web/po/scheme/CrossDirDataRealtimePO.java

@@ -33,6 +33,10 @@ public class CrossDirDataRealtimePO {
     /** 交通指数 */
     @ApiModelProperty(name = "交通指数",notes = "")
     private Double trafficIndex ;
+    @ApiModelProperty(value = "开始时间：yyyy-MM-dd HH:mm:ss",notes = "")
+    private Date startTime ;
+    @ApiModelProperty(value = "持续时间（单位：分钟）",notes = "")
+    private Integer duration ;
     /** 交通流量（辆） */
     @ApiModelProperty(name = "交通流量（辆）",notes = "")
     private Integer flow ;

signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/CrossConfigServiceImpl.java

@@ -388,6 +388,7 @@ public class CrossConfigServiceImpl implements CrossConfigService {
             dirListElement.setStatus(crossDirDataRealtimePO.getStatus());
             dirListElement.setTraffic_index(crossDirDataRealtimePO.getTrafficIndex());
             dirListElement.setLength(crossDirDataRealtimePO.getLength());
+            dirListElement.setDuration(crossDirDataRealtimePO.getDuration());
             // 获取是否有行人道
             CrossDirInfoPO crossDirInfoPO = crossDirInfoMapper.selectByCrossIdAndDirType(crossId, key);
             Integer isPedestrian = crossDirInfoPO.getIsPedestrian();

signal-control-service/src/main/resources/mapper/scheme/CrossDirDataRealtimeMapper.xml

@@ -2,9 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="net.wanji.web.mapper.scheme.CrossDirDataRealtimeMapper">
 
+    <sql id="baseColumnList">
+        id,dir_type,in_out_type,cross_id,length,status,traffic_index,start_time,duration,flow,speed,queue_length,
+        stop_times,delay_time,sturation,batch_time,gmt_create,gmt_modified
+    </sql>
+
     <select id="selectByCrossIdAndDirType" resultType="net.wanji.web.po.scheme.CrossDirDataRealtimePO">
         select
-            id,dir_type,in_out_type,cross_id,length,status,traffic_index,flow,speed,queue_length,stop_times,delay_time,sturation,batch_time,gmt_create,gmt_modified
+            <include refid="baseColumnList"/>
         from t_cross_dir_data_realtime
         where cross_id = #{crossId} and dir_type = #{key} and in_out_type = 1
     </select>

signal-optimize-service/src/main/java/net/wanji/opt/po/trend/CrossDataRealtimePO.java

@@ -28,9 +28,8 @@ public class CrossDataRealtimePO {
     @ApiModelProperty(value = "交通指数（1~10）",notes = "")
     private Double trafficIndex ;
     /** 开始时间：yyyy-MM-dd HH;mm:ss */
-    @ApiModelProperty(value = "开始时间：yyyy-MM-dd HH",notes = "mm:ss")
+    @ApiModelProperty(value = "开始时间：yyyy-MM-dd HH:mm:ss",notes = "")
     private Date startTime ;
-    /** 持续时间（单位：分钟） */
     @ApiModelProperty(value = "持续时间（单位：分钟）",notes = "")
     private Integer duration ;
     /** 是否失衡：0否；1是 */

signal-optimize-service/src/main/java/net/wanji/opt/po/trend/CrossDirDataHistPO.java

@@ -33,6 +33,10 @@ public class CrossDirDataHistPO {
     /** 交通指数 */
     @ApiModelProperty(name = "交通指数",notes = "")
     private Double trafficIndex ;
+    @ApiModelProperty(value = "开始时间：yyyy-MM-dd HH:mm:ss",notes = "")
+    private Date startTime ;
+    @ApiModelProperty(value = "持续时间（单位：分钟）",notes = "")
+    private Integer duration ;
     /** 交通流量（辆） */
     @ApiModelProperty(name = "交通流量（辆）",notes = "")
     private Integer flow ;