[add] 绿波周期数据添加行车速度变异系数

signal-optimize-service/src/main/java/net/wanji/opt/entity/GreenwaveHist.java

@@ -93,5 +93,8 @@ public class GreenwaveHist  extends TrackableEntity {
     @ApiModelProperty(value = "路口ID")
     private String crossId;
 
+    @ApiModelProperty(value = "行车速度变异系数")
+    private BigDecimal speedFactor;
+
 
 }

signal-optimize-service/src/main/resources/mapper/GreenwaveHistMapper.xml

@@ -25,6 +25,7 @@
         <result column="direction" property="direction"/>
         <result column="road_direction" property="roadDirection"/>
         <result column="cross_id" property="crossId"/>
+        <result column="speed_factor" property="speedFactor"/>
     </resultMap>
 
 
@@ -35,7 +36,9 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id
-        , green_id, status, type, traffic_index, speed, trval_time, stop_times, queue_length, cong_rate, delay_time, nopark_pass_rate, cord_reliability, cord_queue_ratio, uncoordinate_phase_queue, start_time, gmt_create, gmt_modified,direction
+        , green_id, status, type, traffic_index, speed, trval_time, stop_times, queue_length, cong_rate,
+        delay_time, nopark_pass_rate, cord_reliability, cord_queue_ratio, uncoordinate_phase_queue,
+        start_time, gmt_create, gmt_modified,direction, speed_factor
     </sql>
     <!-- 绿波路口查询 -->
     <select id="findGreenCross" resultType="map">
@@ -60,7 +63,8 @@
         round(AVG(delay_time)) delay_time,
         round(AVG(stop_times),2) stop_times,
         round(AVG(trval_time)) trval_time,
-        round(AVG(if(queue_length=-1,null,queue_length))) queue_length
+        round(AVG(if(queue_length=-1,null,queue_length))) queue_length,
+        speed_factor
         FROM
         t_greenwave_hist
         where 1=1

