Merge remote-tracking branch 'origin/master'

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

@@ -44,6 +44,9 @@ public class GreenwaveHist  extends TrackableEntity {
     @ApiModelProperty(value = "行程速度（km/h）")
     private BigDecimal speed;
 
+    @ApiModelProperty(value = "速度异常系数")
+    private Double speedCv;
+
     @ApiModelProperty(value = "行程时间（秒）")
     private Integer trvalTime;
 

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/EventServiceImpl.java

@@ -65,8 +65,14 @@ public class EventServiceImpl implements EventService {
 				String[] dirList = dirs.split("@");
 				List<String> allDirList = new ArrayList<>();
 				for (String dirArr : dirList) {
+					if (!dirArr.startsWith("[") || !dirArr.endsWith("]")){
+						//过滤不合规格式数据
+						continue;
+					}
 					List<String> jsonArray = JSONArray.parseArray(dirArr, String.class);
-					allDirList.addAll(jsonArray.stream().map(o -> (Integer.valueOf(o).toString())).distinct().collect(Collectors.toList()));
+					if (jsonArray.size()>0) {
+						allDirList.addAll(jsonArray.stream().map(o -> (Integer.valueOf(o).toString())).distinct().collect(Collectors.toList()));
+					}
 				}
 				//统计每个方向发生的次数
 				countMap = allDirList.stream().collect(Collectors.groupingBy(String::valueOf, Collectors.counting()));