Commit 43fab979 authored by duanruiming's avatar duanruiming

[update] 事件添加方向转向

parent 1c111fdf
......@@ -2,6 +2,7 @@ package net.wanji.datacenter.pojo.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
......@@ -26,4 +27,11 @@ public class EventDataDTO {
private String eventLevel;
private String greenId;
private Integer eventStatus;
/**
* add 20250107
*/
private String turn;
private Double unbalanceIndex;
private Double spilloverIndex;
}
......@@ -150,8 +150,20 @@ public class EventInfoPO {
private Integer dt;
@ApiModelProperty(name = "路口所属绿波编号", notes = "")
private String greenId;
/**
* 事件方向转向
*/
@ApiModelProperty(name = "事件方向,溢出方向", notes = "")
private String dir;
@ApiModelProperty(name = "事件方向,溢出方向", notes = "")
private String turn;
@ApiModelProperty(name = "失衡指数1-10", notes = "")
private Double unbalanceIndex;
/**
* 溢出程度的刻画(没溢出:1,即将溢出:3,溢出:5,溢停:7)
*/
@ApiModelProperty(name = "溢出指数1-10", notes = "")
private Double spilloverIndex;
@ApiModelProperty(name = "告警状态 0其他 1分析中 2优化中 3优化完", notes = "")
private Integer alarmStatus;
@ApiModelProperty(name = "优化状态 0-未优化 1-优化过", notes = "")
......
......@@ -37,16 +37,20 @@
<result column="video_urls" property="videoUrls"/>
<result column="dt" property="dt"/>
<result column="green_id" property="greenId"/>
<result column="dir" property="dir"/>
<result column="alarm_status" property="alarmStatus"/>
<result column="opt_status" property="optStatus"/>
<result column="modify_time" property="modifyTime"/>
<!-- add 20250107 -->
<result column="dir" property="dir"/>
<result column="turn" property="turn"/>
<result column="unbalance_index" property="unbalanceIndex"/>
<result column="spillover_index" property="spilloverIndex"/>
</resultMap>
<sql id="Base_Column_List">
oid,plate_no,object_type,confidence,detect_time,grade,place_desc,lng,lat,category,type,start_time,end_time,
duration,source,ruksj,lane_id,rid,segment_id,cross_id,camera_oid,event_serial_number,data_status,global_id,
station_id,event_id,dt,green_id,dir,opt_status
station_id,event_id,dt,green_id,dir,opt_status, turn, unbalance_index, spillover_index
</sql>
<select id="selectHistEvent" resultType="net.wanji.datacenter.pojo.po.EventInfoPO">
......@@ -98,7 +102,11 @@
, green_id
, dir
, alarm_status
, opt_status)
, opt_status
, turn
, unbalance_index
, spillover_index
)
VALUES (
#{oid}
, #{plateNo}
......@@ -126,6 +134,9 @@
, #{dir}
, #{alarmStatus}
, #{optStatus}
, #{turn}
, #{unbalanceIndex}
, #{spilloverIndex}
)
ON DUPLICATE KEY UPDATE
end_time = values(end_time)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment