From a5f4bf474fddbc129708f4ddb92eaaafc6ff1f73 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期二, 22 十一月 2022 17:33:18 +0800
Subject: [PATCH] 金庭电磁仪对接 未完成
---
Socket/IStation.DataDockingSocket4SZJT_KT/helper/HandleDataHelper.cs | 13 +-
Server/IStation.Server.SZJTKT/helper/RequestReceivedHelper.cs | 58 +++++++++
TopShelf/IStation.TopShelf.SZJTKT/IStation.TopShelf.SZJTKT.csproj | 2
Server/IStation.Server.SZJTKT/paras/AppParas.cs | 74 ++++++++++++
Server/IStation.Server.SZJTKT/IStation.Server.SZJTKT.csproj | 0
Server/IStation.Server.SZJTKT/Interface/IJobHelper.cs | 0
Server/IStation.Server.SZJTKT/PipeLineFilter/PipeLineFilter.cs | 0
Server/IStation.Server.SZJTKT/paras_socket_szjtkt.json | 87 ++++++++++++++
TopShelf/IStation.TopShelf.SZJTKT/Service.cs | 0
TopShelf/IStation.TopShelf.SZJTKT/Properties/PublishProfiles/FolderProfile.pubxml.user | 0
Server/IStation.Server.SZJTKT/helper/ServerHelper.cs | 0
Server/IStation.Server.SZJTKT/PipeLineFilterFactory/PipeLineFilterFactory.cs | 0
Server/IStation.Server.SZJTKT/Log/SZJTKTLogHelper.cs | 0
Server/IStation.Server.SZJTKT/Program.cs | 0
Server/IStation.Server.SZJTKT/AppSession/MySession.cs | 0
Server/IStation.Server.SZJTKT/helper/ConfigHelper.cs | 0
TopShelf/IStation.TopShelf.SZJTKT/Program.cs | 0
Server/IStation.Server.SZJTKT/PackageInfo/PackageInfo.cs | 0
Server/IStation.Server.SZJTKT/paras/AppParasHelper.cs | 47 +++++++
Server/IStation.Server.SZJTKT/AppServer/MyServer.cs | 0
IStation.Server.SZJTKT.sln | 26 ++--
TopShelf/IStation.TopShelf.SZJTKT/Properties/PublishProfiles/FolderProfile.pubxml | 0
22 files changed, 283 insertions(+), 24 deletions(-)
diff --git a/IStation.Server.SZJTKT.sln b/IStation.Server.SZJTKT.sln
index f59b094..dcdc594 100644
--- a/IStation.Server.SZJTKT.sln
+++ b/IStation.Server.SZJTKT.sln
@@ -29,10 +29,6 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.DataDockingSocket4SZJT_KT", "Socket\IStation.DataDockingSocket4SZJT_KT\IStation.DataDockingSocket4SZJT_KT.csproj", "{52EB70CF-DA75-4B9A-9518-FAB3C6B2C840}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Server.SZJTKT", "Server\IStation.DataDocking.Socket.Custom\IStation.Server.SZJTKT.csproj", "{6CC5E54B-495E-4E77-8F59-BC9875AAF09C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.TopShelf.SZJTKT", "TopShelf\IStation.TopShelf.DataDocking.Socket.Custom\IStation.TopShelf.SZJTKT.csproj", "{EE97C373-86B6-4D5B-A053-CFEE9DE45555}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Model.Run", "Model\IStation.Model.Run\IStation.Model.Run.csproj", "{79C5FFCE-32DD-43D1-9FC9-02C58AFC9A61}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Model.Core", "Model\IStation.Model.Core\IStation.Model.Core.csproj", "{58A935E7-A5F1-43B6-8932-4063D1892FD4}"
@@ -42,6 +38,10 @@
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Model.Monitor", "Model\IStation.Model.Monitor\IStation.Model.Monitor.csproj", "{5C74A158-6503-4305-BA58-43A8E7711139}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Formula", "Untity\IStation.Formula\IStation.Formula.csproj", "{D3BF9B4C-6444-4D88-ACB6-4D8F7D39BEC7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Server.SZJTKT", "Server\IStation.Server.SZJTKT\IStation.Server.SZJTKT.csproj", "{C6E08684-0E1B-4783-8B3F-7B333098B788}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.TopShelf.SZJTKT", "TopShelf\IStation.TopShelf.SZJTKT\IStation.TopShelf.SZJTKT.csproj", "{CBA3756A-AB9A-4EA6-B871-D0060AD62A11}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -81,14 +81,6 @@
{52EB70CF-DA75-4B9A-9518-FAB3C6B2C840}.Debug|Any CPU.Build.0 = Debug|Any CPU
{52EB70CF-DA75-4B9A-9518-FAB3C6B2C840}.Release|Any CPU.ActiveCfg = Release|Any CPU
{52EB70CF-DA75-4B9A-9518-FAB3C6B2C840}.Release|Any CPU.Build.0 = Release|Any CPU
- {6CC5E54B-495E-4E77-8F59-BC9875AAF09C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6CC5E54B-495E-4E77-8F59-BC9875AAF09C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6CC5E54B-495E-4E77-8F59-BC9875AAF09C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6CC5E54B-495E-4E77-8F59-BC9875AAF09C}.Release|Any CPU.Build.0 = Release|Any CPU
- {EE97C373-86B6-4D5B-A053-CFEE9DE45555}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EE97C373-86B6-4D5B-A053-CFEE9DE45555}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EE97C373-86B6-4D5B-A053-CFEE9DE45555}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EE97C373-86B6-4D5B-A053-CFEE9DE45555}.Release|Any CPU.Build.0 = Release|Any CPU
{79C5FFCE-32DD-43D1-9FC9-02C58AFC9A61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{79C5FFCE-32DD-43D1-9FC9-02C58AFC9A61}.Debug|Any CPU.Build.0 = Debug|Any CPU
{79C5FFCE-32DD-43D1-9FC9-02C58AFC9A61}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -109,6 +101,14 @@
{D3BF9B4C-6444-4D88-ACB6-4D8F7D39BEC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D3BF9B4C-6444-4D88-ACB6-4D8F7D39BEC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D3BF9B4C-6444-4D88-ACB6-4D8F7D39BEC7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C6E08684-0E1B-4783-8B3F-7B333098B788}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C6E08684-0E1B-4783-8B3F-7B333098B788}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C6E08684-0E1B-4783-8B3F-7B333098B788}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C6E08684-0E1B-4783-8B3F-7B333098B788}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CBA3756A-AB9A-4EA6-B871-D0060AD62A11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CBA3756A-AB9A-4EA6-B871-D0060AD62A11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CBA3756A-AB9A-4EA6-B871-D0060AD62A11}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CBA3756A-AB9A-4EA6-B871-D0060AD62A11}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -122,12 +122,12 @@
{B0F57862-6EFF-4546-940F-EED345588C88} = {36FC868C-301C-4E8F-91F6-5C2CF36C089F}
{4824999B-DB39-469E-A45F-A021E91517B1} = {36FC868C-301C-4E8F-91F6-5C2CF36C089F}
{52EB70CF-DA75-4B9A-9518-FAB3C6B2C840} = {02459ECE-F0E1-4DE9-91ED-6BCA74A832E0}
- {6CC5E54B-495E-4E77-8F59-BC9875AAF09C} = {02459ECE-F0E1-4DE9-91ED-6BCA74A832E0}
{79C5FFCE-32DD-43D1-9FC9-02C58AFC9A61} = {3C84D9C3-0D7A-4FA8-A978-99491A0387C4}
{58A935E7-A5F1-43B6-8932-4063D1892FD4} = {3C84D9C3-0D7A-4FA8-A978-99491A0387C4}
{41FA816A-D61C-4912-9AC8-A7F721945D10} = {0ACD3DC5-555C-4AF8-A6FF-677019D0F25C}
{5C74A158-6503-4305-BA58-43A8E7711139} = {3C84D9C3-0D7A-4FA8-A978-99491A0387C4}
{D3BF9B4C-6444-4D88-ACB6-4D8F7D39BEC7} = {0ACD3DC5-555C-4AF8-A6FF-677019D0F25C}
+ {C6E08684-0E1B-4783-8B3F-7B333098B788} = {02459ECE-F0E1-4DE9-91ED-6BCA74A832E0}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E02989A8-9B6F-43E5-AACA-790328215089}
diff --git a/Server/IStation.DataDocking.Socket.Custom/AppServer/MyServer.cs b/Server/IStation.Server.SZJTKT/AppServer/MyServer.cs
similarity index 100%
rename from Server/IStation.DataDocking.Socket.Custom/AppServer/MyServer.cs
rename to Server/IStation.Server.SZJTKT/AppServer/MyServer.cs
diff --git a/Server/IStation.DataDocking.Socket.Custom/AppSession/MySession.cs b/Server/IStation.Server.SZJTKT/AppSession/MySession.cs
similarity index 100%
rename from Server/IStation.DataDocking.Socket.Custom/AppSession/MySession.cs
rename to Server/IStation.Server.SZJTKT/AppSession/MySession.cs
diff --git a/Server/IStation.DataDocking.Socket.Custom/IStation.Server.SZJTKT.csproj b/Server/IStation.Server.SZJTKT/IStation.Server.SZJTKT.csproj
similarity index 100%
rename from Server/IStation.DataDocking.Socket.Custom/IStation.Server.SZJTKT.csproj
rename to Server/IStation.Server.SZJTKT/IStation.Server.SZJTKT.csproj
diff --git a/Server/IStation.DataDocking.Socket.Custom/Interface/IJobHelper.cs b/Server/IStation.Server.SZJTKT/Interface/IJobHelper.cs
similarity index 100%
rename from Server/IStation.DataDocking.Socket.Custom/Interface/IJobHelper.cs
rename to Server/IStation.Server.SZJTKT/Interface/IJobHelper.cs
diff --git a/Server/IStation.DataDocking.Socket.Custom/Log/SZJTKTLogHelper.cs b/Server/IStation.Server.SZJTKT/Log/SZJTKTLogHelper.cs
similarity index 100%
rename from Server/IStation.DataDocking.Socket.Custom/Log/SZJTKTLogHelper.cs
rename to Server/IStation.Server.SZJTKT/Log/SZJTKTLogHelper.cs
diff --git a/Server/IStation.DataDocking.Socket.Custom/PackageInfo/PackageInfo.cs b/Server/IStation.Server.SZJTKT/PackageInfo/PackageInfo.cs
similarity index 100%
rename from Server/IStation.DataDocking.Socket.Custom/PackageInfo/PackageInfo.cs
rename to Server/IStation.Server.SZJTKT/PackageInfo/PackageInfo.cs
diff --git a/Server/IStation.DataDocking.Socket.Custom/PipeLineFilter/PipeLineFilter.cs b/Server/IStation.Server.SZJTKT/PipeLineFilter/PipeLineFilter.cs
similarity index 100%
rename from Server/IStation.DataDocking.Socket.Custom/PipeLineFilter/PipeLineFilter.cs
rename to Server/IStation.Server.SZJTKT/PipeLineFilter/PipeLineFilter.cs
diff --git a/Server/IStation.DataDocking.Socket.Custom/PipeLineFilterFactory/PipeLineFilterFactory.cs b/Server/IStation.Server.SZJTKT/PipeLineFilterFactory/PipeLineFilterFactory.cs
similarity index 100%
rename from Server/IStation.DataDocking.Socket.Custom/PipeLineFilterFactory/PipeLineFilterFactory.cs
rename to Server/IStation.Server.SZJTKT/PipeLineFilterFactory/PipeLineFilterFactory.cs
diff --git a/Server/IStation.DataDocking.Socket.Custom/Program.cs b/Server/IStation.Server.SZJTKT/Program.cs
similarity index 100%
rename from Server/IStation.DataDocking.Socket.Custom/Program.cs
rename to Server/IStation.Server.SZJTKT/Program.cs
diff --git a/Server/IStation.DataDocking.Socket.Custom/helper/ConfigHelper.cs b/Server/IStation.Server.SZJTKT/helper/ConfigHelper.cs
similarity index 100%
rename from Server/IStation.DataDocking.Socket.Custom/helper/ConfigHelper.cs
rename to Server/IStation.Server.SZJTKT/helper/ConfigHelper.cs
diff --git a/Server/IStation.DataDocking.Socket.Custom/helper/RequestReceivedHelper.cs b/Server/IStation.Server.SZJTKT/helper/RequestReceivedHelper.cs
similarity index 76%
rename from Server/IStation.DataDocking.Socket.Custom/helper/RequestReceivedHelper.cs
rename to Server/IStation.Server.SZJTKT/helper/RequestReceivedHelper.cs
index 4c96cd6..b62424a 100644
--- a/Server/IStation.DataDocking.Socket.Custom/helper/RequestReceivedHelper.cs
+++ b/Server/IStation.Server.SZJTKT/helper/RequestReceivedHelper.cs
@@ -29,11 +29,63 @@
var bytes = packageInfo.Body;
if (!Valid(bytes))
{
- SZJTKTLogHelper.Error(" bytes Validation failed!");
+ SZJTKTLogHelper.Error(" bytes Validation failed!");
+ return;
+ }
+ var appParas = AppParasHelper.Get();
+ if (appParas == null || appParas.RuleItems == null)
+ {
+ SZJTKTLogHelper.Error(" json is null");
return;
}
-
+ var byte4 = new byte[4];
+ //鏁版嵁璇诲彇鏃ユ湡
+ Array.Copy(bytes, 13, byte4, 0, 4);
+ var date = Bytes2Int4(byte4);
+ //鏁版嵁璇诲彇鏃堕棿
+ Array.Copy(bytes, 17, byte4, 0, 4);
+ var time = Bytes2Int4(byte4);
+
+ var hmsStr = time.ToString();
+ if (hmsStr.Length < 6)
+ hmsStr = "0" + hmsStr;
+ var hms = hmsStr.Substring(0, 2) + ":" + hmsStr.Substring(2, 2) + ":" + hmsStr.Substring(4, 2);
+ var strTime = $"{date} {hms}";
+ DateTime dataTime = DateTime.ParseExact(strTime.ToString(), "yyyyMMdd hh:mm:ss", System.Globalization.CultureInfo.CurrentCulture);
+
+ var list = new List<Model.MonitorDataDockingSrcRecord>();
+ foreach (var x in appParas.RuleItems)
+ {
+ var record = new Model.MonitorDataDockingSrcRecord();
+ record.SignId = x.SignId;
+ record.RecordType = Model.eMonitorType.General;
+ record.SrcTime = dataTime;
+ record.SrcValue = null;
+ switch (x.Rule)
+ {
+ case eRule.Double:
+ {
+ var btValue = bytes.Skip((x.Index - 1)).Take(x.Size).ToArray();
+ record.SrcValue = Bytes2Double(btValue).ToString();
+ }
+ break;
+ case eRule.Int4:
+ {
+ var btValue = bytes.Skip((x.Index - 1)).Take(x.Size).ToArray();
+ record.SrcValue = Bytes2Int4(btValue).ToString();
+ }
+ break;
+ case eRule.Int32:
+ {
+ var btValue = bytes.Skip((x.Index - 1)).Take(x.Size).ToArray();
+ record.SrcValue = Bytes2Int32(btValue).ToString();
+ }
+ break;
+ default: break;
+ }
+ list.Add(record);
+ }
});
@@ -96,7 +148,7 @@
//鐬椂娴侀噺锛宮3/h
- Array.Copy(instrution_bts, 21, byte4, 0, 4);
+ Array.Copy(instrution_bts, 21, byte4, 0, 4);
list.Add(new Model.MonitorDataDockingSrcRecord()
{
SignId = "1590274355240243200",
diff --git a/Server/IStation.DataDocking.Socket.Custom/helper/ServerHelper.cs b/Server/IStation.Server.SZJTKT/helper/ServerHelper.cs
similarity index 100%
rename from Server/IStation.DataDocking.Socket.Custom/helper/ServerHelper.cs
rename to Server/IStation.Server.SZJTKT/helper/ServerHelper.cs
diff --git a/Server/IStation.Server.SZJTKT/paras/AppParas.cs b/Server/IStation.Server.SZJTKT/paras/AppParas.cs
new file mode 100644
index 0000000..394ab2c
--- /dev/null
+++ b/Server/IStation.Server.SZJTKT/paras/AppParas.cs
@@ -0,0 +1,74 @@
+锘縰sing IStation.Untity;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IStation.Server
+{
+ /// <summary>
+ /// app鍙傛暟锛堝彲閰嶅埗锛�
+ /// </summary>
+ public class AppParas
+ {
+ /// <summary>
+ /// 瑙ｆ瀽椤�
+ /// </summary>
+ public List<RuleItem> RuleItems { get; set; }
+
+ /// <summary>
+ /// 鏄惁淇濆瓨鍘熷
+ /// </summary>
+ public bool Src { get; set; }
+
+ /// <summary>
+ /// 鏄惁璋冭瘯
+ /// </summary>
+ public bool Debug { get; set; }
+ }
+
+
+ /// <summary>
+ /// 瑙ｆ瀽椤�
+ /// </summary>
+ public class RuleItem
+ {
+ /// <summary>
+ /// 鏍囪鏍囪瘑
+ /// </summary>
+ public string SignId { get; set; }
+
+ /// <summary>
+ /// 绱㈠紩 浠�1寮�濮�
+ /// </summary>
+ public int Index { get; set; }
+
+ /// <summary>
+ /// 瀛楄妭澶у皬
+ /// </summary>
+ public int Size { get; set; }
+
+ /// <summary>
+ /// 瑙ｆ瀽瑙勫垯
+ /// </summary>
+ public eRule Rule { get; set; }
+ }
+
+
+ /// <summary>
+ /// 瑙ｆ瀽瑙勫垯鏋氫妇
+ /// </summary>
+ public enum eRule
+ {
+ Double = 1,
+
+ Int4 = 2,
+
+ Int32 = 3,
+ }
+
+
+
+}
diff --git a/Server/IStation.Server.SZJTKT/paras/AppParasHelper.cs b/Server/IStation.Server.SZJTKT/paras/AppParasHelper.cs
new file mode 100644
index 0000000..d592abc
--- /dev/null
+++ b/Server/IStation.Server.SZJTKT/paras/AppParasHelper.cs
@@ -0,0 +1,47 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.IO;
+using IStation.Untity;
+
+namespace IStation.Server
+{
+ /// <summary>
+ /// app 鍙傛暟杈呭姪绫�
+ /// </summary>
+ internal class AppParasHelper
+ {
+ /// <summary>
+ /// json鏂囦欢鍚嶇О
+ /// </summary>
+ public static string JsonFileName
+ {
+ get
+ {
+ if (string.IsNullOrEmpty(_jsonFileName))
+ {
+ _jsonFileName= System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "paras_socket_szjtkt.json");
+ }
+ return _jsonFileName;
+ }
+ }
+ private static string _jsonFileName = null;
+
+ /// <summary>
+ /// 鑾峰彇
+ /// </summary>
+ /// <returns></returns>
+ public static AppParas Get()
+ {
+ if (_appparas == null)
+ {
+ var json = FileHelper.ReadAllText(JsonFileName);
+ _appparas = JsonHelper.Json2Object<AppParas>(json);
+ }
+ return _appparas;
+ }
+ private static AppParas _appparas = null;
+ }
+}
diff --git a/Server/IStation.Server.SZJTKT/paras_socket_szjtkt.json b/Server/IStation.Server.SZJTKT/paras_socket_szjtkt.json
new file mode 100644
index 0000000..fccf168
--- /dev/null
+++ b/Server/IStation.Server.SZJTKT/paras_socket_szjtkt.json
@@ -0,0 +1,87 @@
+{
+ "RuleItems": [
+ {
+ "SignId": "kt_21",
+ "Index": 21,
+ "Rule": 1
+ },
+ {
+ "SignId": "kt_25",
+ "Index": 25,
+ "Rule": 1
+ },
+ {
+ "SignId": "kt_29",
+ "Index": 29,
+ "Rule": 1
+ },
+ {
+ "SignId": "kt_33",
+ "Index": 33,
+ "Rule": 2
+ },
+ {
+ "SignId": "kt_41",
+ "Index": 41,
+ "Rule": 3
+ },
+ {
+ "SignId": "kt_37",
+ "Index": 37,
+ "Rule": 2
+ },
+ {
+ "SignId": "kt_43",
+ "Index": 43,
+ "Rule": 3
+ },
+ {
+ "SignId": "kt_45",
+ "Index": 45,
+ "Rule": 3
+ },
+ {
+ "SignId": "kt_46",
+ "Index": 46,
+ "Rule": 3
+ },
+ {
+ "SignId": "kt_47",
+ "Index": 47,
+ "Rule": 3
+ },
+ {
+ "SignId": "kt_48",
+ "Index": 48,
+ "Rule": 3
+ },
+ {
+ "SignId": "kt_49",
+ "Index": 49,
+ "Rule": 3
+ },
+ {
+ "SignId": "kt_50",
+ "Index": 50,
+ "Rule": 3
+ },
+ {
+ "SignId": "kt_51",
+ "Index": 51,
+ "Rule": 3
+ },
+ {
+ "SignId": "kt_52",
+ "Index": 52,
+ "Rule": 3
+ },
+ {
+ "SignId": "kt_53",
+ "Index": 53,
+ "Rule": 3
+ }
+ ],
+
+ "Debug": true,
+ "Src": true
+}
diff --git a/Socket/IStation.DataDockingSocket4SZJT_KT/helper/HandleDataHelper.cs b/Socket/IStation.DataDockingSocket4SZJT_KT/helper/HandleDataHelper.cs
index d2b5c4f..e7c2b09 100644
--- a/Socket/IStation.DataDockingSocket4SZJT_KT/helper/HandleDataHelper.cs
+++ b/Socket/IStation.DataDockingSocket4SZJT_KT/helper/HandleDataHelper.cs
@@ -170,7 +170,11 @@
return list;
}
-
+ public static double Bytes2Double(byte[] value, int offset = 0)
+ {
+ return BitConverter.ToSingle(value.Reverse().ToArray(), 0);//閲囩敤浜咺EEE-754浜岃繘鍒舵诞鐐规暟绠楁湳鏍囧噯
+ }
+
public static int Bytes2Int4(byte[] src, int offset = 0)
{
src = src.Reverse().ToArray();
@@ -181,12 +185,7 @@
| (src[offset + 3] & 0xFF));
return value;
}
-
- public static double Bytes2Double(byte[] value, int offset = 0)
- {
- return BitConverter.ToSingle(value.Reverse().ToArray(), 0);//閲囩敤浜咺EEE-754浜岃繘鍒舵诞鐐规暟绠楁湳鏍囧噯
- }
-
+
public static int Bytes2Int32(byte[] bytes)
{
return Convert.ToInt32(Byte2HexStr(bytes.Reverse().ToArray()), 16); ;
diff --git a/TopShelf/IStation.TopShelf.DataDocking.Socket.Custom/IStation.TopShelf.SZJTKT.csproj b/TopShelf/IStation.TopShelf.SZJTKT/IStation.TopShelf.SZJTKT.csproj
similarity index 80%
rename from TopShelf/IStation.TopShelf.DataDocking.Socket.Custom/IStation.TopShelf.SZJTKT.csproj
rename to TopShelf/IStation.TopShelf.SZJTKT/IStation.TopShelf.SZJTKT.csproj
index 3a3803f..271c25e 100644
--- a/TopShelf/IStation.TopShelf.DataDocking.Socket.Custom/IStation.TopShelf.SZJTKT.csproj
+++ b/TopShelf/IStation.TopShelf.SZJTKT/IStation.TopShelf.SZJTKT.csproj
@@ -11,7 +11,7 @@
<ItemGroup>
<ProjectReference Include="..\..\Component\IStation.TopShelf\IStation.TopShelf.csproj" />
- <ProjectReference Include="..\..\Server\IStation.DataDocking.Socket.Custom\IStation.Server.SZJTKT.csproj" />
+ <ProjectReference Include="..\..\Server\IStation.Server.SZJTKT\IStation.Server.SZJTKT.csproj" />
</ItemGroup>
</Project>
diff --git a/TopShelf/IStation.TopShelf.DataDocking.Socket.Custom/Program.cs b/TopShelf/IStation.TopShelf.SZJTKT/Program.cs
similarity index 100%
rename from TopShelf/IStation.TopShelf.DataDocking.Socket.Custom/Program.cs
rename to TopShelf/IStation.TopShelf.SZJTKT/Program.cs
diff --git a/TopShelf/IStation.TopShelf.DataDocking.Socket.Custom/Properties/PublishProfiles/FolderProfile.pubxml b/TopShelf/IStation.TopShelf.SZJTKT/Properties/PublishProfiles/FolderProfile.pubxml
similarity index 100%
rename from TopShelf/IStation.TopShelf.DataDocking.Socket.Custom/Properties/PublishProfiles/FolderProfile.pubxml
rename to TopShelf/IStation.TopShelf.SZJTKT/Properties/PublishProfiles/FolderProfile.pubxml
diff --git a/TopShelf/IStation.TopShelf.DataDocking.Socket.Custom/Properties/PublishProfiles/FolderProfile.pubxml.user b/TopShelf/IStation.TopShelf.SZJTKT/Properties/PublishProfiles/FolderProfile.pubxml.user
similarity index 100%
rename from TopShelf/IStation.TopShelf.DataDocking.Socket.Custom/Properties/PublishProfiles/FolderProfile.pubxml.user
rename to TopShelf/IStation.TopShelf.SZJTKT/Properties/PublishProfiles/FolderProfile.pubxml.user
diff --git a/TopShelf/IStation.TopShelf.DataDocking.Socket.Custom/Service.cs b/TopShelf/IStation.TopShelf.SZJTKT/Service.cs
similarity index 100%
rename from TopShelf/IStation.TopShelf.DataDocking.Socket.Custom/Service.cs
rename to TopShelf/IStation.TopShelf.SZJTKT/Service.cs
--
Gitblit v1.9.3