版本更新

src/YSAI.DAQ/YSAI.Beckhoff/YSAI.Beckhoff.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.3</Version>
+		<Version>1.0.0.4</Version>
 		<Authors>Shun</Authors>
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
@@ -14,7 +14,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Beckhoff.TwinCAT.Ads" Version="6.1.86" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.66" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.69" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Can/CanOperator.cs

@@ -19,6 +19,7 @@ namespace YSAI.Can
         /// 锁
         /// </summary>
         private static readonly object Lock = new object();
+
         /// <summary>
         /// 自身对象集合
         /// </summary>
@@ -53,6 +54,7 @@ namespace YSAI.Can
             }
             return exp;
         }
+
         /// <summary>
         /// 构造函数
         /// </summary>
@@ -66,18 +68,22 @@ namespace YSAI.Can
         /// 基础数据
         /// </summary>
         private CanData.Basics basics { get; set; }
-        /// <summary>      
+
+        /// <summary>
         /// 为方法返回的执行状态信息，可以用来判断方法是否成功执行
         /// </summary>
-        Canlib.canStatus Status;
+        private Canlib.canStatus Status;
+
         /// <summary>
         /// 句柄
         /// </summary>
-        int Handle = 0;
+        private int Handle = 0;
+
         /// <summary>
         /// Can当前状态
         /// </summary>
         private bool CanState = false;
+
         /// <summary>
         /// 写入
         /// </summary>
@@ -136,10 +142,12 @@ namespace YSAI.Can
         {
             return Task.Run(() => Write(Values));
         }
+
         /// <summary>
         /// 虚拟地址
         /// </summary>
         private VirtualAddressManage VAM = new VirtualAddressManage();
+
         public void Dispose()
         {
             Off();
@@ -147,6 +155,7 @@ namespace YSAI.Can
             GC.SuppressFinalize(this);
             ThisObjList.Remove(this);
         }
+
         public OperateResult Off()
         {
             Depart("Off");
@@ -185,10 +194,12 @@ namespace YSAI.Can
                 return Break("Off", false, ex.Message, Exception: ex);
             }
         }
+
         public Task<OperateResult> OffAsync()
         {
             return Task.Run(() => Off());
         }
+
         public OperateResult On()
         {
             Depart("On");
@@ -230,7 +241,6 @@ namespace YSAI.Can
                     {
                         return Break("On", false, "设置CAN通道波特率失败");
                     }
-
                 }
                 else
                 {
@@ -242,10 +252,12 @@ namespace YSAI.Can
                 return Break("On", false, ex.Message, Exception: ex);
             }
         }
+
         public Task<OperateResult> OnAsync()
         {
             return Task.Run(() => On());
         }
+
         public OperateResult Read(Address address)
         {
             Depart("Read");
@@ -258,7 +270,6 @@ namespace YSAI.Can
 
                     foreach (var item in address.AddressArray)
                     {
-
                         //是不是虚拟地址
                         bool IsVA = false;
                         //初始化虚拟地址
@@ -284,11 +295,10 @@ namespace YSAI.Can
                             Status = Canlib.canRead(Handle, out id, msg, out dlc, out flag, out time);
                             if (Status.Equals(Canlib.canStatus.canOK) && dlc > 0)
                             {
-                                msg = ByteTool.ByteTrimEnd(msg);
+                                msg = msg.TrimEnd();
 
                                 CanData.ResultData candata = new CanData.ResultData() { CanID = id, ByteData = msg, StrByteData = ByteTool.HexToStr(msg), Flag = flag, Length = dlc, Time = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(time).ToLocalTime() };
 
-
                                 string? Value = candata.ToJson();
 
                                 //数据处理
@@ -296,7 +306,6 @@ namespace YSAI.Can
 
                                 //数据添加
                                 param.AddOrUpdate(item.AddressName, addressValue, (k, v) => addressValue);
-
                             }
                             else
                             {
@@ -307,7 +316,6 @@ namespace YSAI.Can
                                 }
                             }
                         }
-
                     }
                     if (param.Count > 0)
                     {
@@ -328,14 +336,17 @@ namespace YSAI.Can
                 return Break("Read", false, ex.Message, Exception: ex);
             }
         }
+
         public Task<OperateResult> ReadAsync(Address address)
         {
             return Task.Run(() => Read(address));
         }
