|
|
@ -103,9 +103,9 @@ public class OnenetService {
|
|
|
}else if("2".equals(onenetDevice.getDeviceType())){
|
|
|
//海康设备
|
|
|
if("14".equals(onenetDevice.getCategoryCode())){
|
|
|
hkDeviceQi(onenetDevice,jsonObject);
|
|
|
hkDeviceQi(onenetDevice,msg);
|
|
|
}else if("15".equals(onenetDevice.getCategoryCode())){
|
|
|
hkDeviceYan(onenetDevice,jsonObject);
|
|
|
hkDeviceYan(onenetDevice,msg);
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@ -172,11 +172,11 @@ public class OnenetService {
|
|
|
String wChanRscType = valueTmp.substring(0,4);
|
|
|
String num = valueTmp.substring(4,8);
|
|
|
String wEventType = valueTmp.substring(16,20);
|
|
|
String wParamType = valueTmp.substring(32,36);
|
|
|
String wParamValue = valueTmp.substring(36,40);
|
|
|
String wParamType = valueTmp.substring(28,32);
|
|
|
String wParamValue = valueTmp.substring(32,36);
|
|
|
if("0062".equals(wEventType)&&"0001".equals(wParamType)){
|
|
|
String byTime = value.substring(18,26);//时间 秒
|
|
|
String time = DateUtil.dateToStrLong(DateUtil.secondTransfor(Integer.parseInt(byTime)));
|
|
|
String time = DateUtil.dateToStrLong(DateUtil.secondTransfor(Integer.valueOf(byTime,16)));
|
|
|
//烟雾浓度
|
|
|
String monitorValue = StringUtil.division(Integer.valueOf(wParamValue),10);
|
|
|
String resourceSerial = onenetDevice.getSn();
|
|
|
@ -200,9 +200,9 @@ public class OnenetService {
|
|
|
String wChanRscType = valueTmp.substring(0,4);
|
|
|
String num = valueTmp.substring(4,8);
|
|
|
String wEventType = valueTmp.substring(16,20);
|
|
|
String wEventValue = valueTmp.substring(28,32);
|
|
|
String wParamType = valueTmp.substring(32,36);
|
|
|
String wParamValue = valueTmp.substring(36,40);
|
|
|
String wEventValue = valueTmp.substring(24,28);
|
|
|
String wParamType = valueTmp.substring(28,32);
|
|
|
String wParamValue = valueTmp.substring(32,36);
|
|
|
if("0064".equals(wEventType)&&"0002".equals(wEventValue)){
|
|
|
//报警
|
|
|
if("0001".equals(wParamType)){
|
|
|
@ -237,11 +237,11 @@ public class OnenetService {
|
|
|
String wChanRscType = valueTmp.substring(0,4);
|
|
|
String num = valueTmp.substring(4,8);
|
|
|
String wEventType = valueTmp.substring(16,20);
|
|
|
String wParamType = valueTmp.substring(32,36);
|
|
|
String wParamValue = valueTmp.substring(36,40);
|
|
|
String wParamType = valueTmp.substring(28,32);
|
|
|
String wParamValue = valueTmp.substring(32,36);
|
|
|
if("0062".equals(wEventType)&&"0001".equals(wParamType)){
|
|
|
String byTime = value.substring(18,26);//时间 秒
|
|
|
String time = DateUtil.dateToStrLong(DateUtil.secondTransfor(Integer.parseInt(byTime)));
|
|
|
String time = DateUtil.dateToStrLong(DateUtil.secondTransfor(Integer.valueOf(byTime,16)));
|
|
|
//气感浓度
|
|
|
String monitorValue = StringUtil.division(Integer.valueOf(wParamValue),10);
|
|
|
String resourceSerial = onenetDevice.getSn();
|
|
|
@ -266,9 +266,9 @@ public class OnenetService {
|
|
|
String wChanRscType = valueTmp.substring(0,4);
|
|
|
String num = valueTmp.substring(4,8);
|
|
|
String wEventType = valueTmp.substring(16,20);
|
|
|
String wEventValue = valueTmp.substring(28,32);
|
|
|
String wParamType = valueTmp.substring(32,36);
|
|
|
String wParamValue = valueTmp.substring(36,40);
|
|
|
String wEventValue = valueTmp.substring(24,28);
|
|
|
String wParamType = valueTmp.substring(28,32);
|
|
|
String wParamValue = valueTmp.substring(32,36);
|
|
|
if("0064".equals(wEventType)&&"0002".equals(wEventValue)){
|
|
|
//气感报警
|
|
|
if("0001".equals(wParamType)){
|
