From 43b50e8d4686fd70e9bdf716b3fe58e874ca52c0 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期四, 01 十二月 2022 13:41:05 +0800
Subject: [PATCH] 金庭泵站数据修改
---
Server/IStation.DataDocking.Socket/Job/PackageHandleHelper.cs | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/Server/IStation.DataDocking.Socket/Job/PackageHandleHelper.cs b/Server/IStation.DataDocking.Socket/Job/PackageHandleHelper.cs
index c794e11..c90568a 100644
--- a/Server/IStation.DataDocking.Socket/Job/PackageHandleHelper.cs
+++ b/Server/IStation.DataDocking.Socket/Job/PackageHandleHelper.cs
@@ -33,14 +33,19 @@
var configure = string.IsNullOrEmpty(mySession.RegisterCode) ? ConfigureList.Find(x => x.ConfigureParas.RegisterCode == message_str)
: ConfigureList.Find(x => x.ConfigureParas.RegisterCode == mySession.RegisterCode);
- /* if (configure==null)
- {
- configure = string.IsNullOrEmpty(mySession.Heartbeat) ? ConfigureList.Find(x => x.ConfigureParas.Heartbeat == message_str)
- : ConfigureList.Find(x => x.ConfigureParas.Heartbeat == mySession.Heartbeat);
- }*/
if (configure == null)
{
- LogHelper.Info($"Socket鏁版嵁瀵规帴浠诲姟涓�,绔彛锛歿mySession.Server.Options.Listeners.First().Port},鏀跺埌涓�鏉℃棤娉曡瘑鍒殑娑堟伅锛歿message_str}");
+ configure = string.IsNullOrEmpty(mySession.Heartbeat) ? ConfigureList.Find(x => x.ConfigureParas.Heartbeat == message_str)
+ : ConfigureList.Find(x => x.ConfigureParas.Heartbeat == mySession.Heartbeat);
+ if (configure != null)
+ {
+ mySession.Close($"鍏抽棴:[{configure.Name}]杩炴帴,鏈娴嬪埌娉ㄥ唽鐮�!");
+ return;
+ }
+ }
+ if (configure == null)
+ {
+ LogHelper.Info($"Socket鏁版嵁瀵规帴浠诲姟涓鍙{mySession.Server.Options.Listeners.First().Port}]鏀跺埌涓�鏉℃棤娉曡瘑鍒殑娑堟伅锛歿message_str}");
return;
}
@@ -53,7 +58,7 @@
var dataDocking = DataDockingSocketFactory.CreateSocket<IDataDockingSocket.IHandleHelper>(configure.ConfigureParas.DependencyFile);
if (dataDocking == null)
{
- LogHelper.Info($"Socket鏁版嵁瀵规帴涓�,{configure.Name},鍒涘缓鏁版嵁瀵规帴瀵硅薄澶辫触锛�");
+ LogHelper.Info($"Socket鏁版嵁瀵规帴涓璠{configure.Name}]鍒涘缓鏁版嵁瀵规帴瀵硅薄澶辫触锛�");
return;
}
if (message_str == mySession.RegisterCode)
@@ -63,17 +68,17 @@
}
else if (message_str == mySession.Heartbeat)
{
- LogHelper.Info($"Socket鏁版嵁瀵规帴涓�,{configure.Name},鎺ユ敹鍒板績璺冲寘锛歿message_str}");
+ LogHelper.Info($"Socket鏁版嵁瀵规帴涓璠{configure.Name}]鎺ユ敹鍒板績璺冲寘锛歿message_str}");
dataDocking.HandleHeartbeat(mySession);
}
else
{
- LogHelper.Info($"Socket鏁版嵁瀵规帴涓�,{configure.Name}锛屾帴鏀跺埌鏁版嵁锛歿message_bts}");
+ LogHelper.Info($"Socket鏁版嵁瀵规帴涓璠{configure.Name}]鎺ユ敹鍒版暟鎹細{message_bts}");
dataDocking.HandleData(mySession, requestInfo.Body, configure.Mappers, (receive_list) =>
{
if (receive_list == null || receive_list.Count < 1)
{
- LogHelper.Info($"Socket鏁版嵁瀵规帴涓紝娉ㄥ唽鐮�:{configure.Name},鑾峰彇娴嬬偣璁板綍澶辫触锛�");
+ LogHelper.Info($"Socket鏁版嵁瀵规帴,娉ㄥ唽鐮乕{configure.Name}]鑾峰彇娴嬬偣璁板綍澶辫触锛�");
return;
}
var queue = new RabbitMqQueueHelper();
@@ -83,14 +88,10 @@
ConfigureID = configure.ID,
Records = receive_list
});
- LogHelper.Info($"Socket鏁版嵁瀵规帴涓�:{configure.Name}锛屾垚鍔熸帹鍏ラ�氶亾{receive_list.Count()}鏉℃暟鎹紒");
+ LogHelper.Info($"Socket鏁版嵁瀵规帴涓璠{configure.Name}]鎴愬姛鎺ㄥ叆閫氶亾{receive_list.Count()}鏉℃暟鎹紒");
});
- }
-
-
- });
-
-
+ }
+ });
}
--
Gitblit v1.9.3