支持接口鉴权，支持修改密码，

panlinlin

2021-04-14 cb5849d8a14f55241c44bdf6724b18de7950564d

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

@@ -40,7 +40,7 @@
import com.genersoft.iot.vmp.utils.GpsUtil;

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

import com.genersoft.iot.vmp.utils.redis.RedisUtil;

import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce;

import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;



import gov.nist.javax.sip.SipStackImpl;

import gov.nist.javax.sip.address.AddressImpl;

@@ -93,7 +93,7 @@
   private static final String MESSAGE_ALARM = "Alarm";

   private static final String MESSAGE_RECORD_INFO = "RecordInfo";

   private static final String MESSAGE_MEDIA_STATUS = "MediaStatus";

   // private static final String MESSAGE_BROADCAST = "Broadcast";

   private static final String MESSAGE_BROADCAST = "Broadcast";

   private static final String MESSAGE_DEVICE_STATUS = "DeviceStatus";

   private static final String MESSAGE_DEVICE_CONTROL = "DeviceControl";

   private static final String MESSAGE_DEVICE_CONFIG = "DeviceConfig";

@@ -123,7 +123,7 @@
            logger.info("接收到Catalog消息");

            processMessageCatalogList(evt);

         } else if (MESSAGE_DEVICE_INFO.equals(cmd)) {

            //DeviceInfo消息处理

            // DeviceInfo消息处理

            processMessageDeviceInfo(evt);

         } else if (MESSAGE_DEVICE_STATUS.equals(cmd)) {

            // DeviceStatus消息处理

@@ -149,6 +149,9 @@
         } else if (MESSAGE_PRESET_QUERY.equals(cmd)) {

            logger.info("接收到PresetQuery消息");

            processMessagePresetQuery(evt);

         } else if (MESSAGE_BROADCAST.equals(cmd)) {

            // Broadcast消息处理

            processMessageBroadcast(evt);

         } else {

            logger.info("接收到消息：" + cmd);

            responseAck(evt);

@@ -298,7 +301,7 @@
            // 远程启动功能

            if (!XmlUtil.isEmpty(XmlUtil.getText(rootElement, "TeleBoot"))) {

               if (deviceId.equals(targetGBId)) {

                  // 远程启动功能：需要在重新启动程序后先对SipStack解绑

                  // 远程启动本平台：需要在重新启动程序后先对SipStack解绑

                  logger.info("执行远程启动本平台命令");

                  ParentPlatform parentPlatform = storager.queryParentPlatById(platformId);

                  cmderFroPlatform.unregister(parentPlatform, null, null);

@@ -333,6 +336,7 @@
                  // 远程启动指定设备

               }

            }

            // 云台/前端控制命令

            if (!XmlUtil.isEmpty(XmlUtil.getText(rootElement,"PTZCmd")) && !deviceId.equals(targetGBId)) {

               String cmdString = XmlUtil.getText(rootElement,"PTZCmd");

               Device device = storager.queryVideoDeviceByPlatformIdAndChannelId(platformId, deviceId);

@@ -525,13 +529,44 @@
               String sn = snElement.getText();

               // 准备回复通道信息

               List<ChannelReduce> channelReduces = storager.queryChannelListInParentPlatform(parentPlatform.getServerGBId());

               // 查询关联的直播通道

               List<GbStream> gbStreams = storager.queryGbStreamListInPlatform(parentPlatform.getServerGBId());

               int size = channelReduces.size() + gbStreams.size();

               // 回复级联的通道

               if (channelReduces.size() > 0) {

                  for (ChannelReduce channelReduce : channelReduces) {

                     DeviceChannel deviceChannel = storager.queryChannel(channelReduce.getDeviceId(), channelReduce.getChannelId());

                     cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), channelReduces.size());

                     cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), size);

                  }

               }

               // 回复直播的通道

               if (gbStreams.size() > 0) {

                  for (GbStream gbStream : gbStreams) {

                     DeviceChannel deviceChannel = new DeviceChannel();

                     deviceChannel.setChannelId(gbStream.getGbId());

                     deviceChannel.setName(gbStream.getName());

                     deviceChannel.setLongitude(gbStream.getLongitude());

                     deviceChannel.setLatitude(gbStream.getLatitude());

                     deviceChannel.setDeviceId(parentPlatform.getDeviceGBId());

                     deviceChannel.setManufacture("wvp-pro");

                     deviceChannel.setStatus(gbStream.isStatus()?1:0);

//                     deviceChannel.setParentId(parentPlatform.getDeviceGBId());

                     deviceChannel.setRegisterWay(1);

                     deviceChannel.setCivilCode(cmder.getSipConfig().getSipDomain());

                     deviceChannel.setModel("live");

                     deviceChannel.setOwner("wvp-pro");

//                     deviceChannel.setAddress("test");

                     deviceChannel.setParental(0);

                     deviceChannel.setSecrecy("0");

                     deviceChannel.setSecrecy("0");



                     cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), size);

                  }

               }

               if (size == 0) {

                  // 回复无通道

                  cmderFroPlatform.catalogQuery(null, parentPlatform, sn, fromHeader.getTag(), size);

               }

            }





@@ -895,6 +930,37 @@
      }

   }



   /**

    * 处理AudioBroadcast语音广播Message

    * 
    * @param evt

    */

   private void processMessageBroadcast(RequestEvent evt) {

      try {

         Element rootElement = getRootElement(evt);

         String deviceId = XmlUtil.getText(rootElement, "DeviceID");

         // 回复200 OK

         responseAck(evt);

         if (rootElement.getName().equals("Response")) {

               // 此处是对本平台发出Broadcast指令的应答

            JSONObject json = new JSONObject();

            XmlUtil.node2Json(rootElement, json);

            if (logger.isDebugEnabled()) {

               logger.debug(json.toJSONString());

            }

            RequestMessage msg = new RequestMessage();

            msg.setDeviceId(deviceId);

            msg.setType(DeferredResultHolder.CALLBACK_CMD_BROADCAST);

            msg.setData(json);

            deferredResultHolder.invokeResult(msg);

         } else {

            // 此处是上级发出的Broadcast指令

         }

      } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {

         e.printStackTrace();

      }

   }





   /***

    * 回复200 OK