648540858
2020-10-13 f9ab13a14590d310937de7d78a36ee599dce750b
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
@@ -144,6 +144,7 @@
   private void processMessageCatalogList(RequestEvent evt) {
      try {
         Element rootElement = getRootElement(evt);
         String s = rootElement.toString();
         Element deviceIdElement = rootElement.element("DeviceID");
         String deviceId = deviceIdElement.getText().toString();
         Element deviceListElement = rootElement.element("DeviceList");
@@ -171,10 +172,10 @@
               DeviceChannel deviceChannel = new DeviceChannel();
               deviceChannel.setName(channelName);
               deviceChannel.setChannelId(channelDeviceId);
               if(status.equals("ON")) {
               if(status.equals("ON") || status.equals("On")) {
                  deviceChannel.setStatus(1);
               }
               if(status.equals("OFF")) {
               if(status.equals("OFF") || status.equals("Off")) {
                  deviceChannel.setStatus(0);
               }
@@ -185,7 +186,7 @@
               deviceChannel.setBlock(XmlUtil.getText(itemDevice,"Block"));
               deviceChannel.setAddress(XmlUtil.getText(itemDevice,"Address"));
               deviceChannel.setParental(itemDevice.element("Parental") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"Parental")));
               deviceChannel.setParentId(XmlUtil.getText(itemDevice,"ParentId"));
               deviceChannel.setParentId(XmlUtil.getText(itemDevice,"ParentID"));
               deviceChannel.setSafetyWay(itemDevice.element("SafetyWay") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"SafetyWay")));
               deviceChannel.setRegisterWay(itemDevice.element("RegisterWay") == null? 1:Integer.parseInt(XmlUtil.getText(itemDevice,"RegisterWay")));
               deviceChannel.setCertNum(XmlUtil.getText(itemDevice,"CertNum"));
@@ -199,6 +200,7 @@
               deviceChannel.setLongitude(itemDevice.element("Longitude") == null? 0.00:Double.parseDouble(XmlUtil.getText(itemDevice,"Longitude")));
               deviceChannel.setLatitude(itemDevice.element("Latitude") == null? 0.00:Double.parseDouble(XmlUtil.getText(itemDevice,"Latitude")));
               deviceChannel.setPTZType(itemDevice.element("PTZType") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"PTZType")));
               deviceChannel.setHasAudio(false); // 默认含有音频为false
               storager.updateChannel(device.getDeviceId(), deviceChannel);
            }
            // 更新
@@ -209,8 +211,11 @@
            msg.setType(DeferredResultHolder.CALLBACK_CMD_CATALOG);
            msg.setData(device);
            deferredResultHolder.invokeResult(msg);
            // 回复200
            responseAck(evt);
         }
      } catch (DocumentException e) {
      } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
         e.printStackTrace();
      }
   }