运行状态告警数据返回值增加路口编号

signal-utc-service/src/main/java/net/wanji/utc/common/baseentity/BaseCrossInfo.java

@@ -14,6 +14,9 @@ public class BaseCrossInfo {
     @ApiModelProperty(value = "信号机ID")
     private String code;
 
+    @ApiModelProperty(value = "路口ID")
+    private String crossId;
+
     @ApiModelProperty(value = "厂商代码")
     private String manufacturerCode;
 }

signal-utc-service/src/main/java/net/wanji/utc/po/SignalStatusLogPO.java

@@ -14,6 +14,9 @@ public class SignalStatusLogPO {
     /** 日志ID */
     @ApiModelProperty(value = "日志ID",notes = "")
     private Integer id ;
+    /** 路口ID */
+    @ApiModelProperty(value = "路口ID",notes = "")
+    private String crossId ;
     /** 信号机ID */
     @ApiModelProperty(value = "信号机ID",notes = "")
     private String signalId ;

signal-utc-service/src/main/java/net/wanji/utc/service/runninginfo/impl/HkRunningStatusServiceImpl.java

@@ -50,6 +50,7 @@ public class HkRunningStatusServiceImpl implements HkRunningStatusService {
                     for (int i = 0; i < data.size(); i++) {
                         JSONObject obj =  data.getJSONObject(i);
                         po = new SignalStatusLogPO();
+                        po.setCrossId(baseCrossInfo.getCrossId());
                         po.setSignalId(baseCrossInfo.getCode());
                         po.setStatus(transferStatus(obj.getInteger("state")));
                         // 告警信息

signal-utc-service/src/main/java/net/wanji/utc/service/runninginfo/impl/SignalStatusServiceImpl.java

@@ -111,6 +111,7 @@ public class SignalStatusServiceImpl implements SignalStatusService {
         for (CrossInfoPO infoPO : crossInfoPOList) {
             BaseCrossInfo baseCrossInfo = new BaseCrossInfo();
             baseCrossInfo.setCode(infoPO.getCode());
+            baseCrossInfo.setCrossId(infoPO.getId());
             baseCrossInfo.setManufacturerCode(manufacturerEnum.getCode());
             baseCrossInfoList.add(baseCrossInfo);
         }