+
         public Task<OperateResult> WriteAsync<V>(ConcurrentDictionary<string, V> Values)
         {
             return Task.Run(() => Write(Values));
         }
+
         public OperateResult Write<V>(ConcurrentDictionary<string, V> Values)
         {
             Depart("Write");
@@ -354,10 +365,12 @@ namespace YSAI.Can
                 return Break("Write", false, "写入类型错误");
             }
         }
+
         /// <summary>
         /// 实现订阅功能
         /// </summary>
         private SubscribeOperate subscribeOperate;
+
         public OperateResult Subscribe(Address address)
         {
             Depart("Subscribe");
@@ -391,10 +404,12 @@ namespace YSAI.Can
                 return Break("Subscribe", false, ex.Message, Exception: ex);
             }
         }
+
         public Task<OperateResult> SubscribeAsync(Address address)
         {
             return Task.Run(() => Subscribe(address));
         }
+
         public OperateResult UnSubscribe(Address address)
         {
             Depart("UnSubscribe");
@@ -415,10 +430,12 @@ namespace YSAI.Can
                 return Break("UnSubscribe", false, ex.Message, Exception: ex);
             }
         }
+
         public Task<OperateResult> UnSubscribeAsync(Address address)
         {
             return Task.Run(() => UnSubscribe(address));
         }
+
         /// <summary>
         /// 事件抛出
         /// </summary>

src/YSAI.DAQ/YSAI.Can/YSAI.Can.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.29</Version>
+	  <Version>1.0.0.30</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.66" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.69" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.DB/YSAI.DB.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.29</Version>
+	  <Version>1.0.0.30</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -18,7 +18,7 @@
 		<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 		<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.66" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.69" />
 	</ItemGroup>
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

src/YSAI.DAQ/YSAI.DaqManage/YSAI.DaqManage.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.66" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.69" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Kafka/YSAI.Kafka.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.30</Version>
+	  <Version>1.0.0.31</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="2.3.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.66" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.69" />
   </ItemGroup>
 	
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Modbus/YSAI.Modbus.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.29</Version>
+	  <Version>1.0.0.30</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -15,7 +15,7 @@
 	<ItemGroup>
     <PackageReference Include="NModbus" Version="3.0.80" />
     <PackageReference Include="NModbus.Serial" Version="3.0.80" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.66" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.69" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Mqtt/YSAI.Mqtt.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.32</Version>
+	  <Version>1.0.0.33</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="MQTTnet" Version="4.3.1.873" />
     <PackageReference Include="MQTTnet.AspNetCore" Version="4.3.1.873" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.66" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.69" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Netty/YSAI.Netty.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.4</Version>
+		<Version>1.0.0.5</Version>
 		<Authors>Shun</Authors>
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
@@ -14,6 +14,6 @@
 	<ItemGroup>
 		<PackageReference Include="DotNetty.Handlers" Version="0.7.5" />
 		<PackageReference Include="DotNetty.Transport" Version="0.7.5" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.66" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.69" />
 	</ItemGroup>
 </Project>

src/YSAI.DAQ/YSAI.Opc/YSAI.Opc.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.39</Version>
+	  <Version>1.0.0.40</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -13,7 +13,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.372.76" />
-	<PackageReference Include="YSAI.Core" Version="1.0.0.66" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.69" />
   </ItemGroup>
 
 

src/YSAI.DAQ/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.31</Version>
+	  <Version>1.0.0.32</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="6.6.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.66" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.69" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.RelayManage/YSAI.RelayManage.csproj

@@ -9,7 +9,7 @@
 	<ItemGroup>
 		<PackageReference Include="RabbitMQ.Client" Version="6.6.0" />
 		<PackageReference Include="Confluent.Kafka" Version="2.3.0" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.66" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.69" />
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 

src/YSAI.DAQ/YSAI.S7/YSAI.S7.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.28</Version>
+	  <Version>1.0.0.29</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -14,7 +14,7 @@
 
 	<ItemGroup>
     <PackageReference Include="S7netplus" Version="0.20.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.66" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.69" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Test/YSAI.Test.csproj

@@ -17,7 +17,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-	<PackageReference Include="YSAI.Core" Version="1.0.0.66" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.69" />
   </ItemGroup>
 
   <ItemGroup>