Merge branch 'gbt28181_0227' into 'master_dev'

perf: 异常日志策略调整

See merge request yunteng/thingskit!350

@@ -159,7 +159,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
       CSeqHeader cseqHeader = (CSeqHeader) responseEvent.getResponse().getHeader(CSeqHeader.NAME);
       String methodName = cseqHeader.getMethod();
       SIPResponse request = (SIPResponse) responseEvent.getResponse();
-      log.info(
+      log.debug(
           "收到ResponseEvent，方法类型【{}】，状态码【{}】，事件内容【{}】",
           methodName,
           status,
@@ -176,7 +176,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
         case BYE:
           break;
         default:
-          log.info("不支持的响应类型【{}】", method);
+          log.debug("不支持的响应类型【{}】", method);
       }
       if (status != Response.UNAUTHORIZED && responseEvent.getResponse() != null && sipSubscribe.getOkSubscribesSize() > 0 ) {
         CallIdHeader callIdHeader = (CallIdHeader)responseEvent.getResponse().getHeader(CallIdHeader.NAME);
@@ -192,7 +192,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
     } else if ((status >= Response.TRYING) && (status < Response.OK)) {
       // 增加其它无需回复的响应，如101、180等
     } else {
-      log.error("收到ResponseEvent，状态码【{}】，失败原因【{}】", status, response.getReasonPhrase());
+      log.error("收到ResponseEvent，设备【{}】,状态码【{}】，失败原因【{}】，ResponseEvent内容【{}】",response.getHeader(FromHeader.NAME),status, response.getReasonPhrase(),response.getRawContent() == null ? null : new String(response.getRawContent()));
       if (responseEvent.getResponse() != null && sipSubscribe.getErrorSubscribesSize() > 0 ) {
           CallIdHeader callIdHeader = (CallIdHeader)responseEvent.getResponse().getHeader(CallIdHeader.NAME);
           if (callIdHeader != null) {
@@ -219,7 +219,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
   public void processRequest(RequestEvent requestEvent) {
     String methodName = requestEvent.getRequest().getMethod();
     SIPRequest request = (SIPRequest) requestEvent.getRequest();
-    log.info(
+    log.debug(
         "收到RequestEvent，方法类型【{}】，事件内容【{}】",
         methodName,
         request.getRawContent() == null ? null : new String(request.getRawContent()));
@@ -350,7 +350,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
       }
       String cmdType = TKXmlUtil.getText(rootElement, "CmdType");
       VideoXmlEnum msgType = VideoXmlEnum.valueOf(rootElement.getName());
-      log.error(
+      log.trace(
           "SIP服务器【{}】处理设备【{}】请求消息，方法类型【{}】，MESSAGE类型【{}】，命令类型【{}】请求内容【{}】",
           request.getLocalAddress(),
           request.getRemoteAddress(),
@@ -409,7 +409,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
       // 第一次注册,返回401
       AuthorizationHeader authHead =
           (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME);
-      log.error(
+      log.debug(
           "SIP服务器【{}】收到设备【{}】请求事件，类型【{}】鉴权头不存在【{}】密码【{}】",
           request.getLocalAddress(),
           request.getRemoteAddress(),
@@ -948,7 +948,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
 
     try {
       SIPResponse response = (SIPResponse) evt.getResponse();
-      log.error(
+      log.trace(
           "SIP服务器【{}】处理设备【{}】响应事件，类型【{}】内容【{}】",
           response.getLocalAddress(),
           response.getRemoteAddress(),

@@ -44,7 +44,7 @@ public class SIPSender {
   public void transmitRequest(
       String ip, Message message, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent)
       throws SipException {
-    log.error("SIP服务器【{}】往设备推送消息【{}】内容【{}】", ip,message.getClass().getName(), message);
+    log.trace("SIP服务器【{}】往设备推送消息【{}】内容【{}】", ip,message.getClass().getName(), message);
     ViaHeader viaHeader = (ViaHeader) message.getHeader(ViaHeader.NAME);
     String transport = UDP;
     if (viaHeader == null) {

@@ -257,6 +257,24 @@ public class TKXmlUtil {
     if (nameElement != null) {
       deviceChannel.setName(nameElement.getText());
     }
+
+    // 设备状态
+    String status = getText(itemDevice, "Status");
+    if (status != null) {
+      // ONLINE OFFLINE HIKVISION DS-7716N-E4 NVR的兼容性处理
+      if (status.equals("ON")
+              || status.equals("On")
+              || status.equals("ONLINE")
+              || status.equals("OK")) {
+        deviceChannel.setStatus(StatusEnum.ONLINE);
+      }
+      if (status.equals("OFF") || status.equals("Off") || status.equals("OFFLINE")) {
+        deviceChannel.setStatus(StatusEnum.OFFLINE);
+      }
+    } else {
+      deviceChannel.setStatus(StatusEnum.ONLINE);
+    }
+
     if (channelId.length() <= 8) {
       deviceChannel.setHasAudio(false);
       String parentCode = getParentCivilCode(channelId);
@@ -266,7 +284,6 @@ public class TKXmlUtil {
       } else {
         log.warn("[xml解析] 无法确定行政区划{}的上级行政区划", channelId);
       }
-      deviceChannel.setStatus(StatusEnum.ONLINE);
       return deviceChannel;
     } else {
       if (channelId.length() != 20) {
@@ -503,23 +520,6 @@ public class TKXmlUtil {
             deviceChannel.setPassword(password);
           }
 
-          // 设备状态
-          String status = getText(itemDevice, "Status");
-          if (status != null) {
-            // ONLINE OFFLINE HIKVISION DS-7716N-E4 NVR的兼容性处理
-            if (status.equals("ON")
-                || status.equals("On")
-                || status.equals("ONLINE")
-                || status.equals("OK")) {
-              deviceChannel.setStatus(StatusEnum.ONLINE);
-            }
-            if (status.equals("OFF") || status.equals("Off") || status.equals("OFFLINE")) {
-              deviceChannel.setStatus(StatusEnum.OFFLINE);
-            }
-          } else {
-            deviceChannel.setStatus(StatusEnum.ONLINE);
-          }
-
           // 经度
           String longitude = getText(itemDevice, "Longitude");
           if (DataUtils.isDouble(longitude)) {