代码修改

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/service/OnenetService.java

@@ -175,20 +175,24 @@ public class OnenetService {
            String valueTmp = value.substring(236);
            //0060 0001 0061 0001 0062 0000 0000 0001 0000 79
            String wChanRscType = valueTmp.substring(0,4);
            String num = valueTmp.substring(4,8);
            String wEventType = valueTmp.substring(16,20);
            String wParamType = valueTmp.substring(28,32);
            String wParamValue = valueTmp.substring(32,36);
            if("0062".equals(wEventType)&&"0017".equals(wParamType)){
                String byTime = value.substring(18,26);//时间 秒
                String time = DateUtil.dateToStrLong(DateUtil.secondTransfor(Integer.valueOf(byTime,16)));
                //烟雾浓度
                String monitorValue = Integer.valueOf(wParamValue,16)+"";
                String resourceSerial = onenetDevice.getSn();
                addDeviceIndex(resourceSerial,monitorValue,time,"2","%");
                dataPushLogUtil.savePushLog(resourceSerial,jsonObject.toJSONString(jsonObject,SerializerFeature.WriteMapNullValue),"可燃气体探测器监测信息接收");
            Integer num = Integer.valueOf(valueTmp.substring(4,8),16);
            for (int i=0;i<num;i++){
                String sign = valueTmp.substring(8+(i*28),36+(i*28));
                String wEventType = sign.substring(8,12);
                String wParamType = sign.substring(20,24);
                String wParamValue = sign.substring(24,28);
                if("0062".equals(wEventType)&&"0017".equals(wParamType)){
                    String byTime = value.substring(18,26);//时间 秒
                    String time = DateUtil.dateToStrLong(DateUtil.secondTransfor(Integer.valueOf(byTime,16)));
                    //烟雾浓度
                    String monitorValue = Integer.valueOf(wParamValue,16)+"";
                    String resourceSerial = onenetDevice.getSn();
                    addDeviceIndex(resourceSerial,monitorValue,time,"2","%");
                    dataPushLogUtil.savePushLog(resourceSerial,jsonObject.toJSONString(jsonObject,SerializerFeature.WriteMapNullValue),"可燃气体探测器监测信息接收");
                }
                return;
            }
            return;
        }
        if("02".equals(byMessageId)){
            //报警
@@ -196,15 +200,13 @@ public class OnenetService {
            String time = DateUtil.dateToStrLong(DateUtil.secondTransfor(Integer.parseInt(byTime)));
            String valueTmp = value.substring(236);
            //0060 0001 0061 0001 0064 0000 0002 0001 0087 00
            String wChanRscType = valueTmp.substring(0,4);
            String num = valueTmp.substring(4,8);
            String wEventType = valueTmp.substring(16,20);
            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("0017".equals(wParamType)){
            Integer num = Integer.valueOf(valueTmp.substring(4,8),16);
            for (int i=0; i<num; i++){
                String sign = valueTmp.substring(8+(i*28),36+(i*28));
                String wEventType = sign.substring(8,12);
                String wParamType = sign.substring(20,24);
                String wParamValue = sign.substring(24,28);
                if("0062".equals(wEventType)&&"0017".equals(wParamType)){
                    //烟雾浓度
                    String monitorValue = Integer.valueOf(wParamValue,16)+"";
                    String resourceSerial = onenetDevice.getSn();
@@ -221,8 +223,8 @@ public class OnenetService {
                    }
                    addDeviceIndex(resourceSerial,monitorValue,time,"2","%");
                }
                return;
            }
        }
        //其他信息暂时不处理
        // 03消音 04自检 05故障 06信号查询 07注册 08注销 ...