change - 删除小件内容

HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-324ba96749d19733ffc34cda2dc3ceb694edc3e0
+75e20748977a7d6852e54235d1ad5036bfc4c0cf

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

HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-eacb03d164c2b5c921167e0c310a2f06da514a19
+327da1d5839ccd8935751396e911d5bdb71093d0

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

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

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; }

HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-7777ddc0dc77b42c0c95cd534f3fd3ac82b4377a
+8f08adb8c24b343384958ba9007d2dc0610ea042

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

HighWayIot.TouchSocket/BufferAnalysis.cs

@@ -13,88 +13,7 @@ namespace HighWayIot.TouchSocket
     {
         private static LogHelper logHelper = LogHelper.Instance;
 
-        /// <summary>
-        /// 心跳报文分析
-        /// </summary>
-        /// <param name="bytes"></param>
-        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("心跳报文编号数值转换出现错误！");
-            }
-        }
-
-        /// <summary>
-        /// RFID发送设备状态
-        /// </summary>
-        /// <param name="bytes"></param>
-        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("设备状态报文编号数值转换出现错误！");
-            }
-        }
-
-        /// <summary>
-        /// RFID发送条码
-        /// </summary>
-        /// <param name="bytes"></param>
-        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("条码发送报文编号数值转换出现错误！");
-            }
-        }
+        
 
         /// <summary>
         /// 将一个数组拆成另外一个数组

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);
-            }
+            
         }
 
     }

HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-6d773f4061c051dff6002bbcaebffaf3a87bf289
+23d15fd1b9a74cae28e799b73990ede6b8b2b47e

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

RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDContent.datasource

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
--->
-<GenericObjectDataSource DisplayName="RFIDContent" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>HighWayIot.Repository.domain.RFIDContent, HighWayIot.Repository, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>

RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDHeartbeat.datasource

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
--->
-<GenericObjectDataSource DisplayName="RFIDHeartbeat" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>HighWayIot.Repository.domain.RFIDHeartbeat, HighWayIot.Repository, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>

RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDState.datasource

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
--->
-<GenericObjectDataSource DisplayName="RFIDState" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>HighWayIot.Repository.domain.RFIDState, HighWayIot.Repository, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>

RFIDSocket/RFIDSocket.csproj

@@ -87,9 +87,6 @@
       <DependentUpon>RFIDSocket.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="packages.config" />
-    <None Include="Properties\DataSources\HighWayIot.Repository.domain.RFIDContent.datasource" />
-    <None Include="Properties\DataSources\HighWayIot.Repository.domain.RFIDHeartbeat.datasource" />
-    <None Include="Properties\DataSources\HighWayIot.Repository.domain.RFIDState.datasource" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -120,5 +117,8 @@
   <ItemGroup>
     <Analyzer Include="..\packages\TouchSocket.Core.2.0.0-beta.253\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\DataSources\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>