|
|
@ -862,7 +862,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { |
|
|
|
// 说明没有匹配到设备
|
|
|
|
JSONObject errorResult = new JSONObject(); |
|
|
|
errorResult.put("device",device.getId()); |
|
|
|
errorResult.put("errorMessage","未匹配到对应的模板内容"); |
|
|
|
errorResult.put("content","未匹配到对应的模板内容"); |
|
|
|
resultArray.add(errorResult); |
|
|
|
}else { |
|
|
|
JSONObject jsonObject = new JSONObject(); |
|
|
@ -892,7 +892,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { |
|
|
|
JSONObject errorResult = new JSONObject(); |
|
|
|
errorResult.put("device",device.getId()); |
|
|
|
errorResult.put("deviceName",device.getDeviceName()); |
|
|
|
errorResult.put("errorMessage","未匹配到对应的广播内容"); |
|
|
|
errorResult.put("content","未匹配到对应的广播内容"); |
|
|
|
resultArray.add(errorResult); |
|
|
|
} |
|
|
|
if (StringUtils.isEmpty(foundContent.getString("content"))) { |
|
|
|