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;