From 90f09606dcf5c1f8738e014b8f6fad7b27426d79 Mon Sep 17 00:00:00 2001
From: htjcAdmin <qinyanlei@ht-atia.com>
Date: Wed, 5 Mar 2025 13:06:43 +0800
Subject: [PATCH] =?UTF-8?q?/*=E6=AD=A6=E6=B1=89=E7=AB=99=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E6=8A=A5=E6=96=87=E8=A7=A3=E6=9E=90=E5=BC=82=E5=B8=B8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82*/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/inspect/tcpserver/tcp/DownXml2Json.java | 5 +++++
 src/main/java/com/inspect/tcpserver/tcp/NettyServer.java  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/inspect/tcpserver/tcp/DownXml2Json.java b/src/main/java/com/inspect/tcpserver/tcp/DownXml2Json.java
index 145158a..e4ea035 100644
--- a/src/main/java/com/inspect/tcpserver/tcp/DownXml2Json.java
+++ b/src/main/java/com/inspect/tcpserver/tcp/DownXml2Json.java
@@ -5,8 +5,11 @@ import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.naming.NoNameCoder;
 import com.thoughtworks.xstream.io.xml.Xpp3Driver;
 import com.thoughtworks.xstream.security.AnyTypePermission;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DownXml2Json {
+    private Logger logger = LoggerFactory.getLogger(DownXml2Json.class);
 
     /**
      * 默认为对上级的客户端的别名
@@ -189,6 +192,8 @@ public class DownXml2Json {
     //设备告警数据
     public String AlarmControlXml2Json(String xml) {
         XStream xStream = new XStream(new Xpp3Driver(new NoNameCoder()));
+        //xStream.alias(alias, AlarmControl.class);
+        logger.info("[XML] AlarmControlXml2Json alias: {}", alias);
         xStream.alias(alias, AlarmControl.class);
         xStream.autodetectAnnotations(true);
         xStream.ignoreUnknownElements();
diff --git a/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java b/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java
index 4403f62..d7f51ce 100644
--- a/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java
+++ b/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java
@@ -47,7 +47,7 @@ public class NettyServer {
     /**
      * 接收/发送报文xml外层别名
      */
-    private String alias = "PatrolDevice";
+    private String alias = "PatrolHost";
 
     @Resource
     ClientController clientController;