|
|
@ -1118,16 +1118,15 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { |
|
|
|
processingDeviceParameters(functionId, functionList, props); |
|
|
|
|
|
|
|
AjaxResult ajaxResult11 = dcDeviceController.getAjaxResult(iotDeviceId, functionId, props); |
|
|
|
|
|
|
|
// 13功能码执行参数构造
|
|
|
|
DcInfoBoardTemplate dcInfoBoardTemplate = JSON.parseObject( |
|
|
|
JSON.toJSONString(otherConfig.get("dcInfoBoardTemplate")), |
|
|
|
DcInfoBoardTemplate.class); |
|
|
|
if (ajaxResult11.get("code").equals(200)) { |
|
|
|
// 2:执行13功能码
|
|
|
|
HashMap<String, Object> props11 = new HashMap<>(); |
|
|
|
functionId = DeviceFunctionIdConstants.VARIABLE_INFORMATION_FLAG_13; |
|
|
|
List<Map<String, String>> list = new ArrayList<>(); |
|
|
|
Map<String, String> parameters = new HashMap<>(); |
|
|
|
|
|
|
|
// stopTime
|
|
|
|
parameters.put("STAY", dcInfoBoardTemplate.getStopTime()); |
|
|
|
// inScreenMode
|
|
|
@ -1151,7 +1150,8 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { |
|
|
|
props11.put("parameters", list); |
|
|
|
|
|
|
|
processingDeviceParameters(functionId, functionList, props11); |
|
|
|
|
|
|
|
if (ajaxResult11.get("code").equals(200)) { |
|
|
|
// 2:执行13功能码
|
|
|
|
AjaxResult ajaxResult13 = dcDeviceController.getAjaxResult(iotDeviceId, functionId, props11); |
|
|
|
JSONObject result = new JSONObject(); |
|
|
|
result.put("device", device.getId()); |
|
|
|