/*统一发送上级系统接口调用。*/

.gitignore

@@ -34,3 +34,4 @@ build/
 /tcpServer.2022-04-21.log
 /log/
 /logs/
+/logs/inspect-tcpserver/info.log

logs/inspect-tcpserver/info.log

@@ -1,81 +0,0 @@
-14:07:47.223 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 44988 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-14:07:47.226 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-14:07:50.452 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 3.521 seconds (JVM running for 4.496)
-14:21:28.473 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 43668 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-14:21:28.476 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-14:21:31.658 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 3.476 seconds (JVM running for 4.462)
-14:54:40.471 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 4160 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-14:54:40.475 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-14:54:43.898 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 3.78 seconds (JVM running for 4.971)
-15:10:12.709 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 39584 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-15:10:12.712 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-15:10:16.432 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 4.106 seconds (JVM running for 5.02)
-15:12:52.484 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 18096 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-15:12:52.488 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-15:12:55.936 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 3.778 seconds (JVM running for 4.741)
-15:21:59.362 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 43776 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-15:21:59.366 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-15:22:03.533 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 4.521 seconds (JVM running for 5.758)
-15:25:43.817 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 15604 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-15:25:43.822 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-15:25:48.717 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 5.4 seconds (JVM running for 7.058)
-15:28:49.230 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 3180 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-15:28:49.234 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-15:28:53.952 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 5.112 seconds (JVM running for 6.697)
-15:31:39.383 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 33092 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-15:31:39.385 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-15:31:42.851 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 3.791 seconds (JVM running for 4.825)
-15:32:01.620 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 13500 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-15:32:01.624 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-15:32:06.081 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 4.888 seconds (JVM running for 6.111)
-15:42:28.742 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 10380 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-15:42:28.747 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-15:42:35.180 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 6.927 seconds (JVM running for 8.27)
-15:48:15.418 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 42420 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-15:48:15.422 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-15:48:21.236 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 6.264 seconds (JVM running for 7.924)
-15:56:06.655 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 37500 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-15:56:06.659 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-15:56:10.828 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 4.545 seconds (JVM running for 5.615)
-16:14:34.247 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 10652 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-16:14:34.253 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-16:14:42.923 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 9.132 seconds (JVM running for 11.39)
-16:22:08.116 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 29764 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-16:22:08.121 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-16:22:11.592 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 3.829 seconds (JVM running for 5.018)
-16:57:01.092 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 308 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-16:57:01.097 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-16:57:04.736 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 4.005 seconds (JVM running for 5.04)
-17:35:29.960 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 37836 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-17:35:29.963 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-17:35:34.024 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 4.386 seconds (JVM running for 5.495)
-17:55:19.084 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 45456 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-17:55:19.088 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-17:55:22.553 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 3.76 seconds (JVM running for 4.676)
-18:06:35.959 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 24416 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-18:06:35.963 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-18:06:39.353 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 3.705 seconds (JVM running for 4.655)
-18:09:41.570 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 6080 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-18:09:41.574 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-18:09:45.821 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 4.587 seconds (JVM running for 5.699)
-18:11:01.755 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 23472 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-18:11:01.760 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-18:11:06.336 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 5.033 seconds (JVM running for 6.169)
-18:16:54.865 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 40552 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-18:16:54.874 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-18:17:03.531 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 9.36 seconds (JVM running for 11.293)
-18:17:35.846 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 45032 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-18:17:35.858 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-18:17:42.310 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 7.101 seconds (JVM running for 9.036)
-18:20:19.597 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 34856 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-18:20:19.603 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-18:20:27.444 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 8.384 seconds (JVM running for 10.432)
-18:34:49.982 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 23296 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-18:34:49.987 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-18:34:55.407 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 5.893 seconds (JVM running for 7.794)
-18:44:15.140 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 38280 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-18:44:15.143 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-18:44:18.485 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 3.623 seconds (JVM running for 4.61)
-18:46:55.872 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarting,55] - Starting TcpserverApplicationTests on QYL-HP-ZHAN66 with PID 29220 (started by gabri in E:\qinyl\intellij\src\inspect-tcpserver)
-18:46:55.875 [main] INFO  c.i.t.TcpserverApplicationTests - [logStartupProfileInfo,651] - No active profile set, falling back to default profiles: default
-18:46:59.051 [main] INFO  c.i.t.TcpserverApplicationTests - [logStarted,61] - Started TcpserverApplicationTests in 3.474 seconds (JVM running for 4.421)

