开发----增加预置位查询接口开发

chenjialing

2022-05-06 cc63a52884ca3c56df66b74aa508803ff91c20e0

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java

@@ -13,6 +13,7 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.gb28181.utils.Coordtransform;
import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
@@ -146,12 +147,15 @@
         } else {
            mobilePosition.setAltitude(0.0);
         }
         logger.info("[收到 移动位置订阅]：{}/{}->{}.{}", mobilePosition.getDeviceId(), mobilePosition.getChannelId(),
               mobilePosition.getLongitude(), mobilePosition.getLatitude());
         mobilePosition.setReportSource("Mobile Position");
         BaiduPoint bp = GpsUtil.Wgs84ToBd09(String.valueOf(mobilePosition.getLongitude()), String.valueOf(mobilePosition.getLatitude()));
         logger.info("百度坐标：" + bp.getBdLng() + ", " + bp.getBdLat());
         mobilePosition.setGeodeticSystem("BD-09");
         mobilePosition.setCnLng(bp.getBdLng());
         mobilePosition.setCnLat(bp.getBdLat());
         // 默认来源坐标系为WGS-84处理
         Double[] gcj02Point = Coordtransform.WGS84ToGCJ02(mobilePosition.getLongitude(), mobilePosition.getLatitude());
         logger.info("GCJ02坐标：" + gcj02Point[0] + ", " + gcj02Point[1]);
         mobilePosition.setGeodeticSystem("GCJ-02");
         mobilePosition.setCnLng(gcj02Point[0] + "");
         mobilePosition.setCnLat(gcj02Point[1] + "");
         if (!userSetting.getSavePositionHistory()) {
            storager.clearMobilePositionsByDeviceId(deviceId);
         }
@@ -213,7 +217,7 @@
         } else {
            deviceAlarm.setLatitude(0.00);
         }

         logger.info("[收到Notify-Alarm]：{}/{}", device.getDeviceId(), deviceAlarm.getChannelId());
         if (deviceAlarm.getAlarmMethod().equals("4")) {
            MobilePosition mobilePosition = new MobilePosition();
            mobilePosition.setDeviceId(deviceAlarm.getDeviceId());
@@ -221,12 +225,12 @@
            mobilePosition.setLongitude(deviceAlarm.getLongitude());
            mobilePosition.setLatitude(deviceAlarm.getLatitude());
            mobilePosition.setReportSource("GPS Alarm");
            BaiduPoint bp = new BaiduPoint();
            bp = GpsUtil.Wgs84ToBd09(String.valueOf(mobilePosition.getLongitude()), String.valueOf(mobilePosition.getLatitude()));
            logger.info("百度坐标：" + bp.getBdLng() + ", " + bp.getBdLat());
            mobilePosition.setGeodeticSystem("BD-09");
            mobilePosition.setCnLng(bp.getBdLng());
            mobilePosition.setCnLat(bp.getBdLat());
            // 默认来源坐标系为WGS-84处理
            Double[] gcj02Point = Coordtransform.WGS84ToGCJ02(mobilePosition.getLongitude(), mobilePosition.getLatitude());
            logger.info("GCJ02坐标：" + gcj02Point[0] + ", " + gcj02Point[1]);
            mobilePosition.setGeodeticSystem("GCJ-02");
            mobilePosition.setCnLng(gcj02Point[0] + "");
            mobilePosition.setCnLat(gcj02Point[1] + "");
            if (!userSetting.getSavePositionHistory()) {
               storager.clearMobilePositionsByDeviceId(deviceId);
            }
@@ -279,7 +283,7 @@
               Element eventElement = itemDevice.element("Event");
               DeviceChannel channel = XmlUtil.channelContentHander(itemDevice);
               channel.setDeviceId(device.getDeviceId());
               logger.debug("收到来自设备【{}】的通道: {}【{}】", device.getDeviceId(), channel.getName(), channel.getChannelId());
               logger.info("[收到 目录订阅]：{}/{}", device.getDeviceId(), channel.getChannelId());
               switch (eventElement.getText().toUpperCase()) {
                  case CatalogEvent.ON: // 上线
                     logger.info("收到来自设备【{}】的通道【{}】上线通知", device.getDeviceId(), channel.getChannelId());