[update] 事件添加方向

wj-datacenter-service/src/main/java/net/wanji/datacenter/pojo/po/EventInfoPO.java

@@ -11,86 +11,140 @@ import java.util.Date;
  */
 @Data
 public class EventInfoPO {
-    /** 主键ID */
-    @ApiModelProperty(name = "主键ID",notes = "")
-    private Long oid ;
-    /** 车牌号 */
-    @ApiModelProperty(name = "车牌号",notes = "")
-    private String plateNo ;
-    /** 参与者类别 1：机动车 2：非机动车 3：行人 */
-    @ApiModelProperty(name = "参与者类别 1：机动车 2：非机动车 3：行人",notes = "")
-    private String objectType ;
-    /** 可信度 */
-    @ApiModelProperty(name = "可信度",notes = "")
-    private Integer confidence ;
-    /** 检测时间 */
-    @ApiModelProperty(name = "检测时间",notes = "")
-    private Date detectTime ;
-    /** 事件等级：1扣分 2 罚款 3警告 0 未知 */
-    @ApiModelProperty(name = "事件等级：1扣分 2 罚款 3警告 0 未知",notes = "")
-    private Integer grade ;
-    /** 事件地点描述 */
-    @ApiModelProperty(name = "事件地点描述",notes = "")
-    private String placeDesc ;
-    /** 发生地点经度 */
-    @ApiModelProperty(name = "发生地点经度",notes = "")
-    private Double lng ;
-    /** 发生地点纬度 */
-    @ApiModelProperty(name = "发生地点纬度",notes = "")
-    private Double lat ;
-    /** 事件一级类别 事件一级类别 1：机动车事件 2：非机动车事件 3：行人事件 */
-    @ApiModelProperty(name = "事件一级类别 事件一级类别 1：机动车事件 2：非机动车事件 3：行人事件",notes = "")
-    private String category ;
-    /** 二级类别 */
-    @ApiModelProperty(name = "二级类别",notes = "")
-    private String type ;
-    /** 事件发生时间 */
-    @ApiModelProperty(name = "事件发生时间",notes = "")
-    private Date startTime ;
-    /** 事件结束时间 */
-    @ApiModelProperty(name = "事件结束时间",notes = "")
-    private Date endTime ;
-    /** 事件持续时长 */
-    @ApiModelProperty(name = "事件持续时长",notes = "")
-    private Integer duration ;
-    /** 事件来源 */
-    @ApiModelProperty(name = "事件来源",notes = "")
-    private String source ;
-    /** 入库时间 */
-    @ApiModelProperty(name = "入库时间",notes = "")
-    private Date ruksj ;
-    /** 车道id */
-    @ApiModelProperty(name = "车道id",notes = "")
-    private String laneId ;
-    /** 路段id */
-    @ApiModelProperty(name = "路段id",notes = "")
-    private String rid ;
-    /** 渠化id */
-    @ApiModelProperty(name = "渠化id",notes = "")
-    private String segmentId ;
-    /** 路口id */
-    @ApiModelProperty(name = "路口id",notes = "")
-    private String crossId ;
-    /** 关联的事件摄像头信息ID */
-    @ApiModelProperty(name = "关联的事件摄像头信息ID",notes = "")
-    private Long cameraOid ;
-    /** 事件序列号作为主键 */
-    @ApiModelProperty(name = "事件序列号作为主键",notes = "")
-    private String eventSerialNumber ;
-    /**  */
-    @ApiModelProperty(name = "",notes = "")
-    private Character dataStatus ;
-    /**  */
-    @ApiModelProperty(name = "",notes = "")
-    private String globalId ;
-    /**  */
-    @ApiModelProperty(name = "",notes = "")
-    private Integer stationId ;
-    /**  */
-    @ApiModelProperty(name = "",notes = "")
-    private String eventId ;
-    @ApiModelProperty(name = "分区字段",notes = "")
-    private Integer dt ;
-    @ApiModelProperty(name = "路口所属绿波编号",notes = "")
-    private Integer greenId ;
+    /**
+     * 主键ID
+     */
+    @ApiModelProperty(name = "主键ID", notes = "")
+    private Long oid;
+    /**
+     * 车牌号
+     */
+    @ApiModelProperty(name = "车牌号", notes = "")
+    private String plateNo;
+    /**
+     * 参与者类别 1：机动车 2：非机动车 3：行人
+     */
+    @ApiModelProperty(name = "参与者类别 1：机动车 2：非机动车 3：行人", notes = "")
+    private String objectType;
+    /**
+     * 可信度
+     */
+    @ApiModelProperty(name = "可信度", notes = "")
+    private Integer confidence;
+    /**
+     * 检测时间
+     */
+    @ApiModelProperty(name = "检测时间", notes = "")
+    private Date detectTime;
+    /**
+     * 事件等级：1扣分 2 罚款 3警告 0 未知
+     */
+    @ApiModelProperty(name = "事件等级：1扣分 2 罚款 3警告 0 未知", notes = "")
+    private Integer grade;
+    /**
+     * 事件地点描述
+     */
+    @ApiModelProperty(name = "事件地点描述", notes = "")
+    private String placeDesc;
+    /**
+     * 发生地点经度
+     */
+    @ApiModelProperty(name = "发生地点经度", notes = "")
+    private Double lng;
+    /**
+     * 发生地点纬度
+     */
+    @ApiModelProperty(name = "发生地点纬度", notes = "")
+    private Double lat;
+    /**
+     * 事件一级类别 事件一级类别 1：机动车事件 2：非机动车事件 3：行人事件
+     */
+    @ApiModelProperty(name = "事件一级类别 事件一级类别 1：机动车事件 2：非机动车事件 3：行人事件", notes = "")
+    private String category;
+    /**
+     * 二级类别
+     */
+    @ApiModelProperty(name = "二级类别", notes = "")
+    private String type;
+    /**
+     * 事件发生时间
+     */
+    @ApiModelProperty(name = "事件发生时间", notes = "")
+    private Date startTime;
+    /**
+     * 事件结束时间
+     */
+    @ApiModelProperty(name = "事件结束时间", notes = "")
+    private Date endTime;
+    /**
+     * 事件持续时长
+     */
+    @ApiModelProperty(name = "事件持续时长", notes = "")
+    private Integer duration;
+    /**
+     * 事件来源
+     */
+    @ApiModelProperty(name = "事件来源", notes = "")
+    private String source;
+    /**
+     * 入库时间
+     */
+    @ApiModelProperty(name = "入库时间", notes = "")
+    private Date ruksj;
+    /**
+     * 车道id
+     */
+    @ApiModelProperty(name = "车道id", notes = "")
+    private String laneId;
+    /**
+     * 路段id
+     */
+    @ApiModelProperty(name = "路段id", notes = "")
+    private String rid;
+    /**
+     * 渠化id
+     */
+    @ApiModelProperty(name = "渠化id", notes = "")
+    private String segmentId;
+    /**
+     * 路口id
+     */
+    @ApiModelProperty(name = "路口id", notes = "")
+    private String crossId;
+    /**
+     * 关联的事件摄像头信息ID
+     */
+    @ApiModelProperty(name = "关联的事件摄像头信息ID", notes = "")
+    private Long cameraOid;
+    /**
+     * 事件序列号作为主键
+     */
+    @ApiModelProperty(name = "事件序列号作为主键", notes = "")
+    private String eventSerialNumber;
+    /**
+     *
+     */
+    @ApiModelProperty(name = "", notes = "")
+    private Character dataStatus;
+    /**
+     *
+     */
+    @ApiModelProperty(name = "", notes = "")
+    private String globalId;
+    /**
+     *
+     */
+    @ApiModelProperty(name = "", notes = "")
+    private Integer stationId;
+    /**
+     *
+     */
+    @ApiModelProperty(name = "", notes = "")
+    private String eventId;
+    @ApiModelProperty(name = "分区字段", notes = "")
+    private Integer dt;
+    @ApiModelProperty(name = "路口所属绿波编号", notes = "")
+    private Integer greenId;
+    @ApiModelProperty(name = "事件方向，溢出方向", notes = "")
+    private Integer dir;
 }

