diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 0cea95a..11c4fb0 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll index fabf17b..6c62d70 100644 Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb index b053868..c9bf6ea 100644 Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll index 328334f..894eabc 100644 Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb index a3d99cb..dd66806 100644 Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 995b85b..bc272a8 100644 Binary files a/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache index 1e7775a..1f7ce40 100644 Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache index aa1c6e9..28b01ab 100644 --- a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -324ba96749d19733ffc34cda2dc3ceb694edc3e0 +75e20748977a7d6852e54235d1ad5036bfc4c0cf diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.FileListAbsolute.txt b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.FileListAbsolute.txt index 2c672d6..060574b 100644 --- a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.FileListAbsolute.txt +++ b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.FileListAbsolute.txt @@ -47,3 +47,16 @@ D:\Code\Work\RFIDAccess\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.Cop D:\Code\Work\RFIDAccess\HighWayIot.Common\obj\Debug\HighWayIot.Common.dll D:\Code\Work\RFIDAccess\HighWayIot.Common\obj\Debug\HighWayIot.Common.pdb D:\Code\Work\RFIDAccess\HighWayIot.Common\bin\Debug\config\log4net.config +D:\Code\Work\RFIDJson\HighWayIot.Common\bin\Debug\config\log4net.config +D:\Code\Work\RFIDJson\HighWayIot.Common\bin\Debug\HighWayIot.Common.dll +D:\Code\Work\RFIDJson\HighWayIot.Common\bin\Debug\HighWayIot.Common.pdb +D:\Code\Work\RFIDJson\HighWayIot.Common\bin\Debug\HighWayIot.Log4net.dll +D:\Code\Work\RFIDJson\HighWayIot.Common\bin\Debug\Newtonsoft.Json.dll +D:\Code\Work\RFIDJson\HighWayIot.Common\bin\Debug\log4net.dll +D:\Code\Work\RFIDJson\HighWayIot.Common\bin\Debug\HighWayIot.Log4net.pdb +D:\Code\Work\RFIDJson\HighWayIot.Common\bin\Debug\Newtonsoft.Json.xml +D:\Code\Work\RFIDJson\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.AssemblyReference.cache +D:\Code\Work\RFIDJson\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CoreCompileInputs.cache +D:\Code\Work\RFIDJson\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CopyComplete +D:\Code\Work\RFIDJson\HighWayIot.Common\obj\Debug\HighWayIot.Common.dll +D:\Code\Work\RFIDJson\HighWayIot.Common\obj\Debug\HighWayIot.Common.pdb diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll b/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll index fabf17b..6c62d70 100644 Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb b/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb index b053868..c9bf6ea 100644 Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll index 328334f..894eabc 100644 Binary files a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb index a3d99cb..dd66806 100644 Binary files a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f76b11e..656b6b6 100644 Binary files a/HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache index cb76084..f8cccba 100644 Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache index 83c82f4..81d0360 100644 --- a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eacb03d164c2b5c921167e0c310a2f06da514a19 +327da1d5839ccd8935751396e911d5bdb71093d0 diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt index 3543e59..71a03fa 100644 --- a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt +++ b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt @@ -30,3 +30,12 @@ D:\Code\Work\RFIDAccess\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.C D:\Code\Work\RFIDAccess\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll D:\Code\Work\RFIDAccess\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb D:\Code\Work\RFIDAccess\HighWayIot.Log4net\bin\Debug\config\log4net.config +D:\Code\Work\RFIDJson\HighWayIot.Log4net\bin\Debug\config\log4net.config +D:\Code\Work\RFIDJson\HighWayIot.Log4net\bin\Debug\HighWayIot.Log4net.dll +D:\Code\Work\RFIDJson\HighWayIot.Log4net\bin\Debug\HighWayIot.Log4net.pdb +D:\Code\Work\RFIDJson\HighWayIot.Log4net\bin\Debug\log4net.dll +D:\Code\Work\RFIDJson\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.AssemblyReference.cache +D:\Code\Work\RFIDJson\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CoreCompileInputs.cache +D:\Code\Work\RFIDJson\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CopyComplete +D:\Code\Work\RFIDJson\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll +D:\Code\Work\RFIDJson\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll index 328334f..894eabc 100644 Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb index a3d99cb..dd66806 100644 Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 2c9f168..bc29eef 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache index 333742b..e43e914 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache and b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 54288a0..9fa3054 100644 Binary files a/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache index 05c0609..eea9d00 100644 Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Repository/SqlSugarHelper.cs b/HighWayIot.Repository/SqlSugarHelper.cs index 899f7da..1a391ed 100644 --- a/HighWayIot.Repository/SqlSugarHelper.cs +++ b/HighWayIot.Repository/SqlSugarHelper.cs @@ -26,7 +26,7 @@ namespace HighWayIot.Repository /** * Mysql */ - private static string mysqlConnStr = "Data Source=127.0.0.1;Port=3306;Initial Catalog=rfid;uid=root;pwd=123456;Charset=utf8mb4;SslMode=none"; + private static string mysqlConnStr = "Data Source=127.0.0.1;Port=3306;Initial Catalog=rfidjson;uid=root;pwd=123456;Charset=utf8mb4;SslMode=none"; //private static string oracleConnStr = "Data Source=175.27.215.92/helowin;User ID=aucma_mes;Password=aucma"; #endregion diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll index fabf17b..6c62d70 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb index b053868..c9bf6ea 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll index 328334f..894eabc 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb index a3d99cb..dd66806 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll index 0d7bdb0..72d4e17 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb index cab746a..8fd55ed 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Repository/domain/RFIDContent.cs b/HighWayIot.Repository/domain/RFIDContent.cs index 9e7ee05..e46c550 100644 --- a/HighWayIot.Repository/domain/RFIDContent.cs +++ b/HighWayIot.Repository/domain/RFIDContent.cs @@ -11,14 +11,23 @@ namespace HighWayIot.Repository.domain [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] public int ID { get; set; } - [SugarColumn(ColumnName = "content")] - public string Content { get; set; } + [SugarColumn(ColumnName = "sn")] + public int SN { get; set; } - [SugarColumn(ColumnName = "deviceno")] - public int DeviceNo { get; set; } + [SugarColumn(ColumnName = "interval")] + public int Interval { get; set; } - [SugarColumn(ColumnName = "readkind")] - public string ReadKind { get; set; } + [SugarColumn(ColumnName = "length")] + public int Length { get; set; } + + [SugarColumn(ColumnName = "status")] + public string Status { get; set; } + + [SugarColumn(ColumnName = "epc")] + public string EPC { get; set; } + + [SugarColumn(ColumnName = "tips")] + public string Tips { get; set; } [SugarColumn(ColumnName = "logtime")] public DateTime LogTime { get; set; } diff --git a/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d141608..77bf5a0 100644 Binary files a/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index 6917be0..991ab18 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache index d4b0f26..91f4300 100644 --- a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7777ddc0dc77b42c0c95cd534f3fd3ac82b4377a +8f08adb8c24b343384958ba9007d2dc0610ea042 diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt index f30ac4a..18552d2 100644 --- a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt +++ b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt @@ -65,3 +65,26 @@ D:\Code\Work\RFIDAccess\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.dl D:\Code\Work\RFIDAccess\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.pdb D:\Code\Work\RFIDAccess\HighWayIot.Repository\bin\Debug\SqlSugar.dll D:\Code\Work\RFIDAccess\HighWayIot.Repository\bin\Debug\config\log4net.config +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\config\log4net.config +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\HighWayIot.Repository.dll.config +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\HighWayIot.Repository.dll +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\HighWayIot.Repository.pdb +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\HighWayIot.Common.dll +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\HighWayIot.Log4net.dll +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\Oracle.ManagedDataAccess.dll +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\SqlSugar.dll +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\Newtonsoft.Json.dll +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\log4net.dll +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\System.Memory.dll +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\System.Threading.Tasks.Extensions.dll +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\System.Numerics.Vectors.dll +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\System.Buffers.dll +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\HighWayIot.Common.pdb +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\HighWayIot.Log4net.pdb +D:\Code\Work\RFIDJson\HighWayIot.Repository\bin\Debug\Newtonsoft.Json.xml +D:\Code\Work\RFIDJson\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.AssemblyReference.cache +D:\Code\Work\RFIDJson\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CoreCompileInputs.cache +D:\Code\Work\RFIDJson\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CopyComplete +D:\Code\Work\RFIDJson\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.dll +D:\Code\Work\RFIDJson\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.pdb diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll index 0d7bdb0..72d4e17 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb index cab746a..8fd55ed 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index c6ad054..80b8573 100644 Binary files a/HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache index eccec4b..f2ab57e 100644 Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.TouchSocket/BufferAnalysis.cs b/HighWayIot.TouchSocket/BufferAnalysis.cs index 8e607e2..707863b 100644 --- a/HighWayIot.TouchSocket/BufferAnalysis.cs +++ b/HighWayIot.TouchSocket/BufferAnalysis.cs @@ -13,88 +13,7 @@ namespace HighWayIot.TouchSocket { private static LogHelper logHelper = LogHelper.Instance; - /// - /// 心跳报文分析 - /// - /// - public static void HeartbeatSocket(byte[] bytes) - { - if (int.TryParse(Encoding.ASCII.GetString(bytes, 4, 4), out int deviceno)) - { - BaseHeartbeatServiceImpl sql = new BaseHeartbeatServiceImpl(); - if (sql.UpdateHeartbeatInfo(deviceno) == 0) - { - RFIDHeartbeat heartbeat = new RFIDHeartbeat() - { - DeviceNo = deviceno, - BeatTime = DateTime.Now, - }; - sql.AddHeartbeatInfo(heartbeat); - } - } - else - { - logHelper.Error("心跳报文编号数值转换出现错误！"); - } - } - - /// - /// RFID发送设备状态 - /// - /// - public static void RFIDStatusSocket(byte[] bytes) - { - if (int.TryParse(Encoding.ASCII.GetString(bytes, 4, 4), out int deviceno) && - int.TryParse(Encoding.ASCII.GetString(bytes, 9, 1), out int state)) - { - BaseStateServiceImpl sql = new BaseStateServiceImpl(); - RFIDState rFIDState = new RFIDState() - { - DeviceNo = deviceno, - DeviceState = state == 1 ? true : false, - LogTime = DateTime.Now, - }; - sql.AddStateInfo(rFIDState); - } - else - { - logHelper.Error("设备状态报文编号数值转换出现错误！"); - } - } - - /// - /// RFID发送条码 - /// - /// - public static void RFIDCodeSocket(byte[] bytes) - { - string readKind = Encoding.ASCII.GetString(bytes, 4, 2); - if (int.TryParse(Encoding.ASCII.GetString(bytes, 7, 4), out int deviceno)) - { - RFIDContent rFIDContent = new RFIDContent() - { - DeviceNo = deviceno, - ReadKind = readKind, - LogTime = DateTime.Now, - }; - string content = ""; - if (readKind == "NB" || readKind == "GR") - { - content = Encoding.ASCII.GetString(bytes, 12, 16); - } - else if (readKind == "MR") - { - content = Encoding.ASCII.GetString(bytes, 12, bytes.Length - 12 - 2); // 减去条码内容之前和之后内容的长度 - } - rFIDContent.Content = content; - BaseContentServiceImpl sql = new BaseContentServiceImpl(); - sql.AddContentInfo(rFIDContent); - } - else - { - logHelper.Error("条码发送报文编号数值转换出现错误！"); - } - } + /// /// 将一个数组拆成另外一个数组 diff --git a/HighWayIot.TouchSocket/TcpServer.cs b/HighWayIot.TouchSocket/TcpServer.cs index 27cd413..9b20d2c 100644 --- a/HighWayIot.TouchSocket/TcpServer.cs +++ b/HighWayIot.TouchSocket/TcpServer.cs @@ -123,19 +123,7 @@ namespace HighWayIot.TouchSocket private void BufferMemory(byte[] bytes) { - byte[] identify = new byte[2] { bytes[1], bytes[2] }; - if (identify[0] == 0x30 && identify[1] == 0x31) - { - BufferAnalysis.HeartbeatSocket(bytes); - } - else if (identify[0] == 0x30 && identify[1] == 0x34) - { - BufferAnalysis.RFIDStatusSocket(bytes); - } - else if (identify[0] == 0x35 && identify[1] == 0x33) - { - BufferAnalysis.RFIDCodeSocket(bytes); - } + } } diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll index ddc738e..731f389 100644 Binary files a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll and b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll differ diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb index e6af700..4fc4a99 100644 Binary files a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb and b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb differ diff --git a/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index ff07d9f..e9f9c8e 100644 Binary files a/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache index 88de602..a57bbfd 100644 Binary files a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache and b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache index 72acf8d..f6b7940 100644 --- a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache +++ b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6d773f4061c051dff6002bbcaebffaf3a87bf289 +23d15fd1b9a74cae28e799b73990ede6b8b2b47e diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt index 29fc27b..ed0d94c 100644 --- a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt +++ b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt @@ -53,3 +53,34 @@ D:\Code\Work\RFIDAccess\HighWayIot.TouchSocket\bin\Debug\System.Threading.Tasks. D:\Code\Work\RFIDAccess\HighWayIot.TouchSocket\bin\Debug\System.Numerics.Vectors.dll D:\Code\Work\RFIDAccess\HighWayIot.TouchSocket\bin\Debug\System.Buffers.dll D:\Code\Work\RFIDAccess\HighWayIot.TouchSocket\bin\Debug\config\log4net.config +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\config\log4net.config +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\HighWayIot.TouchSocket.dll.config +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\HighWayIot.TouchSocket.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\HighWayIot.TouchSocket.pdb +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Log4net.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Repository.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\Newtonsoft.Json.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\TouchSocket.Core.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\TouchSocket.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\log4net.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\SqlSugar.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Common.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\MySql.Data.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\System.Data.SQLite.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\Oracle.ManagedDataAccess.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\System.Memory.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\System.Threading.Tasks.Extensions.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\System.Numerics.Vectors.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\System.Buffers.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Log4net.pdb +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Repository.pdb +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Repository.dll.config +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\Newtonsoft.Json.xml +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\TouchSocket.xml +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\TouchSocket.Core.xml +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Common.pdb +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.AssemblyReference.cache +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.CopyComplete +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.dll +D:\Code\Work\RFIDJson\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.pdb diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll index ddc738e..731f389 100644 Binary files a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll and b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll differ diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb index e6af700..4fc4a99 100644 Binary files a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb and b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb differ diff --git a/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index b5cc8f6..b1d58ec 100644 Binary files a/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index 5944430..be8ff11 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ diff --git a/RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDContent.datasource b/RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDContent.datasource deleted file mode 100644 index 6aeca0b..0000000 --- a/RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDContent.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - HighWayIot.Repository.domain.RFIDContent, HighWayIot.Repository, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDHeartbeat.datasource b/RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDHeartbeat.datasource deleted file mode 100644 index a4c36aa..0000000 --- a/RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDHeartbeat.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - HighWayIot.Repository.domain.RFIDHeartbeat, HighWayIot.Repository, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDState.datasource b/RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDState.datasource deleted file mode 100644 index 46c7262..0000000 --- a/RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDState.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - HighWayIot.Repository.domain.RFIDState, HighWayIot.Repository, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/RFIDSocket/RFIDSocket.csproj b/RFIDSocket/RFIDSocket.csproj index f2c678d..42223fe 100644 --- a/RFIDSocket/RFIDSocket.csproj +++ b/RFIDSocket/RFIDSocket.csproj @@ -87,9 +87,6 @@ RFIDSocket.cs - - - SettingsSingleFileGenerator Settings.Designer.cs @@ -120,5 +117,8 @@ + + + \ No newline at end of file