src/main/java/com/inspect/tcpserver/controller/ClientController.java

@@ -40,24 +40,21 @@ public class ClientController {
     @PostMapping("sendMsg")
     public AjaxResult sendMsg(@RequestBody String msg) {
         try {
-
             if (StringUtils.isBlank(msg)) {
                 return AjaxResult.fail("500", "发送消息msg为空");
             }
 
             // 此处只是为了判断传入的格式是否正确
             JSONObject jsonObject = JSONObject.parseObject(msg);
-
             if (null == jsonObject) {
                 return AjaxResult.fail("500", "发送消息json对象为空");
             }
 
-            logger.info("巡视主机客户端接收到消息，发送到上级。{}", msg);
+            logger.info("巡视主机客户端接收到消息，发送到上级{}", msg);
             msg = msg.replaceAll("sendCode", "SendCode");
             msg = msg.replaceAll("receiveCode", "ReceiveCode");
             msg = msg.replaceAll("type", "Type");
             nettyClient.sendJsonMessage(msg);
-
             return AjaxResult.success();
         } catch (Exception e) {
             logger.error("客户端发送消息捕获异常", e);

src/main/java/com/inspect/tcpserver/tcp/BaseControl.java

@@ -104,13 +104,13 @@ class TaskSendModel {
 
 }
 
-class LendonTaskControl extends BaseControl {
-    public List<LendonTaskModel> Items;
+class LinkageTaskControl extends BaseControl {
+    public List<LinkageTaskModel> Items;
 }
 
 //联动任务下发
 @XStreamAlias("Item")
-class LendonTaskModel {
+class LinkageTaskModel {
     @XStreamAsAttribute
     public String task_code;                //任务编码
     @XStreamAsAttribute

src/main/java/com/inspect/tcpserver/tcp/DownXml2Json.java

@@ -66,11 +66,11 @@ public class DownXml2Json {
     //联动任务下发
     public String LinkageTaskControlXml2Json(String xml) {
         XStream xStream = new XStream(new Xpp3Driver(new NoNameCoder()));
-        xStream.alias(alias, LendonTaskControl.class);
+        xStream.alias(alias, LinkageTaskControl.class);
         xStream.autodetectAnnotations(true);
         xStream.ignoreUnknownElements();
         xStream.addPermission(AnyTypePermission.ANY);
-        LendonTaskControl obj = (LendonTaskControl) xStream.fromXML(xml);
+        LinkageTaskControl obj = (LinkageTaskControl) xStream.fromXML(xml);
         String resultJson = JSON.toJSONString(obj);
         return resultJson;
     }

src/main/java/com/inspect/tcpserver/tcp/NettyClient.java

@@ -135,7 +135,7 @@ public class NettyClient {
     }
 
     //发送消息
-    public void SendMsg(boolean request, String xml) {
+    public void sendMsgToUpper(boolean request, String xml) {
         if (client != null && !StringUtil.isNullOrEmpty(xml)) {
             ByteBuf byteBuf = Unpooled.copiedBuffer(xml, CharsetUtil.UTF_8);
             int length = byteBuf.readableBytes();
@@ -178,7 +178,7 @@ public class NettyClient {
         executorService.execute(() ->
         {
             try {
-                ThreadDealMsg(binaryModel);
+                threadDealMsg(binaryModel);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -186,9 +186,8 @@ public class NettyClient {
     }
 
     //处理接收消息
-    private void ThreadDealMsg(BinaryModel binaryModel) throws DocumentException {
+    private void threadDealMsg(BinaryModel binaryModel) throws DocumentException {
         String xml = binaryModel.dataBuf.toString(CharsetUtil.UTF_8);
-        logger.info("收到上级系统消息：{}", xml);
         this.receiveIndex = binaryModel.sendIndex;
         SAXReader saxReader = new SAXReader();
         Document document = saxReader.read(new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8)));
@@ -213,6 +212,8 @@ public class NettyClient {
         // 发送给上级的响应
         String response = "";
         String json = null;
+
+        logger.info("################ 收到上级系统消息:{}, 类型: {} ################\n{}", binaryModel.id, type, xml);
         switch (type) {
             case SystemType.system:
                 switch (command) {
@@ -230,32 +231,40 @@ public class NettyClient {
             case RobotType.robotFz:
             case RobotType.robotIr:
             case RobotType.robotPtz:
-                json = downXml2Json.RobotControlXml2Json(xml);
+//                json = downXml2Json.RobotControlXml2Json(xml);
+                json = downXml2Json.DownStreamJson2Xml(binaryModel.id, xml, RobotControl.class);
                 break;
             case UAVType.uav:
             case UAVType.uavXj:
             case UAVType.uavKz:
             case UAVType.uavYt:
             case UAVType.nest:
-                json = downXml2Json.UavControlXml2Json(xml);
+//                json = downXml2Json.UavControlXml2Json(xml);
+                json = downXml2Json.DownStreamJson2Xml(binaryModel.id, xml, RobotControl.class);
                 break;
             case TaskType.taskControl:
-                json = downXml2Json.BaseControlXml2Json(xml);
+//                json = downXml2Json.BaseControlXml2Json(xml);
+                json = downXml2Json.DownStreamJson2Xml(binaryModel.id, xml, BaseControl.class);
                 break;
             case TaskType.taskSend:
-                json = downXml2Json.TaskSendControlXml2Json(xml);
+//                json = downXml2Json.TaskSendControlXml2Json(xml);
+                json = downXml2Json.DownStreamJson2Xml(binaryModel.id, xml, TaskSendControl.class);
                 break;
             case TaskType.lendonTask:
-                json = downXml2Json.LinkageTaskControlXml2Json(xml);
+//                json = downXml2Json.LinkageTaskControlXml2Json(xml);
+                json = downXml2Json.DownStreamJson2Xml(binaryModel.id, xml, LinkageTaskControl.class);
                 break;
             case TaskType.taskArea:
-                json = downXml2Json.AreaControlXml2Json(xml);
+//                json = downXml2Json.AreaControlXml2Json(xml);
+                json = downXml2Json.DownStreamJson2Xml(binaryModel.id, xml, AreaControl.class);
                 break;
             case ModelType.modelSync:
-                json = downXml2Json.BaseControlXml2Json(xml);
+//                json = downXml2Json.BaseControlXml2Json(xml);
+                json = downXml2Json.DownStreamJson2Xml(binaryModel.id, xml, BaseControl.class);
                 break;
             case QueryType.queryResult:
-                json = downXml2Json.ResultControlXml2Json(xml);
+//                json = downXml2Json.ResultControlXml2Json(xml);
+                json = downXml2Json.DownStreamJson2Xml(binaryModel.id, xml, ResultControl.class);
                 break;
             default:
                 logger.warn("client-handle-接收到的type:{},不在处理范围内，不予处理", type);
@@ -298,7 +307,7 @@ public class NettyClient {
             String msg = upJson2Xml.ModelJson2Xml(response);
 
             // 上报上级系统，会话类型为响应
-            SendMsg(false, msg);
+            sendMsgToUpper(false, msg);
         }
     }
 
@@ -423,12 +432,12 @@ public class NettyClient {
 
     public void SendRegister() {
         String xml = createRegHeart(false);
-        SendMsg(true, xml);
+        sendMsgToUpper(true, xml);
     }
 
     public void SendHeart() {
         String xml = createRegHeart(true);
-        SendMsg(true, xml);
+        sendMsgToUpper(true, xml);
     }
 
 
@@ -462,64 +471,79 @@ public class NettyClient {
             String xml = null;
             switch (type) {
                 case PushType.environment:
-                    xml = upJson2Xml.EnvironmentControlJson2Xml(json);
+//                    xml = upJson2Xml.EnvironmentControlJson2Xml(json);
+                    xml = upJson2Xml.UpStreamJson2Xml(json, EnvironmentControl.class);
                     logger.info("################ 向上级系统发送环境数据 ################\n{}", xml);
                     break;
                 case PushType.alarm:
-                    xml = upJson2Xml.AlarmControlJson2Xml(json);
+//                    xml = upJson2Xml.AlarmControlJson2Xml(json);
+                    xml = upJson2Xml.UpStreamJson2Xml(json, AlarmControl.class);
                     logger.info("################ 向上级系统发送巡视设备异常告警数据 ################\n{}", xml);
                     break;
                 case PushType.analysisAlarm:
-                    xml = upJson2Xml.AnalysisControlJson2Xml(json);
+//                    xml = upJson2Xml.AnalysisControlJson2Xml(json);
+                    xml = upJson2Xml.UpStreamJson2Xml(json, AnalysisControl.class);
                     logger.info("################ 向上级系统发送告警数据 ################\n{}", xml);
                     break;
                 case PushType.location:
-                    xml = upJson2Xml.LocationControlJson2Xml(json);
+//                    xml = upJson2Xml.LocationControlJson2Xml(json);
+                    xml = upJson2Xml.UpStreamJson2Xml(json, LocationControl.class);
                     logger.info("################ 向上级系统发送巡视设备坐标 ################\n{}", xml);
                     break;
                 case PushType.monitor:
-                    xml = upJson2Xml.MonitorControlJson2Xml(json);
+//                    xml = upJson2Xml.MonitorControlJson2Xml(json);
+                    xml = upJson2Xml.UpStreamJson2Xml(json, MonitorControl.class);
                     logger.info("################ 向上级系统发送静默监视告警数据 ################\n{}", xml);
                     break;
                 case PushType.nestRunning:
-                    xml = upJson2Xml.NestRunningJson2Xml(json);
+//                    xml = upJson2Xml.NestRunningJson2Xml(json);
+                    xml = upJson2Xml.UpStreamJson2Xml(json, NestRuningControl.class);
                     logger.info("################ 向上级系统发送无人机机巢运行数据 ################\n{}", xml);
                     break;
                 case PushType.nestState:
-                    xml = upJson2Xml.NestStateJson2Xml(json);
+//                    xml = upJson2Xml.NestStateJson2Xml(json);
+                    xml = upJson2Xml.UpStreamJson2Xml(json, NestStateControl.class);
                     logger.info("################ 向上级系统发送无人机机巢状态数据 ################\n{}", xml);
                     break;
                 case PushType.patrolDeviceState:
-                    xml = upJson2Xml.PatrolDeviceStateControlJson2Xml(json);
+//                    xml = upJson2Xml.PatrolDeviceStateControlJson2Xml(json);
+                    xml = upJson2Xml.UpStreamJson2Xml(json, PatrolDeviceStateControl.class);
                     logger.info("################ 向上级系统发送巡视设备状态数据 ################\n{}", xml);
                     break;
                 case PushType.patrolDeviceRunning:
-                    xml = upJson2Xml.PatrolDeviceRunningControlJson2Xml(json);
+//                    xml = upJson2Xml.PatrolDeviceRunningControlJson2Xml(json);
+                    xml = upJson2Xml.UpStreamJson2Xml(json, PatrolDeviceRuningControl.class);
                     logger.info("################ 向上级系统发送巡视设备运行数据 ################\n{}", xml);
                     break;
                 case PushType.result:
-                    xml = upJson2Xml.TaskResultControlJson2Xml(json);
+//                    xml = upJson2Xml.TaskResultControlJson2Xml(json);
+                    xml = upJson2Xml.UpStreamJson2Xml(json, TaskResultControl.class);
                     logger.info("################ 向上级系统发送巡视结果 ################\n{}", xml);
                     break;
                 case PushType.taskState:
-                    xml = upJson2Xml.TaskStateControlJson2Xml(json);
+//                    xml = upJson2Xml.TaskStateControlJson2Xml(json);
+                    xml = upJson2Xml.UpStreamJson2Xml(json, TaskStateControl.class);
                     logger.info("################ 向上级系统发送任务状态数据 ################\n{}", xml);
                     break;
                 case PushType.total:
-                    xml = upJson2Xml.ReportControlJson2Xml(json);
+//                    xml = upJson2Xml.ReportControlJson2Xml(json);
+                    xml = upJson2Xml.UpStreamJson2Xml(json, ReportControl.class);
                     logger.info("################ 向上级系统发送巡视设备统计信息上报 ################\n{}", xml);
                     break;
                 case PushType.route:
-                    xml = upJson2Xml.RouteControlJson2Xml(json);
+//                    xml = upJson2Xml.RouteControlJson2Xml(json);
+                    xml = upJson2Xml.UpStreamJson2Xml(json, RouteControl.class);
                     logger.info("################ 向上级系统发送巡视路线 ################\n{}", xml);
                     break;
                 case SystemType.system:
-                    xml = upJson2Xml.ModelJson2Xml(json);
+//                    xml = upJson2Xml.ModelJson2Xml(json);
+                    xml = upJson2Xml.UpStreamJson2Xml(json, ModelControl.class);
                     logger.info("################ 向上级系统发送系统数据 ################\n{}", xml);
                     break;
                 case ModelType.modelUpdate:
-                    xml = upJson2Xml.UpdateModelJson2Xml(json);
+//                    xml = upJson2Xml.UpdateModelJson2Xml(json);
                     //xml = up.ModelJson2Xml(json, UpdateModelControl.class);
+                    xml = upJson2Xml.UpStreamJson2Xml(json, UpdateModelControl.class);
                     logger.info("################ 向上级系统发送模型更新上报指令 ################\n{}", xml);
                     break;
                 default:
@@ -528,7 +552,7 @@ public class NettyClient {
             if (!StringUtils.isEmpty(xml)) {
                 // 将设备别名转换为上级别名
                 xml = xml.replaceAll(deviceAlias, alias);
-                SendMsg(true, xml);
+                sendMsgToUpper(true, xml);
             }
         }
     }

src/main/java/com/inspect/tcpserver/tcp/UpJson2Xml.java

@@ -118,10 +118,10 @@ public class UpJson2Xml {
 
     //联动任务下发指令
     public String LinkageTaskJson2Xml(String json) {
-        LendonTaskControl obj = JSON.parseObject(json, LendonTaskControl.class);
+        LinkageTaskControl obj = JSON.parseObject(json, LinkageTaskControl.class);
         XStream xStream = new XStream(new Xpp3Driver(new NoNameCoder()));
         xStream.autodetectAnnotations(true);
-        xStream.alias(alias, LendonTaskControl.class);
+        xStream.alias(alias, LinkageTaskControl.class);
         String resultXML = xStream.toXML(obj);
         return resultXML;
     }

src/main/resources/application-prod.yml

@@ -32,7 +32,7 @@ iip_server:
   send:
     url: http://199.199.199.104:9901/client/send
   authDevice:
-    url: http://199.199.199.199:9902/eqpbook/checkPatrolDeviceIsExist/%s
+    url: http://199.199.199.105:9902/eqpbook/checkPatrolDeviceIsExist/%s
 
 up_time_interval_setting: time_interval_up_system_setting