wj-datacenter-service/src/main/java/net/wanji/datacenter/service/EventDataServiceImpl.java

@@ -61,7 +61,8 @@ public class EventDataServiceImpl implements EventDataService {
             eventInfoPO.setLat(eventInfoPO.getLat());
             eventInfoPO.setLng(eventInfoPO.getLng());
             eventInfoPO.setCategory(eventDataDTO.getEventLevel());
-            eventInfoPO.setPlaceDesc(eventDataDTO.getEventType() + "方向" + eventDataDTO.getDirection() + 1);
+            eventInfoPO.setPlaceDesc(eventDataDTO.getEventType());
+            eventInfoPO.setDir(Integer.valueOf(eventDataDTO.getDirection()) + 1);
             eventInfoMapper.insertOne(eventInfoPO);
         } catch (Exception e) {
             log.error("事件保存异常：", e);

wj-datacenter-service/src/main/java/net/wanji/datacenter/service/impl/CrossStrategyOptServiceImpl.java

@@ -81,7 +81,7 @@ public class CrossStrategyOptServiceImpl implements CrossStrategyOptService {
                 crossStrategyResultEntity.setInsertTime(dto.getInsertTime());
                 crossStrategyResultEntity.setRtnType(dto.getRtnType());
                 crossStrategyResultEntity.setExtendTime(dto.getExtendTime());
-                crossStrategyResultEntity.setBlockRegion(dto.getBlockRegion());
+                crossStrategyResultEntity.setBlockRegion(dto.getBlockRegion() + 1);
                 crossStrategyResultEntity.setBlockType(dto.getBlockType());
                 crossStrategyResultEntity.setCountDown(dto.getCountDown());
                 crossStrategyResultEntity.setVideoStamp(dto.getVideoStamp());

wj-datacenter-service/src/main/resources/mapper/EventInfoMapper.xml

@@ -37,12 +37,13 @@
         <result column="video_urls" property="videoUrls"/>
         <result column="dt" property="dt"/>
         <result column="green_id" property="greenId"/>
+        <result column="dir" property="dir"/>
     </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
+        station_id,event_id,dt,green_id,dir
     </sql>
 
     <select id="selectHistEvent" resultType="net.wanji.datacenter.pojo.po.EventInfoPO">
@@ -76,8 +77,10 @@
         , cross_id
         , dt
         , event_serial_number
-        , green_id)
-        VALUES ( #{oid}
+        , green_id
+        , dir)
+        VALUES (
+          #{oid}
         , #{plateNo}
         , #{objectType}
         , #{confidence}
@@ -100,6 +103,7 @@
         , #{dt}
         , #{eventSerialNumber}
         , #{greenId}
+        , #{dir}
         )
         ON DUPLICATE KEY UPDATE
         end_time = values(end_time)