[update] 绿波数据优化

wj-datacenter-service/src/main/java/net/wanji/datacenter/pojo/dto/EventDataDTO.java

@@ -24,6 +24,6 @@ public class EventDataDTO {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date eventEndTime;
     private String eventLevel;
-    private Integer greenId;
+    private String greenId;
     private Integer eventStatus;
 }

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

@@ -149,9 +149,9 @@ public class EventInfoPO {
     @ApiModelProperty(name = "分区字段", notes = "")
     private Integer dt;
     @ApiModelProperty(name = "路口所属绿波编号", notes = "")
-    private Integer greenId;
+    private String greenId;
     @ApiModelProperty(name = "事件方向，溢出方向", notes = "")
-    private Integer dir;
+    private String dir;
     @ApiModelProperty(name = "告警状态  0其他 1分析中 2优化中 3优化完", notes = "")
     private Integer alarmStatus;
 }

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

@@ -72,7 +72,7 @@ public class EventDataServiceImpl implements EventDataService {
         eventInfoPO.setLng(eventInfoPO.getLng());
         eventInfoPO.setCategory(eventDataDTO.getEventLevel());
         eventInfoPO.setPlaceDesc(eventDataDTO.getEventType());
-        eventInfoPO.setDir(Integer.valueOf(eventDataDTO.getDirection()) + 1);
+        eventInfoPO.setDir(eventDataDTO.getDirection());
         eventInfoPO.setRuksj(new Date());
         return eventInfoPO;
     }

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

@@ -212,7 +212,7 @@ public class GreenBeltInfoServiceImpl implements GreenBeltInfoService {
             greenBeltOptInfoVO.setType(kafkaDTO.getGreenbeltType());
             greenBeltOptInfoVO.setDynamic(kafkaDTO.getDynamic());
             greenBeltOptInfoVO.setControlMethod(kafkaDTO.getControlMethod());
-            greenBeltOptInfoVO.setDirGreenDetails(null);
+            greenBeltOptInfoVO.setDirGreenDetails(Collections.emptyList());
             greenBeltOptInfoVO.setKeyCross(kafkaDTO.getKeyCross());
             return greenBeltOptInfoVO;
         }