|
@ -174,9 +174,22 @@ public class DeviceMessageHandler { |
|
|
String warningSubclass = data.getString("warningSubclass"); |
|
|
String warningSubclass = data.getString("warningSubclass"); |
|
|
// 子类型
|
|
|
// 子类型
|
|
|
dcWarning.setWarningSubclass(warningSubclass); |
|
|
dcWarning.setWarningSubclass(warningSubclass); |
|
|
|
|
|
//桩号,方向
|
|
|
String stakeMarkDescription = data.getString("stakeMarkDescription"); |
|
|
String stakeMarkDescription = data.getString("stakeMarkDescription"); |
|
|
String title = stakeMarkDescription + WarningSubclassEnum.getDecorateInfo(warningSubclass); |
|
|
String direction = ""; |
|
|
|
|
|
String[] arr = stakeMarkDescription.split(" "); |
|
|
|
|
|
//方向
|
|
|
|
|
|
if (arr[2] != null) { |
|
|
|
|
|
if (arr[2].equals("上行")) { |
|
|
|
|
|
direction=arr[0]+" "+arr[1]+ " 菏泽方向 "; |
|
|
|
|
|
} |
|
|
|
|
|
if (arr[2].equals("下行")) { |
|
|
|
|
|
direction=arr[0]+" "+arr[1]+ " 济南方向 "; |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
String title = direction + WarningSubclassEnum.getDecorateInfo(warningSubclass); |
|
|
// 标题
|
|
|
// 标题
|
|
|
dcWarning.setWarningTitle(title); |
|
|
dcWarning.setWarningTitle(title); |
|
|
dcWarning.setRemark(DateUtil.formatDateTime(DateUtil.date(captureTime)) + " " + title); |
|
|
dcWarning.setRemark(DateUtil.formatDateTime(DateUtil.date(captureTime)) + " " + title); |
|
@ -208,6 +221,7 @@ public class DeviceMessageHandler { |
|
|
/* JSONObject combinedData = new JSONObject(); |
|
|
/* JSONObject combinedData = new JSONObject(); |
|
|
combinedData.put("address", otherConfig);*/ |
|
|
combinedData.put("address", otherConfig);*/ |
|
|
dcWarning.setOtherConfig(otherConfig.toString()); |
|
|
dcWarning.setOtherConfig(otherConfig.toString()); |
|
|
|
|
|
|
|
|
dcWarningService.insertDcWarning(dcWarning); |
|
|
dcWarningService.insertDcWarning(dcWarning); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|