测试提交权限

jiang

2022-07-13 fc89b7b517e191fb6c9b66fa86dd05ebab0f54c5

 src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java

@@ -2,7 +2,9 @@


import com.alibaba.fastjson.JSONArray;

import com.alibaba.fastjson.JSONObject;

import com.genersoft.iot.vmp.gb28181.bean.Device;

import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;

import com.genersoft.iot.vmp.utils.DateUtil;

import org.dom4j.Attribute;

import org.dom4j.Document;

import org.dom4j.DocumentException;

@@ -180,7 +182,7 @@
        return xml.getRootElement();

    }



    public static DeviceChannel channelContentHander(Element itemDevice){

    public static DeviceChannel channelContentHander(Element itemDevice, Device device){

        Element channdelNameElement = itemDevice.element("Name");

        String channelName = channdelNameElement != null ? channdelNameElement.getTextTrim().toString() : "";

        Element statusElement = itemDevice.element("Status");

@@ -248,21 +250,26 @@
            }else {

                deviceChannel.setParentId(parentId);

            }

        }else {

            if (deviceChannel.getChannelId().length() <= 10) { // 此时为行政区划, 上下级行政区划使用DeviceId关联

                deviceChannel.setParentId(deviceChannel.getChannelId().substring(0, deviceChannel.getChannelId().length() - 2));

            }else if (deviceChannel.getChannelId().length() == 20) {

                if (Integer.parseInt(deviceChannel.getChannelId().substring(10, 13)) == 216) { // 虚拟组织

                    deviceChannel.setParentId(businessGroupID);

                }else if (deviceChannel.getCivilCode() != null) {

                    // 设备， 无parentId的20位是使用CivilCode表示上级的设备，

                    // 注：215 业务分组是需要有parentId的

                    deviceChannel.setParentId(deviceChannel.getCivilCode());

                }

            }else {

                deviceChannel.setParentId(deviceChannel.getDeviceId());

            }

        }

        deviceChannel.setBusinessGroupId(businessGroupID);



//        else {

//            if (deviceChannel.getChannelId().length() <= 10) { // 此时为行政区划, 上下级行政区划使用DeviceId关联

//                deviceChannel.setParentId(deviceChannel.getChannelId().substring(0, deviceChannel.getChannelId().length() - 2));

//            }else if (deviceChannel.getChannelId().length() == 20) {

//                if (Integer.parseInt(deviceChannel.getChannelId().substring(10, 13)) == 216) { // 虚拟组织

//                    deviceChannel.setBusinessGroupId(businessGroupID);

//                }else if (Integer.parseInt(device.getDeviceId().substring(10, 13) )== 118) {//NVR 如果上级设备编号是NVR则直接将NVR的编号设置给通道的上级编号

//                    deviceChannel.setParentId(device.getDeviceId());

//                }else if (deviceChannel.getCivilCode() != null) {

//                    // 设备， 无parentId的20位是使用CivilCode表示上级的设备，

//                    // 注：215 业务分组是需要有parentId的

//                    deviceChannel.setParentId(deviceChannel.getCivilCode());

//                }

//            }else {

//                deviceChannel.setParentId(deviceChannel.getDeviceId());

//            }

//        }



        if (XmlUtil.getText(itemDevice, "SafetyWay") == null

                || XmlUtil.getText(itemDevice, "SafetyWay") == "") {

@@ -308,6 +315,32 @@
        } else {

            deviceChannel.setLatitude(0.00);

        }

        deviceChannel.setGpsTime(DateUtil.getNow());

        if (deviceChannel.getLongitude()*deviceChannel.getLatitude() > 0) {

            if ("WGS84".equals(device.getGeoCoordSys())) {

                deviceChannel.setLongitudeWgs84(deviceChannel.getLongitude());

                deviceChannel.setLatitudeWgs84(deviceChannel.getLatitude());

                Double[] position = Coordtransform.WGS84ToGCJ02(deviceChannel.getLongitude(), deviceChannel.getLatitude());

                deviceChannel.setLongitudeGcj02(position[0]);

                deviceChannel.setLatitudeGcj02(position[1]);

            }else if ("GCJ02".equals(device.getGeoCoordSys())) {

                deviceChannel.setLongitudeGcj02(deviceChannel.getLongitude());

                deviceChannel.setLatitudeGcj02(deviceChannel.getLatitude());

                Double[] position = Coordtransform.GCJ02ToWGS84(deviceChannel.getLongitude(), deviceChannel.getLatitude());

                deviceChannel.setLongitudeWgs84(position[0]);

                deviceChannel.setLatitudeWgs84(position[1]);

            }else {

                deviceChannel.setLongitudeGcj02(0.00);

                deviceChannel.setLatitudeGcj02(0.00);

                deviceChannel.setLongitudeWgs84(0.00);

                deviceChannel.setLatitudeWgs84(0.00);

            }

        }else {

            deviceChannel.setLongitudeGcj02(deviceChannel.getLongitude());

            deviceChannel.setLatitudeGcj02(deviceChannel.getLatitude());

            deviceChannel.setLongitudeWgs84(deviceChannel.getLongitude());

            deviceChannel.setLatitudeWgs84(deviceChannel.getLatitude());

        }

        if (XmlUtil.getText(itemDevice, "PTZType") == null || "".equals(XmlUtil.getText(itemDevice, "PTZType"))) {

            //兼容INFO中的信息

            Element info = itemDevice.element("Info");