base lane

wj-realtime-computing/src/main/java/com/wanji/indicators/entity/EventInfo.java

@@ -4,8 +4,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+//import io.swagger.annotations.ApiModel;
+//import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -16,84 +16,84 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("t_event_info")
-@ApiModel(value = "EventInfo", description = "交通事件信息")
+//@ApiModel(value = "EventInfo", description = "交通事件信息")
 public class EventInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "主键ID", hidden = true)
+    //@ApiModelProperty(value = "主键ID", hidden = true)
     @JSONField(serialize = false)
     private Long oid;
 
-    @ApiModelProperty(value = "车牌号")
+    //@ApiModelProperty(value = "车牌号")
     private String plateNo;
 
-    @ApiModelProperty(value = "参与者类别 1：机动车 2：非机动车 3：行人")
+    //@ApiModelProperty(value = "参与者类别 1：机动车 2：非机动车 3：行人")
     private String objectType;
 
-    @ApiModelProperty(value = "可信度")
+    //@ApiModelProperty(value = "可信度")
     private Integer confidence;
 
-    @ApiModelProperty(value = "检测时间", notes = "格式：yyyy-MM-dd HH:mm:ss")
+    //@ApiModelProperty(value = "检测时间", notes = "格式：yyyy-MM-dd HH:mm:ss")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime detectTime;
 
-    @ApiModelProperty(value = "事件等级：1扣分 2 罚款 3警告 0 未知")
+    //@ApiModelProperty(value = "事件等级：1扣分 2 罚款 3警告 0 未知")
     private Integer grade;
 
-    @ApiModelProperty(value = "事件地点描述")
+    //@ApiModelProperty(value = "事件地点描述")
     private String placeDesc;
 
-    @ApiModelProperty(value = "发生地点经度")
+    //@ApiModelProperty(value = "发生地点经度")
     private BigDecimal lng;
 
-    @ApiModelProperty(value = "发生地点纬度")
+    //@ApiModelProperty(value = "发生地点纬度")
     private BigDecimal lat;
 
-    @ApiModelProperty(value = "事件一级类别 1：非机动事件 2：行人事件 3：机动车事件")
+    //@ApiModelProperty(value = "事件一级类别 1：非机动事件 2：行人事件 3：机动车事件")
     private String category;
 
-    @ApiModelProperty(value = "二级类别")
+    //@ApiModelProperty(value = "二级类别")
     @JsonProperty("eventType")
     @JSONField(name = "eventType")
     private String type;
 
-    @ApiModelProperty(value = "事件发生时间")
+    //@ApiModelProperty(value = "事件发生时间")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
 
-    @ApiModelProperty(value = "事件结束时间")
+    //@ApiModelProperty(value = "事件结束时间")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
-    @ApiModelProperty(value = "事件持续时长，单位分钟")
+    //@ApiModelProperty(value = "事件持续时长，单位分钟")
     private Integer duration;
 
-    @ApiModelProperty(value = "事件来源")
+    //@ApiModelProperty(value = "事件来源")
     private String source;
 
-    @ApiModelProperty(value = "车道ID")
+    //@ApiModelProperty(value = "车道ID")
     private String laneId;
-    @ApiModelProperty(value = "路段ID")
+    //@ApiModelProperty(value = "路段ID")
     private String rid;
-    @ApiModelProperty(value = "路口ID")
+    //@ApiModelProperty(value = "路口ID")
     private String crossId;
-    @ApiModelProperty(value = "渠化ID")
+    //@ApiModelProperty(value = "渠化ID")
     private String segmentId;
-    @ApiModelProperty(value = "关联的事件摄像头信息ID")
+    //@ApiModelProperty(value = "关联的事件摄像头信息ID")
     private String cameraOid;
-    @ApiModelProperty(value = "序列号")
+    //@ApiModelProperty(value = "序列号")
     private String eventSerialNumber;
-    @ApiModelProperty(value = "事件状态")
+    //@ApiModelProperty(value = "事件状态")
     private String dataStatus;
     private String globalId;
     private Integer stationId;
     private String eventId;
 
-    @ApiModelProperty(value = "入库时间", hidden = true)
+    //@ApiModelProperty(value = "入库时间", hidden = true)
     @JSONField(serialize = false)
     private LocalDateTime ruksj;
 

wj-realtime-computing/src/main/java/com/wanji/indicators/service/impl/BaseLaneInfoServiceImpl.java

@@ -249,8 +249,12 @@ public class BaseLaneInfoServiceImpl extends ServiceImpl<BaseLaneInfoMapper, Bas
 
             List<BaseLaneInfo> inList = dirLaneList.stream().filter(o->o.getType().equals(2)).collect(Collectors.toList());
             List<BaseLaneInfo> outList = dirLaneList.stream().filter(o->o.getType().equals(3)).collect(Collectors.toList());
-            retList.put(inList.get(0).getRid(),outList);
-            retList.put(outList.get(0).getRid(),inList);
+
+            if (!inList.isEmpty() && !outList.isEmpty())
+                retList.put(inList.get(0).getRid(),outList);
+
+            if (!outList.isEmpty() && !inList.isEmpty())
+                retList.put(outList.get(0).getRid(),inList);
         }
 
         return retList;

wj-realtime-computing/src/main/java/com/wanji/indicators/task/citybrainreceive/targetinfo/E1FrameMiniVO.java

 package com.wanji.indicators.task.citybrainreceive.targetinfo;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.annotation.JSONType;
 import lombok.Data;
 
 import java.util.Date;
@@ -13,6 +14,7 @@ import java.util.List;
  * @Version 1.0
  */
 @Data
+@JSONType(orders = {"timeStamp", "globalTimeStamp", "participantNum","e1FrameParticipant"})
 public class E1FrameMiniVO extends Org {
     @JSONField(format="yyyy-MM-dd HH:mm:ss:SSS")
     private Date timeStamp;// 检测时间，yyyy-MM-dd HH:mm:ss:SSS（可读性考虑）