diff --git a/PVDEMCS/.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2 b/PVDEMCS/.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2 index 27a1323..1277061 100644 Binary files a/PVDEMCS/.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2 and b/PVDEMCS/.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2 differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/1a103b51-617a-4904-868e-db2c303ff6bb.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/1b9b7666-498a-470f-ae0b-069dc88728d1.vsidx similarity index 73% rename from PVDEMCS/.vs/PVDEMCS/FileContentIndex/1a103b51-617a-4904-868e-db2c303ff6bb.vsidx rename to PVDEMCS/.vs/PVDEMCS/FileContentIndex/1b9b7666-498a-470f-ae0b-069dc88728d1.vsidx index f53a9a2..f30a378 100644 Binary files a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/1a103b51-617a-4904-868e-db2c303ff6bb.vsidx and b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/1b9b7666-498a-470f-ae0b-069dc88728d1.vsidx differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/1f6357d5-e1ed-4d14-9519-dbdd7c936292.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/1f6357d5-e1ed-4d14-9519-dbdd7c936292.vsidx new file mode 100644 index 0000000..239a375 Binary files /dev/null and b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/1f6357d5-e1ed-4d14-9519-dbdd7c936292.vsidx differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/29ccd813-ab10-4dbc-96e2-4e38de2c2356.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/29ccd813-ab10-4dbc-96e2-4e38de2c2356.vsidx new file mode 100644 index 0000000..ac626ce Binary files /dev/null and b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/29ccd813-ab10-4dbc-96e2-4e38de2c2356.vsidx differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/36756747-e815-4cc5-8c85-5e26aa132998.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/36756747-e815-4cc5-8c85-5e26aa132998.vsidx deleted file mode 100644 index 632ba99..0000000 Binary files a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/36756747-e815-4cc5-8c85-5e26aa132998.vsidx and /dev/null differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/3b8ede24-3279-43ad-b0d4-ee1b25adf718.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/3b8ede24-3279-43ad-b0d4-ee1b25adf718.vsidx new file mode 100644 index 0000000..e65813d Binary files /dev/null and b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/3b8ede24-3279-43ad-b0d4-ee1b25adf718.vsidx differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/4d11d9a5-c1d0-4eff-b564-c3d1dfc9969c.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/4d11d9a5-c1d0-4eff-b564-c3d1dfc9969c.vsidx deleted file mode 100644 index ed4696d..0000000 Binary files a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/4d11d9a5-c1d0-4eff-b564-c3d1dfc9969c.vsidx and /dev/null differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/75298794-2fc8-466d-aa12-bdd779364242.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/75298794-2fc8-466d-aa12-bdd779364242.vsidx deleted file mode 100644 index 51fbcfb..0000000 Binary files a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/75298794-2fc8-466d-aa12-bdd779364242.vsidx and /dev/null differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/8cb64b6c-060f-4449-beb6-15489e6bf7bc.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/8cb64b6c-060f-4449-beb6-15489e6bf7bc.vsidx new file mode 100644 index 0000000..ed2f218 Binary files /dev/null and b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/8cb64b6c-060f-4449-beb6-15489e6bf7bc.vsidx differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/aa0592fd-7a8a-490c-a7d9-ff1e1c840eaf.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/aa0592fd-7a8a-490c-a7d9-ff1e1c840eaf.vsidx deleted file mode 100644 index 4263fea..0000000 Binary files a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/aa0592fd-7a8a-490c-a7d9-ff1e1c840eaf.vsidx and /dev/null differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/aec87447-46be-4fbf-9d97-e7c8897ab0b7.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/aec87447-46be-4fbf-9d97-e7c8897ab0b7.vsidx deleted file mode 100644 index ba1a0dd..0000000 Binary files a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/aec87447-46be-4fbf-9d97-e7c8897ab0b7.vsidx and /dev/null differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/ce768a6d-2821-4f9b-a30b-4f4ce6566627.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/ce768a6d-2821-4f9b-a30b-4f4ce6566627.vsidx new file mode 100644 index 0000000..96a497d Binary files /dev/null and b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/ce768a6d-2821-4f9b-a30b-4f4ce6566627.vsidx differ diff --git a/PVDEMCS/.vs/PVDEMCS/v17/.suo b/PVDEMCS/.vs/PVDEMCS/v17/.suo index a8538ea..4c52d50 100644 Binary files a/PVDEMCS/.vs/PVDEMCS/v17/.suo and b/PVDEMCS/.vs/PVDEMCS/v17/.suo differ diff --git a/PVDEMCS/PVDEMCS/Common/Configuration/DeviceConfiguration.cs b/PVDEMCS/PVDEMCS/Common/Configuration/DeviceConfiguration.cs deleted file mode 100644 index d76bf85..0000000 --- a/PVDEMCS/PVDEMCS/Common/Configuration/DeviceConfiguration.cs +++ /dev/null @@ -1,15 +0,0 @@ -using PVDEMCS.Common.DI; -using PVDEMCS.Services; - -namespace PVDEMCS.Common.Configuration -{ - public class DeviceConfiguration : IDependency - { - public DeviceConfiguration(IDeviceService deviceService) - { - - } - - - } -} diff --git a/PVDEMCS/PVDEMCS/Common/Devices/IDeviceConfiguration.cs b/PVDEMCS/PVDEMCS/Common/Devices/IDeviceConfiguration.cs new file mode 100644 index 0000000..c6eacb1 --- /dev/null +++ b/PVDEMCS/PVDEMCS/Common/Devices/IDeviceConfiguration.cs @@ -0,0 +1,12 @@ +using PVDEMCS.Common.DI; +using PVDEMCS.Services; + +namespace PVDEMCS.Common.Devices +{ + public interface IDeviceConfiguration : IDependency + { + + } + + +} diff --git a/PVDEMCS/PVDEMCS/Common/Devices/IDeviceMonitor.cs b/PVDEMCS/PVDEMCS/Common/Devices/IDeviceMonitor.cs deleted file mode 100644 index 704bcc4..0000000 --- a/PVDEMCS/PVDEMCS/Common/Devices/IDeviceMonitor.cs +++ /dev/null @@ -1,61 +0,0 @@ -using PVDEMCS.Common.DI; -using PVDEMCS.Services.Models; -using System.Security.Cryptography; - -namespace PVDEMCS.Common.Devices -{ - /* - * 设备监控类 - */ - public interface IDeviceMonitor - { - IPLCCommunicationService PLCCommunicationService { get; } - /// - /// PLC 点位改变触发 - /// - event EventHandler PointChnage; - - /// - /// 获取错误相信 - /// - event EventHandler ErrorMessage; - - /// - /// 间隔时间 - /// - int Interval { get; set; } - - /// - /// 当前点位集合 - /// - ICollection Points { get; } - - /// - /// PLC地址与端口 - /// - void Init(string address, int port = 0); - - /// - /// 加载点位 - /// - /// - void Load(params DevicePoint[] point); - - /// - /// 清理所有点位 - /// - void Clear(); - - /// - /// 开始监控 - /// - Task StartAsync(); - - /// - /// 停止监控 - /// - Task StopAsync(); - - - } -} diff --git a/PVDEMCS/PVDEMCS/Common/Devices/Impl/DeviceConfiguration.cs b/PVDEMCS/PVDEMCS/Common/Devices/Impl/DeviceConfiguration.cs new file mode 100644 index 0000000..cd98723 --- /dev/null +++ b/PVDEMCS/PVDEMCS/Common/Devices/Impl/DeviceConfiguration.cs @@ -0,0 +1,36 @@ +using PVDEMCS.Services; + +namespace PVDEMCS.Common.Devices.Impl +{ + public class DeviceConfiguration : IDeviceConfiguration + { + private IDeviceService deviceService; + + private List monitors = new List(); + + public DeviceConfiguration(IDeviceService device) + { + this.deviceService = device; + } + + public void Load() + { + var result = this.deviceService.GetDeviceInfoList("", "", true); + if (result.IsSuccess) + { + var devices = result.Content; + foreach (var device in devices) + { + var deviceMonitor = new DeviceMonitor(device); + var devicePoints = deviceService.GetDevicePointList(device.DeviceName); + if (devicePoints.IsSuccess && devicePoints.Content.Count>0) + { + deviceMonitor.Load(devicePoints.Content.ToArray()); + } + monitors.Add(deviceMonitor); + } + } + + } + } +} diff --git a/PVDEMCS/PVDEMCS/Common/Devices/Impl/DeviceMonitor.cs b/PVDEMCS/PVDEMCS/Common/Devices/Impl/DeviceMonitor.cs index b640d41..e88b8a9 100644 --- a/PVDEMCS/PVDEMCS/Common/Devices/Impl/DeviceMonitor.cs +++ b/PVDEMCS/PVDEMCS/Common/Devices/Impl/DeviceMonitor.cs @@ -1,9 +1,10 @@ -using PVDEMCS.Services.Models; +using Masuit.Tools; +using PVDEMCS.Services.Models; using System.Security.Cryptography; namespace PVDEMCS.Common.Devices.Impl { - public class DeviceMonitor : IDeviceMonitor + public class DeviceMonitor { private DeviceInfo deviceInfo; private IPLCCommunicationService plcCommunicationService; @@ -71,12 +72,16 @@ namespace PVDEMCS.Common.Devices.Impl /// /// 加载点位集合 /// - /// + /// public void Load(params DevicePoint[] points) { + if (points.IsNullOrEmpty()) + { + throw new ArgumentException($"{nameof(points)}: 不能为空！"); + } if (devicePoints.Where(f => points.Select(ff => ff.PointCode).Contains(f.PointCode)).Count() > 0) { - throw new ArgumentException($"{nameof(points)}: Name 不能重复！"); + throw new ArgumentException($"{nameof(points)}: PointCode 不能重复！"); } devicePoints.AddRange(points); } diff --git a/PVDEMCS/PVDEMCS/Controllers/DeviceController.cs b/PVDEMCS/PVDEMCS/Controllers/DeviceController.cs index a696bdc..aa91253 100644 --- a/PVDEMCS/PVDEMCS/Controllers/DeviceController.cs +++ b/PVDEMCS/PVDEMCS/Controllers/DeviceController.cs @@ -136,7 +136,7 @@ namespace PVDEMCS.Controllers /// 点位列表 /// [HttpGet] - public List GetDevicePointList(string deviceName, string deviceCode, string equipmentName, string equipmentCode, string equipmentType, string pointCode, string pointName, bool? activated) + public Result> GetDevicePointList(string deviceName, string deviceCode, string equipmentName, string equipmentCode, string equipmentType, string pointCode, string pointName, bool? activated) { var result = _deviceService.GetDevicePointList(deviceName, deviceCode, equipmentName, equipmentCode, equipmentType, pointCode, pointName, activated); return result; diff --git a/PVDEMCS/PVDEMCS/PVDEMCS.csproj b/PVDEMCS/PVDEMCS/PVDEMCS.csproj index fb5594e..0ddcce8 100644 --- a/PVDEMCS/PVDEMCS/PVDEMCS.csproj +++ b/PVDEMCS/PVDEMCS/PVDEMCS.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -26,4 +26,8 @@ + + + + diff --git a/PVDEMCS/PVDEMCS/Program.cs b/PVDEMCS/PVDEMCS/Program.cs index 506d972..d503af2 100644 --- a/PVDEMCS/PVDEMCS/Program.cs +++ b/PVDEMCS/PVDEMCS/Program.cs @@ -1,5 +1,7 @@ +using Masuit.Tools; using Microsoft.EntityFrameworkCore; using Microsoft.OpenApi.Models; +using PVDEMCS.Common.Devices; using PVDEMCS.Common.DI; using System.Configuration; using System.Reflection; @@ -17,6 +19,11 @@ builder.Services.AddSwaggerGen(options => var xmlPathApp = Path.Combine(AppContext.BaseDirectory, $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"); options.IncludeXmlComments(xmlPathApp, true); }); +//ӿ +builder.Services.AddCors(options => +{ + options.AddPolicy("CorsPolicy", opt => opt.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod().WithExposedHeaders("X-Pagination")); +}); //ע builder.AddAutofacExt(); // @@ -34,10 +41,23 @@ if (app.Environment.IsDevelopment()) app.UseSwaggerUI(); } +//ʹÿ +app.UseCors("CorsPolicy"); + app.UseHttpsRedirection(); app.UseAuthorization(); app.MapControllers(); -app.Run(); \ No newline at end of file +app.Lifetime.ApplicationStarted.Register(() => +{ + var deviceConfiguration = app.Services.GetService(); + + if (deviceConfiguration == null) + { + + } +}); + +app.Run(); diff --git a/PVDEMCS/PVDEMCS/Services/IDeviceService.cs b/PVDEMCS/PVDEMCS/Services/IDeviceService.cs index 58f8338..3a9a847 100644 --- a/PVDEMCS/PVDEMCS/Services/IDeviceService.cs +++ b/PVDEMCS/PVDEMCS/Services/IDeviceService.cs @@ -30,7 +30,7 @@ namespace PVDEMCS.Services /// 控制器编号 /// 控制器名称 /// - Result> GetDeviceInfoList(string deviceCode, string deviceName, bool? activated = false); + Result> GetDeviceInfoList(string deviceCode="", string deviceName = "", bool? activated = false); /// /// 获取PLC控制器明细 @@ -88,7 +88,7 @@ namespace PVDEMCS.Services /// 点位编号 /// 点位列表 /// - List GetDevicePointList(string deviceName, string deviceCode, string equipmentName, string equipmentCode, string equipmentType, string pointCode, string pointName, bool? activated); + Result> GetDevicePointList(string deviceName="", string deviceCode = "", string equipmentName = "", string equipmentCode = "", string equipmentType = "", string pointCode = "", string pointName = "", bool? activated = true); /// /// 获取PLC控制器点位明细 diff --git a/PVDEMCS/PVDEMCS/Services/Impl/DeviceService.cs b/PVDEMCS/PVDEMCS/Services/Impl/DeviceService.cs index 68546a2..37966a6 100644 --- a/PVDEMCS/PVDEMCS/Services/Impl/DeviceService.cs +++ b/PVDEMCS/PVDEMCS/Services/Impl/DeviceService.cs @@ -139,7 +139,7 @@ namespace PVDEMCS.Services.Impl /// 点位编号 /// 点位列表 /// - public List GetDevicePointList(string deviceName, string deviceCode, string equipmentName, string equipmentCode, string equipmentType, string pointCode, string pointName, bool? activated) + public Result> GetDevicePointList(string deviceName, string deviceCode, string equipmentName, string equipmentCode, string equipmentType, string pointCode, string pointName, bool? activated) { var result = _deviceRepository.GetDevicePointList(deviceName, deviceCode, equipmentName, equipmentCode, equipmentType, pointCode, pointName, activated); diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/IDeviceRepository.cs b/PVDEMCS/PVDEMCS/Services/Repositories/IDeviceRepository.cs index 0b4edb9..e6ddea4 100644 --- a/PVDEMCS/PVDEMCS/Services/Repositories/IDeviceRepository.cs +++ b/PVDEMCS/PVDEMCS/Services/Repositories/IDeviceRepository.cs @@ -88,7 +88,7 @@ namespace PVDEMCS.Services.Repositories /// 点位编号 /// 点位列表 /// - List GetDevicePointList(string deviceName, string deviceCode, string equipmentName, string equipmentCode, string equipmentType, string pointCode, string pointName, bool? activated); + Result> GetDevicePointList(string deviceName, string deviceCode, string equipmentName, string equipmentCode, string equipmentType, string pointCode, string pointName, bool? activated); /// /// 获取PLC控制器点位明细 diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/DeviceRepository.cs b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/DeviceRepository.cs index 56fe43c..908525a 100644 --- a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/DeviceRepository.cs +++ b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/DeviceRepository.cs @@ -249,13 +249,13 @@ namespace PVDEMCS.Services.Repositories.Impl /// 点位编号 /// 点位列表 /// - public List GetDevicePointList(string deviceName, string deviceCode, string equipmentName, string equipmentCode, string equipmentType, string pointCode, string pointName, bool? activated) + public Result> GetDevicePointList(string deviceName, string deviceCode, string equipmentName, string equipmentCode, string equipmentType, string pointCode, string pointName, bool? activated) { using (var context = new EFContext()) { var query = DeviceQuery(deviceName, deviceCode, equipmentName, equipmentCode, equipmentType, pointCode, pointName, activated, context); var list = query.ToList(); - return list; + return new Result>(list); } } diff --git a/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.dll b/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.dll index 17615b9..47af7d7 100644 Binary files a/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.dll and b/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.dll differ diff --git a/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.pdb b/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.pdb index e5a80a3..9cf49e0 100644 Binary files a/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.pdb and b/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.pdb differ diff --git a/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.xml b/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.xml index 4ff7cd2..cc84393 100644 --- a/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.xml +++ b/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.xml @@ -59,52 +59,6 @@ 报警 - - - PLC 点位改变触发 - - - - - 获取错误相信 - - - - - 间隔时间 - - - - - 当前点位集合 - - - - - PLC地址与端口 - - - - - 加载点位 - - - - - - 清理所有点位 - - - - - 开始监控 - - - - - 停止监控 - - PLC 点位改变触发 @@ -140,7 +94,7 @@ 加载点位集合 - + diff --git a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.csproj.AssemblyReference.cache b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.csproj.AssemblyReference.cache index b9021a4..c821a7c 100644 Binary files a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.csproj.AssemblyReference.cache and b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.csproj.AssemblyReference.cache differ diff --git a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.csproj.CoreCompileInputs.cache b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.csproj.CoreCompileInputs.cache index bf81f1c..2562c5e 100644 --- a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.csproj.CoreCompileInputs.cache +++ b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -b81545b6cee6922e2492904a3e28e855a2da7c43 +343174067cd832fbade3d0f003640c7839b8168f diff --git a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.dll b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.dll index 17615b9..47af7d7 100644 Binary files a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.dll and b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.dll differ diff --git a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.pdb b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.pdb index e5a80a3..9cf49e0 100644 Binary files a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.pdb and b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.pdb differ diff --git a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.xml b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.xml index 4ff7cd2..cc84393 100644 --- a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.xml +++ b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.xml @@ -59,52 +59,6 @@ 报警 - - - PLC 点位改变触发 - - - - - 获取错误相信 - - - - - 间隔时间 - - - - - 当前点位集合 - - - - - PLC地址与端口 - - - - - 加载点位 - - - - - - 清理所有点位 - - - - - 开始监控 - - - - - 停止监控 - - PLC 点位改变触发 @@ -140,7 +94,7 @@ 加载点位集合 - + diff --git a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/ref/PVDEMCS.dll b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/ref/PVDEMCS.dll index 908ba29..17df09a 100644 Binary files a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/ref/PVDEMCS.dll and b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/ref/PVDEMCS.dll differ diff --git a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/refint/PVDEMCS.dll b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/refint/PVDEMCS.dll index 908ba29..17df09a 100644 Binary files a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/refint/PVDEMCS.dll and b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/refint/PVDEMCS.dll differ