From 3ccb7c60e1ed8b6748ed7fb8b64b1dbe50d62abf Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期五, 28 十月 2022 15:56:18 +0800
Subject: [PATCH] 修改 DataDocking4Socket 对接程序
---
Socket/IStation.DataDockingSocket4NT/control/SendControlJobHelper.cs | 67 +++++++++++----------------------
1 files changed, 23 insertions(+), 44 deletions(-)
diff --git a/Socket/IStation.DataDockingSocket4NT/control/SendControlJobHelper.cs b/Socket/IStation.DataDockingSocket4NT/control/SendControlJobHelper.cs
index ae449c8..09fc411 100644
--- a/Socket/IStation.DataDockingSocket4NT/control/SendControlJobHelper.cs
+++ b/Socket/IStation.DataDockingSocket4NT/control/SendControlJobHelper.cs
@@ -12,6 +12,9 @@
/// </summary>
public class SendControlJobHelper
{
+ /// <summary>
+ /// 浠嶮Q閲岄潰鑾峰彇鎺у埗鎸囦护 杈呭姪绫�
+ /// </summary>
private static RabbitMqExChangeHelper _queueHelper = null;
/// <summary>
@@ -45,67 +48,43 @@
{
if (paras == null)
{
- LogHelper.Info("鍗楅�氭帶鍒跺懡浠わ紝鏁版嵁搴忓垪鍖栧け璐�");
+ NtLogHelper.Info("鍗楅�氭帶鍒跺懡浠わ紝鏁版嵁搴忓垪鍖栧け璐�");
return true;
}
- byte[] bts = null;
- switch (paras.Type)
+ switch (paras.ControlType)
{
- case 0: bts = MsgDataHelper.GetControlMsg鍏虫満(); break;//浠庤緟鍔╃被涓幏鍙� 鍏抽棴
- case 1: bts = MsgDataHelper.GetControlMsg寮�鏈�(); break;//浠庤緟鍔╃被涓幏鍙� 寮�鍚�
- case -1:
+ case Model.MonitorTestControlParas.eControlType.Stop:
{
- if (string.IsNullOrEmpty(paras.Paras))
- {
- LogHelper.Error($"[璋冮]鍙傛暟: null");
+ ShutDownMsgHelper.StartJob(session);
+ }
+ break;
+ case Model.MonitorTestControlParas.eControlType.Start:
+ {
+ if (string.IsNullOrEmpty(paras.Context))
return false;
- }
- if (!double.TryParse(paras.Paras, out double value))
- {
- LogHelper.Error($"[璋冮]鍙傛暟寮傚父:{paras.Paras}");
- return false;
- }
- else
- {
- bts = MsgDataHelper.GetControlMsg璋冮(value);
- LogHelper.Info($"[璋冮]鍙傛暟:{paras.Paras}");
- }
+ var context = Model.MonitorTestControlParas.StartContext.ToModel(paras.Context);
+ if (context == null)
+ return default;
+ NtLogHelper.Debug(context.ToJson());
+ StartUpMsgHelper.StartJob(session, context);
}
- break;//浠庤緟鍔╃被涓幏鍙� 鍙橀
- default: break;
- }
- if (bts != null)
- {
- if (session != null)
- {
- if (session.IsConnected)
- {
- session.Send(bts, 0, bts.Length);
- LogHelper.Info(session.SessionName + ":" + BitTransfer.ToString(bts) + ", 鍙戦�佷竴鏉¤姹傛帶鍒舵寚浠�");
- }
- else
- {
- LogHelper.Error($"session杩炴帴鍏抽棴ing...");
- return false;
- }
- }
- else
- {
- LogHelper.Error($"session:null");
+ break;
+ default:
return false;
- }
}
return true;
}
catch (Exception ex)
{
- LogHelper.Error("鍗楅�氭帶鍒跺懡浠�,鏁版嵁娑堟伅闃熷垪鍑洪敊锛岃嚜鍔ㄨ烦杩�", ex);
+ NtLogHelper.Error("鍗楅�氭帶鍒跺懡浠�,鏁版嵁娑堟伅闃熷垪鍑洪敊锛岃嚜鍔ㄨ烦杩�", ex);
return true;
}
});
});
-
}
+
+
+
}
}
--
Gitblit v1.9.3