From d5f08e9359fe22c4be229660d405a174b895fb23 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期三, 26 十月 2022 09:31:36 +0800
Subject: [PATCH] 南通 数据对接
---
Socket/IStation.DataDockingSocket4NT/control/SendControlJobHelper.cs | 38 +++++++++++++++++++++++++++++++++-----
Socket/IStation.DataDockingSocket4NT/helper/MsgDataHelper.cs | 14 +++++++-------
2 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/Socket/IStation.DataDockingSocket4NT/control/SendControlJobHelper.cs b/Socket/IStation.DataDockingSocket4NT/control/SendControlJobHelper.cs
index 6d6dce1..ae449c8 100644
--- a/Socket/IStation.DataDockingSocket4NT/control/SendControlJobHelper.cs
+++ b/Socket/IStation.DataDockingSocket4NT/control/SendControlJobHelper.cs
@@ -10,7 +10,7 @@
/// <summary>
/// 鍙戦�佹帶鍒舵寚浠よ緟鍔╃被
/// </summary>
- public class SendControlJobHelper
+ public class SendControlJobHelper
{
private static RabbitMqExChangeHelper _queueHelper = null;
@@ -43,7 +43,7 @@
{
try
{
- if(paras==null)
+ if (paras == null)
{
LogHelper.Info("鍗楅�氭帶鍒跺懡浠わ紝鏁版嵁搴忓垪鍖栧け璐�");
return true;
@@ -51,9 +51,27 @@
byte[] bts = null;
switch (paras.Type)
{
- case 0:bts = null; break;//浠庤緟鍔╃被涓幏鍙� 鍏抽棴
- case 1: bts = null; break;//浠庤緟鍔╃被涓幏鍙� 寮�鍚�
- case -1:bts = null;break;//浠庤緟鍔╃被涓幏鍙� 鍙橀
+ case 0: bts = MsgDataHelper.GetControlMsg鍏虫満(); break;//浠庤緟鍔╃被涓幏鍙� 鍏抽棴
+ case 1: bts = MsgDataHelper.GetControlMsg寮�鏈�(); break;//浠庤緟鍔╃被涓幏鍙� 寮�鍚�
+ case -1:
+ {
+ if (string.IsNullOrEmpty(paras.Paras))
+ {
+ LogHelper.Error($"[璋冮]鍙傛暟: null");
+ 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}");
+ }
+ }
+ break;//浠庤緟鍔╃被涓幏鍙� 鍙橀
default: break;
}
if (bts != null)
@@ -65,6 +83,16 @@
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");
+ return false;
}
}
return true;
diff --git a/Socket/IStation.DataDockingSocket4NT/helper/MsgDataHelper.cs b/Socket/IStation.DataDockingSocket4NT/helper/MsgDataHelper.cs
index 300f05e..06bdf4c 100644
--- a/Socket/IStation.DataDockingSocket4NT/helper/MsgDataHelper.cs
+++ b/Socket/IStation.DataDockingSocket4NT/helper/MsgDataHelper.cs
@@ -75,7 +75,7 @@
/// 鑾峰彇鎺у埗鎸囦护(鍏虫満)
/// </summary>
/// <returns></returns>
- public byte[] GetControlMsg鍏虫満()
+ public static byte[] GetControlMsg鍏虫満()
{
return null;
@@ -99,17 +99,17 @@
/// 鑾峰彇鎺у埗鎸囦护(寮�鏈�)
/// </summary>
/// <returns></returns>
- public byte[] GetControlMsg寮�鏈�()
+ public static byte[] GetControlMsg寮�鏈�()
{
return null;
}
- /// <summary>
- /// 鑾峰彇鎺у埗鎸囦护(璋冮)
- /// </summary>
- /// <returns></returns>
- public byte[] GetControlMsg璋冮(double frequece)
+ /// <summary>
+ /// 鑾峰彇鎺у埗鎸囦护(璋冮)
+ /// </summary>
+ /// <returns></returns>
+ public static byte[] GetControlMsg璋冮(double frequece)
{
var iFrequece = (int)(frequece * 10);
--
Gitblit v1.9.3