From 61056f17af630053700a136380ccc6f1d0013111 Mon Sep 17 00:00:00 2001 From: lijiuwei Date: Sat, 9 Aug 2025 16:21:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E6=8A=A5=E5=88=B0?= =?UTF-8?q?=E4=B8=8A=E7=BA=A7=E7=B3=BB=E7=BB=9F=E7=9A=84=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tcpserver/cofiguration/ClientStart.java | 2 +- .../controller/UpstreamClientController.java | 1 - .../inspect/tcpserver/tcp/NettyClient.java | 26 +++++++++++++------ .../tcpserver/tcp/NettyClientHandler.java | 2 +- .../inspect/tcpserver/tcp/NettyServer.java | 10 +++---- 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/inspect/tcpserver/cofiguration/ClientStart.java b/src/main/java/com/inspect/tcpserver/cofiguration/ClientStart.java index 57a8fcc..79f1e5c 100644 --- a/src/main/java/com/inspect/tcpserver/cofiguration/ClientStart.java +++ b/src/main/java/com/inspect/tcpserver/cofiguration/ClientStart.java @@ -20,7 +20,7 @@ public class ClientStart implements CommandLineRunner { @Override public void run(String... args) { - + log.info("start connecting upperServer"); nettyClient.connectUpperSystemServer(); } } diff --git a/src/main/java/com/inspect/tcpserver/controller/UpstreamClientController.java b/src/main/java/com/inspect/tcpserver/controller/UpstreamClientController.java index ca8a859..e830b56 100644 --- a/src/main/java/com/inspect/tcpserver/controller/UpstreamClientController.java +++ b/src/main/java/com/inspect/tcpserver/controller/UpstreamClientController.java @@ -26,7 +26,6 @@ public class UpstreamClientController { MDC.put("traceId", uuid); log.info("这是一个来自springboot,logback的info级别的日志"); log.warn("这是一条来自springboot,logback的warn级别的日志"); - log.warn("这是一条来自springboot,logback的warn级别的日志2"); log.error("这是一条来自springboot,logback的error级别的日志", new Exception("系统错误")); return "success"; } diff --git a/src/main/java/com/inspect/tcpserver/tcp/NettyClient.java b/src/main/java/com/inspect/tcpserver/tcp/NettyClient.java index d47a0e2..6ab406d 100644 --- a/src/main/java/com/inspect/tcpserver/tcp/NettyClient.java +++ b/src/main/java/com/inspect/tcpserver/tcp/NettyClient.java @@ -103,6 +103,9 @@ public class NettyClient { this.sendCode = upSystemServerProperties.iipCode; this.receiveCode = upSystemServerProperties.upCode; + log.info("upperServer config serverIP:{}, serverPort:{}, sendCode:{}, receiveCode:{}", + this.serverIP, this.serverPort, this.sendCode, this.receiveCode); + try { // 客户端启动对象 Bootstrap bootstrap = new Bootstrap(); @@ -125,11 +128,11 @@ public class NettyClient { // ChannelFuture 类分析 , Netty 异步模型 // sync 作用是该方法不会再次阻塞 ChannelFuture channelFuture = bootstrap.connect(serverIP, serverPort).addListener(new ConnectionListener(this)).sync(); - log.info("nettyClient连接服务器成功"); + log.info("connected to upperServer"); // 关闭通道, 开始监听 channelFuture.channel().closeFuture().sync(); - } catch (InterruptedException e) { - e.printStackTrace(); + } catch(Exception e) { + log.error("error", e); } } @@ -154,8 +157,9 @@ public class NettyClient { client.sendProtoBuffer(allBuf); this.sendIndex++; + log.info("sent data to upperServer successfully"); } else { - log.warn("###### 会话:{}, 与上级系统连接失败 ######", uuid); + log.info("###### 会话:{}, 与上级系统连接失败 ######", uuid); } } @@ -266,11 +270,14 @@ public class NettyClient { json = downXml2Json.DownStreamJson2Xml(binaryModel.uuid, binaryModel.id, xml, ResultControl.class); break; default: - log.warn("ClienHandler接收到的type:{}不在处理范围内, 不予处理", type); + log.info("ClienHandler接收到的type:{}不在处理范围内, 不予处理", type); } + log.info("###### 消息处理返回json: {} ######", json); + // 将上级下发的指令，转发到业务端处理，接收业务端处理后的结果，上报给上级系统 if (type != SystemType.system && !StringUtil.isNullOrEmpty(json)) { + log.info("###### 调用业务端处理json: {} ######", json); //调用业务端处理 ResponseEntity ajaxResultResponseEntity = restTemplate.postForEntity(iipSendUrl, json, com.inspect.tcpserver.domain.Result.class); @@ -297,7 +304,7 @@ public class NettyClient { } else { // 调用业务端处理失败 - log.warn("下发指令，失败，httpCode:{}", statusCode); + log.info("下发指令，失败，httpCode:{}", statusCode); response = createDownFailResponse(); } @@ -305,6 +312,7 @@ public class NettyClient { // 将xml消息转为json格式字符串 //String msg = upJson2Xml.ModelJson2Xml(response); String msg = upJson2Xml.UpStreamJson2Xml(response, ModelControl.class); + log.info("###### 消息响应: {} ######", msg); // 上报上级系统，会话类型为响应 sendMsgToUpper(false, binaryModel.uuid, msg); @@ -368,7 +376,7 @@ public class NettyClient { cacheTimeInterval(heart, patrolDevice, nest, weather); } } catch (Exception e) { - e.printStackTrace(); + log.error("error", e); } } @@ -454,11 +462,13 @@ public class NettyClient { public void sendRegisterToUpper() { String xml = createRegHeart(false); + log.info("send register xml to upperServer: {}", xml); sendMsgToUpper(true, "", xml); } public void sendHeartbeatToUpper() { String xml = createRegHeart(true); + log.info("send heartbeat xml to upperServer: {}", xml); sendMsgToUpper(true, "", xml); } @@ -569,7 +579,7 @@ public class NettyClient { log.info("###### 会话:{}, 向上级系统发送模型更新上报指令 ######\n{}", uuid, xml); break; default: - log.warn("###### 会话:{}, 应用向上级系统发送消息, 类型: [{}] 不在处理范围内, 不予处理 ######", uuid, type); + log.info("###### 会话:{}, 应用向上级系统发送消息, 类型: [{}] 不在处理范围内, 不予处理 ######", uuid, type); } if (!StringUtils.isEmpty(xml)) { // 将设备别名转换为上级别名 diff --git a/src/main/java/com/inspect/tcpserver/tcp/NettyClientHandler.java b/src/main/java/com/inspect/tcpserver/tcp/NettyClientHandler.java index a953246..e3460ab 100644 --- a/src/main/java/com/inspect/tcpserver/tcp/NettyClientHandler.java +++ b/src/main/java/com/inspect/tcpserver/tcp/NettyClientHandler.java @@ -56,7 +56,7 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter { clientChannelHandlerContext = ctx; nettyClient.sendRegisterToUpper(); } catch (Exception e) { - e.printStackTrace(); + log.error("error", e); throw e; } } diff --git a/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java b/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java index a4b04ef..19102c4 100644 --- a/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java +++ b/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java @@ -170,7 +170,7 @@ public class NettyServer { nettyServerHandler.sendMsg(uuid, clientKey, allBuf, compact(xml), request); sendIndex++; } else { - log.warn(Color.RED + "###### 客户端[{}]离线! ######" + Color.END, clientKey); + log.info(Color.RED + "###### 客户端[{}]离线! ######" + Color.END, clientKey); } } @@ -260,10 +260,10 @@ public class NettyServer { return; } } else if (code.equals(ResponseType.fault)) { - log.warn(Color.RED + "###### 客户端[{}]响应结果为失败 ######" + Color.END, sendCode); + log.info(Color.RED + "###### 客户端[{}]响应结果为失败 ######" + Color.END, sendCode); return; } else if (code.equals(ResponseType.reject)) { - log.warn(Color.RED + "###### 客户端[{}]响应结果为拒绝 ######" + Color.END, sendCode); + log.info(Color.RED + "###### 客户端[{}]响应结果为拒绝 ######" + Color.END, sendCode); return; } } @@ -306,11 +306,11 @@ public class NettyServer { upstreamClientController.sendMsg(binaryModel.uuid, jsonObject.toJSONString()); } } else { - log.warn(Color.RED + "###### 客户端[{}]响应数据没有items ######" + Color.END, sendCode); + log.info(Color.RED + "###### 客户端[{}]响应数据没有items ######" + Color.END, sendCode); } break; default: - log.warn(Color.RED + "###### 客户端[{}]非法的消息不予处理 ######" + Color.END, sendCode); + log.info(Color.RED + "###### 客户端[{}]非法的消息不予处理 ######" + Color.END, sendCode); } break; case PushType.patrolDeviceState:// insert into basedata_mont_patdevstadata