From d26504c841ab95d902305c47c9587a22006e779d Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Thu, 19 Jun 2025 14:19:12 +0800
Subject: [PATCH] =?UTF-8?q?socket=E9=80=9A=E8=AE=AF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/SocketDevResponseService.java         | 15 +++++++++++++++
 .../pojo/enums/SourceOperateCodeEnum.java         |  1 +
 .../detection/util/socket/cilent/NettyClient.java |  4 +++-
 .../report/service/impl/PqReportServiceImpl.java  |  4 ++--
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
index 20597d1f..b4a25364 100644
--- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
+++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
@@ -156,6 +156,21 @@ public class SocketDevResponseService {
             case Coefficient_Check:
                 coefficient(param, socketDataMsg);
                 break;
+                //报告处理
+            case REPORT_CAT:
+                SourceOperateCodeEnum temOp = SourceOperateCodeEnum.getDictDataEnumByCode(socketDataMsg.getOperateCode());
+                SourceResponseCodeEnum dictDataEnumByCode = SourceResponseCodeEnum.getDictDataEnumByCode(socketDataMsg.getCode());
+                switch (Objects.requireNonNull(dictDataEnumByCode)){
+                    case SUCCESS:
+                        SocketManager.removeUser(param.getUserPageId()+handlerStr);
+                        break;
+                    case UNPROCESSED_BUSINESS:
+                        break;
+                    default:
+                        SocketManager.removeUser(param.getUserPageId()+handlerStr);
+                        System.out.println(socketDataMsg);
+                }
+                break;
             //退出关闭
             case QUITE:
                 quitDeal(socketDataMsg, param, msg);
diff --git a/detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceOperateCodeEnum.java b/detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceOperateCodeEnum.java
index 5bdc8dfc..4eed63f0 100644
--- a/detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceOperateCodeEnum.java
+++ b/detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceOperateCodeEnum.java
@@ -55,6 +55,7 @@ public enum SourceOperateCodeEnum {
     QUITE_SOURCE("close_source","关闭源通讯"),
     ERROR_FLOW_END("error_flow_end","当前流程存在异常结束"),
     YXT("yxt","心跳"),
+    REPORT_CAT("FTP_SEND$01","处理报告"),
 
     UNKNOWN_OPERATE("unknown_operate","未知的操作返回,请联系管理员排查"),
     SOCKET_TIMEOUT("socket_timeout","与源或者装置通讯等待超时"),
diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyClient.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyClient.java
index 2269996a..f3550cd4 100644
--- a/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyClient.java
+++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyClient.java
@@ -76,7 +76,7 @@ public class NettyClient {
                 } else {
                     System.out.println("链接服务端成功...");
                     System.out.println("客户端向服务端发送消息：" + port + msg);
-                    channelFuture.channel().writeAndFlush(msg + "\n");
+                    channelFuture.channel().writeAndFlush(msg + "\n").sync();
                 }
             });
 
@@ -94,6 +94,8 @@ public class NettyClient {
                 SocketManager.addGroup(param.getUserPageId() + dev, group);
             }
 
+
+
         } catch (Exception e) {
             System.out.println("连接socket服务端发送异常............" + e.getMessage());
             group.shutdownGracefully();
diff --git a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
index 72265e7a..1db69d87 100644
--- a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
@@ -653,8 +653,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                 data.set("name", "njcn");
                 data.set("password", "Pqs@12345678");
                 data.set("port", "21");
-                data.set("path", "ftp://" + devIp + "/etc/temp.bin");
-                data.set("binData", base64String);
+                data.set("path", "ftp://" + devIp + "/etc/qrc.bin");
+                data.set("file", base64String);