wj-databus/src/main/java/net/wanji/databus/dao/entity/GreenwaveRealtimePO.java

 package net.wanji.databus.dao.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -15,63 +14,95 @@ import java.util.Date;
 @JsonIgnoreProperties(ignoreUnknown = true)
 @TableName("t_greenwave_realtime")
 public class GreenwaveRealtimePO {
-    /** 绿波ID */
-    @ApiModelProperty(name = "id",notes = "")
+    /**
+     * 绿波ID
+     */
+    @ApiModelProperty(name = "id", notes = "")
     @TableId
-    private Long id ;
-    @ApiModelProperty(name = "绿波ID",notes = "")
+    private Long id;
+    @ApiModelProperty(name = "绿波ID", notes = "")
     private Integer greenId;
-    /** 交通状态：1畅通；2缓行；3拥堵；4严重拥堵；5未知 */
-    @ApiModelProperty(name = "交通状态：1畅通；2缓行；3拥堵；4严重拥堵；5未知",notes = "")
-    private Integer status ;
-    /** 拥堵类型：1常规；2异常 */
-    @ApiModelProperty(name = "拥堵类型：1常规；2异常",notes = "")
-    private Integer type ;
-    /** 交通指数 */
-    @ApiModelProperty(name = "交通指数",notes = "")
-    private Double trafficIndex ;
-    /** 行程速度（km/h） */
-    @ApiModelProperty(name = "行程速度（km/h）",notes = "")
-    private Double speed ;
-    /** 行程时间（秒） */
-    @ApiModelProperty(name = "行程时间（秒）",notes = "")
-    private Integer trvalTime ;
-    /** 停车次数 */
-    @ApiModelProperty(name = "停车次数",notes = "")
-    private Double stopTimes ;
-    /** 拥堵距离（米） */
-    @ApiModelProperty(name = "拥堵距离（米）",notes = "")
-    private Double queueLength ;
-    /** 拥堵比例 */
-    @ApiModelProperty(name = "拥堵比例",notes = "")
-    private Double congRate ;
-    /** 延误时间（秒） */
-    @ApiModelProperty(name = "延误时间（秒）",notes = "")
-    private Integer delayTime ;
-    /** 不停车通过率 */
-    @ApiModelProperty(name = "协调不停车通过率",notes = "")
-    private Double noparkPassRate ;
+    /**
+     * 交通状态：1畅通；2缓行；3拥堵；4严重拥堵；5未知
+     */
+    @ApiModelProperty(name = "交通状态：1畅通；2缓行；3拥堵；4严重拥堵；5未知", notes = "")
+    private Integer status;
+    /**
+     * 拥堵类型：1常规；2异常
+     */
+    @ApiModelProperty(name = "拥堵类型：1常规；2异常", notes = "")
+    private Integer type;
+    /**
+     * 交通指数
+     */
+    @ApiModelProperty(name = "交通指数", notes = "")
+    private Double trafficIndex;
+    /**
+     * 行程速度（km/h）
+     */
+    @ApiModelProperty(name = "行程速度（km/h）", notes = "")
+    private Double speed;
+    /**
+     * 行程时间（秒）
+     */
+    @ApiModelProperty(name = "行程时间（秒）", notes = "")
+    private Integer trvalTime;
+    /**
+     * 停车次数
+     */
+    @ApiModelProperty(name = "停车次数", notes = "")
+    private Double stopTimes;
+    /**
+     * 拥堵距离（米）
+     */
+    @ApiModelProperty(name = "拥堵距离（米）", notes = "")
+    private Double queueLength;
+    /**
+     * 拥堵比例
+     */
+    @ApiModelProperty(name = "拥堵比例", notes = "")
+    private Double congRate;
+    /**
+     * 延误时间（秒）
+     */
+    @ApiModelProperty(name = "延误时间（秒）", notes = "")
+    private Integer delayTime;
+    /**
+     * 不停车通过率
+     */
+    @ApiModelProperty(name = "协调不停车通过率", notes = "")
+    private Double noparkPassRate;
 
-    @ApiModelProperty(name = "协调方案可靠性",notes = "")
-    private Double cordReliability ;
+    @ApiModelProperty(name = "协调方案可靠性", notes = "")
+    private Double cordReliability;
 
-    @ApiModelProperty(name = "协调路段排队空间占比",notes = "")
-    private Double cordQueueRatio ;
+    @ApiModelProperty(name = "协调路段排队空间占比", notes = "")
+    private Double cordQueueRatio;
 
-    /** 非协调相位二次排队 */
-    @ApiModelProperty(name = "非协调相位二次排队",notes = "")
-    private Double uncoordinatePhaseQueue ;
-    /** 创建时间 */
-    @ApiModelProperty(name = "数据时间",notes = "")
+    /**
+     * 非协调相位二次排队
+     */
+    @ApiModelProperty(name = "非协调相位二次排队", notes = "")
+    private Double uncoordinatePhaseQueue;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "数据时间", notes = "")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date startTime ;
-    /** 创建时间 */
-    @ApiModelProperty(name = "创建时间",notes = "")
-    private Date gmtCreate ;
-    /** 修改时间 */
-    @ApiModelProperty(name = "修改时间",notes = "")
-    private Date gmtModified ;
-    /** add 20241123 适配神思数据 */
+    private Date startTime;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "创建时间", notes = "")
+    private Date gmtCreate;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(name = "修改时间", notes = "")
+    private Date gmtModified;
+    /**
+     * add 20241123 适配神思数据
+     */
     @ApiModelProperty(value = "执行策略 失衡 2拥堵 3溢出 4死锁  5 空放", notes = "")
     private Integer strategy;
     @ApiModelProperty(value = "策略执行持续时间；单位：s", notes = "")
@@ -95,6 +126,8 @@ public class GreenwaveRealtimePO {
     private String roadDirection;
     @ApiModelProperty(value = "饱和度", notes = "")
     private Integer sturation;
-    @ApiModelProperty(name = "采集时间（10位时间戳）",notes = "")
-    public Integer batchTime ;
+    @ApiModelProperty(name = "采集时间（10位时间戳）", notes = "")
+    public Integer batchTime;
+    @ApiModelProperty(value = "行车速度变异系数")
+    private Double speedFactor;
 }