|
@ -118,7 +118,7 @@ public class HvDeviceService {
|
|
|
JSONObject tmp = new JSONObject();
|
|
|
tmp.put("gas",monitorValue);
|
|
|
orderUtil.createSecurityOrder(resourceSerial,null,new JSONObject(),null,6,"11","preventGasLeakage",JSON.toJSONString(tmp, SerializerFeature.WriteMapNullValue));
|
|
|
dataPushLogUtil.savePushLog(resourceSerial,jsonObject.toJSONString(SerializerFeature.WriteMapNullValue),"可燃气体探测器报警信息接收");
|
|
|
dataPushLogUtil.savePushLog(resourceSerial,jsonObject.toJSONString(jsonObject,SerializerFeature.WriteMapNullValue),"可燃气体探测器报警信息接收");
|
|
|
}
|
|
|
|
|
|
if("600002".equals(deviceType)){
|
|
@ -126,7 +126,7 @@ public class HvDeviceService {
|
|
|
JSONObject tmp = new JSONObject();
|
|
|
tmp.put("smoke",monitorValue);
|
|
|
orderUtil.createSecurityOrder(resourceSerial,null,new JSONObject(),null,7,"10","preventFire",JSON.toJSONString(tmp, SerializerFeature.WriteMapNullValue));
|
|
|
dataPushLogUtil.savePushLog(resourceSerial,jsonObject.toJSONString(SerializerFeature.WriteMapNullValue),"烟感探测器报警信息接收");
|
|
|
dataPushLogUtil.savePushLog(resourceSerial,jsonObject.toJSONString(jsonObject,SerializerFeature.WriteMapNullValue),"烟感探测器报警信息接收");
|
|
|
}
|
|
|
}
|
|
|
if(list.size()>0){
|
|
@ -157,14 +157,14 @@ public class HvDeviceService {
|
|
|
//独立式可燃气体探测器(NB)
|
|
|
index.setDeviceType("1");
|
|
|
list.add(index);
|
|
|
dataPushLogUtil.savePushLog(resourceSerial,jsonObject.toJSONString(SerializerFeature.WriteMapNullValue),"可燃气体探测器监测信息接收");
|
|
|
dataPushLogUtil.savePushLog(resourceSerial,jsonObject.toJSONString(jsonObject,SerializerFeature.WriteMapNullValue),"可燃气体探测器监测信息接收");
|
|
|
}
|
|
|
|
|
|
if("600002".equals(resourceType)&&"400013".equals(monitorType)){
|
|
|
//独立式光电感烟探测器(NB)
|
|
|
index.setDeviceType("2");
|
|
|
list.add(index);
|
|
|
dataPushLogUtil.savePushLog(resourceSerial,jsonObject.toJSONString(SerializerFeature.WriteMapNullValue),"烟探测器监测信息接收");
|
|
|
dataPushLogUtil.savePushLog(resourceSerial,jsonObject.toJSONString(jsonObject,SerializerFeature.WriteMapNullValue),"烟探测器监测信息接收");
|
|
|
}
|
|
|
updContactStatus(resourceSerial,1);
|
|
|
}
|
|
@ -183,7 +183,7 @@ public class HvDeviceService {
|
|
|
String deviceID = jsonObject.getString("deviceID");
|
|
|
String deviceStatus = jsonObject.getString("deviceStatus");
|
|
|
List<HvDeviceRecord> list = hvdeviceRecordDao.findByDeviceId(deviceID);
|
|
|
dataPushLogUtil.savePushLog(deviceID,jsonObject.toJSONString(SerializerFeature.WriteMapNullValue),"气感烟感探测器监测信息接收");
|
|
|
dataPushLogUtil.savePushLog(deviceID,jsonObject.toJSONString(jsonObject,SerializerFeature.WriteMapNullValue),"气感烟感探测器监测信息接收");
|
|
|
if(list.size()>0){
|
|
|
updContactStatus(list.get(0).getDeviceSn(),Integer.valueOf(deviceStatus));
|
|
|
}
|