diff --git a/Sln.Iot.Business/CheckTimeBusiness.cs b/Sln.Iot.Business/CheckTimeBusiness.cs new file mode 100644 index 0000000..f2408e7 --- /dev/null +++ b/Sln.Iot.Business/CheckTimeBusiness.cs @@ -0,0 +1,76 @@ +#region << 版 本 注 释 >> + +/*-------------------------------------------------------------------- +* 版权所有 (c) 2025 WenJY 保留所有权利。 +* CLR版本：4.0.30319.42000 +* 机器名称：Mr.Wen's MacBook Pro +* 命名空间：Sln.Iot.Business +* 唯一标识：8BCBBC2D-F2EB-45A3-9DBA-24217C772093 +* +* 创建者：WenJY +* 电子邮箱： +* 创建时间：2025-05-07 13:44:30 +* 版本：V1.0.0 +* 描述： +* +*-------------------------------------------------------------------- +* 修改人： +* 时间： +* 修改说明： +* +* 版本：V1.0.0 +*--------------------------------------------------------------------*/ + +#endregion << 版 本 注 释 >> + +using System; +using Sln.Iot.Business.@base; +using Sln.Iot.Common; +using Sln.Iot.Config; +using Sln.Iot.Model.dto; +using Sln.Iot.Serilog; +using Sln.Iot.Socket.Adapter; +using TouchSocket.Core; +using TouchSocket.Sockets; + +namespace Sln.Iot.Business +{ + /// + /// 校时指令 + /// + public class CheckTimeBusiness:BaseBusiness + { + public CheckTimeBusiness(SerilogHelper logger, AppConfig appConfig, StringChange stringChange) : base(logger, appConfig, stringChange) + { + } + + public override FilterResult BufferAnalysis(ISocketClient client, BufferRequestInfo requestInfo, int bodyLength) + { + MessagePack SendMessagePackInfo = new MessagePack() + { + m_MessageType = 0x08, + m_PackLen = new byte[] {0x00, 0x06} + }; + base.GetMessagePack(ref SendMessagePackInfo,requestInfo.buffer); + DateTime currentTime = DateTime.Now; + byte[] timeBuffer = new byte[] + { + base._stringChange.HexStrTorbytes(currentTime.ToString("ss"))[0], + base._stringChange.HexStrTorbytes(currentTime.ToString("mm"))[0], + base._stringChange.HexStrTorbytes(currentTime.ToString("HH"))[0], + base._stringChange.HexStrTorbytes(currentTime.ToString("dd"))[0], + base._stringChange.HexStrTorbytes(currentTime.ToString("MM"))[0], + base._stringChange.HexStrTorbytes(currentTime.ToString("yy"))[0], + }; + + base.SendMessageAsync(client, SendMessagePackInfo,timeBuffer); + + return FilterResult.Success; + } + + public override void ResponseHandle(ISocketClient client, byte[] buffer) + { + //校时指令通过业务数据返回 + } + } +} \ No newline at end of file diff --git a/Sln.Iot.Business/IotEnvBusiness.cs b/Sln.Iot.Business/IotEnvBusiness.cs index ef513cd..1200b2c 100644 --- a/Sln.Iot.Business/IotEnvBusiness.cs +++ b/Sln.Iot.Business/IotEnvBusiness.cs @@ -87,7 +87,7 @@ namespace Sln.Iot.Business iotEnvInstant.monitorId = equipId; - #region 物联网参数解析 Add By Wenjy 2024-09-19 + #region 物联网参数解析 Edit By Wenjy 2025-05-07 修改 Nan 值过滤 do { @@ -99,11 +99,9 @@ namespace Sln.Iot.Business byteBlock.Read(out byte[] tempreture, 4); base._stringChange.SwapBytes(ref tempreture); float f_tempreture = BitConverter.ToSingle(tempreture, 0); - if (double.IsNaN(f_tempreture)) - { - f_tempreture = 0; - } - + + ValueIsNan(ref f_tempreture); + iotEnvInstant.temperature = (decimal) f_tempreture; break; @@ -111,10 +109,8 @@ namespace Sln.Iot.Business byteBlock.Read(out byte[] humidity, 4); base._stringChange.SwapBytes(ref humidity); float f_humidity = BitConverter.ToSingle(humidity, 0); - if (double.IsNaN(f_humidity)) - { - f_humidity = 0; - } + + ValueIsNan(ref f_humidity); iotEnvInstant.humidity = (decimal) f_humidity; break; @@ -123,10 +119,8 @@ namespace Sln.Iot.Business byteBlock.Read(out byte[] noise, 4); base._stringChange.SwapBytes(ref noise); float f_noise = BitConverter.ToSingle(noise, 0); - if (double.IsNaN(f_noise)) - { - f_noise = 0; - } + + ValueIsNan(ref f_noise); iotEnvInstant.noise = (decimal) f_noise; break; @@ -135,10 +129,8 @@ namespace Sln.Iot.Business byteBlock.Read(out byte[] vibrationSpeed, 4); base._stringChange.SwapBytes(ref vibrationSpeed); float f_vibrationSpeed = BitConverter.ToSingle(vibrationSpeed, 0); - if (double.IsNaN(f_vibrationSpeed)) - { - f_vibrationSpeed = 0; - } + + ValueIsNan(ref f_vibrationSpeed); iotEnvInstant.VibrationSpeed = (decimal) f_vibrationSpeed; break; @@ -147,20 +139,17 @@ namespace Sln.Iot.Business byteBlock.Read(out byte[] vibrationDisplacement, 4); base._stringChange.SwapBytes(ref vibrationDisplacement); float f_vibrationDisplacement = BitConverter.ToSingle(vibrationDisplacement, 0); - if (double.IsNaN(f_vibrationDisplacement)) - { - f_vibrationDisplacement = 0; - } + + ValueIsNan(ref f_vibrationDisplacement); + iotEnvInstant.VibrationDisplacement = (decimal)f_vibrationDisplacement; break; case CommParams.VibrationAcceleration: //振动-加速度 byteBlock.Read(out byte[] vibrationAcceleration, 4); base._stringChange.SwapBytes(ref vibrationAcceleration); float f_vibrationAcceleration = BitConverter.ToSingle(vibrationAcceleration, 0); - if (double.IsNaN(f_vibrationAcceleration)) - { - f_vibrationAcceleration = 0; - } + + ValueIsNan(ref f_vibrationAcceleration); iotEnvInstant.VibrationAcceleration = (decimal)f_vibrationAcceleration; break; @@ -168,10 +157,9 @@ namespace Sln.Iot.Business byteBlock.Read(out byte[] vibrationTemp, 4); base._stringChange.SwapBytes(ref vibrationTemp); float f_vibrationTemp = BitConverter.ToSingle(vibrationTemp, 0); - if (double.IsNaN(f_vibrationTemp)) - { - f_vibrationTemp = 0; - } + + ValueIsNan(ref f_vibrationTemp); + iotEnvInstant.VibrationTemp = (decimal)f_vibrationTemp; break; case CommParams.CJSJ: @@ -202,16 +190,16 @@ namespace Sln.Iot.Business if (result.Count > 0) { + + //是否开启 FF 异常值过滤 + if (_appConfig.virtualFlag) + { + ParamVerification(ref result); + } + var inRes = _service.SplitInsert(result,out List insertIds); - /*Task.Run(() => //保存至TD引擎 - { - base.SaveDnbToTDengine(result); - - this.RefreshMonitorInfo(result); - });*/ - - _logger.Info($"{amount}个物联网数据解析处理完成,数据保存{(inRes ? "成功" : "失败")}"); + _logger.Info($"{amount}个物联网数据解析处理完成，保存{result.Count}个物联网数据,保存{(inRes ? "成功" : "失败")}"); } else { @@ -243,5 +231,91 @@ namespace Sln.Iot.Business base.SendMessageAsync(client,SendMessagePackInfo); } + + /// + /// Nan 值处理 + /// + /// + private void ValueIsNan(ref float value) + { + if (double.IsNaN(value)) + { + if (_appConfig.virtualFlag) + { + value = _appConfig.virtualValue; + } + else + { + value = 0; + } + } + } + + /// + /// FF FF参数过滤 + /// + /// + /// + private void ParamVerification(ref List iotEnvInstants) + { + if (iotEnvInstants == null) + { + throw new ArgumentNullException($"过滤参数方法异常，传入参数为空"); + } + + for (int i = iotEnvInstants.Count - 1; i >= 0; i--) + { + var item = iotEnvInstants[i]; + + if (item.temperature == _appConfig.virtualValue) + { + _logger.Info($"MonitorId:{item.monitorId},温度值为 FF FF FF FF，已启用过滤不保存该表数据"); + iotEnvInstants.RemoveAt(i); + continue; + } + + if (item.humidity == _appConfig.virtualValue) + { + _logger.Info($"MonitorId:{item.monitorId},湿度值为 FF FF FF FF，已启用过滤不保存该表数据"); + iotEnvInstants.RemoveAt(i); + continue; + } + + if (item.noise == _appConfig.virtualValue) + { + _logger.Info($"MonitorId:{item.monitorId},噪音值为 FF FF FF FF，已启用过滤不保存该表数据"); + iotEnvInstants.RemoveAt(i); + continue; + } + + if (item.VibrationSpeed == _appConfig.virtualValue) + { + _logger.Info($"MonitorId:{item.monitorId},振动速度值为 FF FF FF FF，已启用过滤不保存该表数据"); + iotEnvInstants.RemoveAt(i); + continue; + } + + if (item.VibrationDisplacement == _appConfig.virtualValue) + { + _logger.Info($"MonitorId:{item.monitorId},振动位移值为 FF FF FF FF，已启用过滤不保存该表数据"); + iotEnvInstants.RemoveAt(i); + continue; + } + + if (item.VibrationAcceleration == _appConfig.virtualValue) + { + _logger.Info($"MonitorId:{item.monitorId},振动加速度值为 FF FF FF FF，已启用过滤不保存该表数据"); + iotEnvInstants.RemoveAt(i); + continue; + } + + if (item.VibrationTemp == _appConfig.virtualValue) + { + _logger.Info($"MonitorId:{item.monitorId},振动温度值为 FF FF FF FF，已启用过滤不保存该表数据"); + iotEnvInstants.RemoveAt(i); + continue; + } + } + } } } \ No newline at end of file diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.dll b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.dll index a62cc26..182f537 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.dll and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.dll differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.pdb b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.pdb index 5ae3984..7c7acdc 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.pdb and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.pdb differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Config.dll b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Config.dll index 784c497..e0a83b7 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Config.dll and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Config.dll differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb index 0abf34b..d729b57 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll index ec97308..df53cd1 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb index 7017da6..e004f32 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll index 39608dd..8bdd1a9 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb index d150231..f5746df 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll index 04505b8..94f880d 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb index c4e3ad4..70937a5 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb differ diff --git a/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.csproj.AssemblyReference.cache b/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.csproj.AssemblyReference.cache index 9c21cf7..82d5a97 100644 Binary files a/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.csproj.AssemblyReference.cache and b/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.csproj.AssemblyReference.cache differ diff --git a/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.csproj.CoreCompileInputs.cache b/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.csproj.CoreCompileInputs.cache index 1e23903..f9877d8 100644 --- a/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.csproj.CoreCompileInputs.cache +++ b/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -1a87674c6ab35ba5ae0a5d1ecc4eed06aadb5dbd +2ce0c4f9ee62a08488a9a35d5ddbc19f5bbae93b diff --git a/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.dll b/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.dll index a62cc26..182f537 100644 Binary files a/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.dll and b/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.dll differ diff --git a/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.pdb b/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.pdb index 5ae3984..7c7acdc 100644 Binary files a/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.pdb and b/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.pdb differ diff --git a/Sln.Iot.Config/AppConfig.cs b/Sln.Iot.Config/AppConfig.cs index 842af3d..ec5b609 100644 --- a/Sln.Iot.Config/AppConfig.cs +++ b/Sln.Iot.Config/AppConfig.cs @@ -35,11 +35,6 @@ namespace Sln.Iot.Config /// public string logPath { get; set; } - /// - /// 电量采集时间间隔，单位：分钟 - /// - public string CollectElectricTime { get; set; } - /// /// 监听端口 /// diff --git a/Sln.Iot.Config/bin/Debug/netstandard2.1/Sln.Iot.Config.dll b/Sln.Iot.Config/bin/Debug/netstandard2.1/Sln.Iot.Config.dll index 784c497..e0a83b7 100644 Binary files a/Sln.Iot.Config/bin/Debug/netstandard2.1/Sln.Iot.Config.dll and b/Sln.Iot.Config/bin/Debug/netstandard2.1/Sln.Iot.Config.dll differ diff --git a/Sln.Iot.Config/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb b/Sln.Iot.Config/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb index 0abf34b..d729b57 100644 Binary files a/Sln.Iot.Config/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb and b/Sln.Iot.Config/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb differ diff --git a/Sln.Iot.Config/obj/Debug/netstandard2.1/Sln.Iot.Config.dll b/Sln.Iot.Config/obj/Debug/netstandard2.1/Sln.Iot.Config.dll index 784c497..e0a83b7 100644 Binary files a/Sln.Iot.Config/obj/Debug/netstandard2.1/Sln.Iot.Config.dll and b/Sln.Iot.Config/obj/Debug/netstandard2.1/Sln.Iot.Config.dll differ diff --git a/Sln.Iot.Config/obj/Debug/netstandard2.1/Sln.Iot.Config.pdb b/Sln.Iot.Config/obj/Debug/netstandard2.1/Sln.Iot.Config.pdb index 0abf34b..d729b57 100644 Binary files a/Sln.Iot.Config/obj/Debug/netstandard2.1/Sln.Iot.Config.pdb and b/Sln.Iot.Config/obj/Debug/netstandard2.1/Sln.Iot.Config.pdb differ diff --git a/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Config.dll b/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Config.dll index 784c497..e0a83b7 100644 Binary files a/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Config.dll and b/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Config.dll differ diff --git a/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb b/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb index 0abf34b..d729b57 100644 Binary files a/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb and b/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb differ diff --git a/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll b/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll index ec97308..df53cd1 100644 Binary files a/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll and b/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll differ diff --git a/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb b/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb index 7017da6..e004f32 100644 Binary files a/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb and b/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb differ diff --git a/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.csproj.AssemblyReference.cache b/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.csproj.AssemblyReference.cache index 801912b..0188c2c 100644 Binary files a/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.csproj.AssemblyReference.cache and b/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.csproj.AssemblyReference.cache differ diff --git a/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.dll b/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.dll index ec97308..df53cd1 100644 Binary files a/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.dll and b/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.dll differ diff --git a/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.pdb b/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.pdb index 7017da6..e004f32 100644 Binary files a/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.pdb and b/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.pdb differ diff --git a/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Config.dll b/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Config.dll index 784c497..e0a83b7 100644 Binary files a/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Config.dll and b/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Config.dll differ diff --git a/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb b/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb index 0abf34b..d729b57 100644 Binary files a/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb and b/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb differ diff --git a/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll b/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll index 39608dd..8bdd1a9 100644 Binary files a/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll and b/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll differ diff --git a/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb b/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb index d150231..f5746df 100644 Binary files a/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb and b/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb differ diff --git a/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.csproj.AssemblyReference.cache b/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.csproj.AssemblyReference.cache index e5139f4..8c380d9 100644 Binary files a/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.csproj.AssemblyReference.cache and b/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.csproj.AssemblyReference.cache differ diff --git a/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.dll b/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.dll index 39608dd..8bdd1a9 100644 Binary files a/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.dll and b/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.dll differ diff --git a/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.pdb b/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.pdb index d150231..f5746df 100644 Binary files a/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.pdb and b/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.pdb differ diff --git a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Config.dll b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Config.dll index 784c497..e0a83b7 100644 Binary files a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Config.dll and b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Config.dll differ diff --git a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb index 0abf34b..d729b57 100644 Binary files a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb and b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Config.pdb differ diff --git a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll index 39608dd..8bdd1a9 100644 Binary files a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll and b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll differ diff --git a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb index d150231..f5746df 100644 Binary files a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb and b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb differ diff --git a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll index 04505b8..94f880d 100644 Binary files a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll and b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll differ diff --git a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb index c4e3ad4..70937a5 100644 Binary files a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb and b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb differ diff --git a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.AssemblyReference.cache b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.AssemblyReference.cache index ab3ca5f..6d0f80e 100644 Binary files a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.AssemblyReference.cache and b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.AssemblyReference.cache differ diff --git a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.dll b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.dll index 04505b8..94f880d 100644 Binary files a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.dll and b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.dll differ diff --git a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.pdb b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.pdb index c4e3ad4..70937a5 100644 Binary files a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.pdb and b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.pdb differ diff --git a/Sln.Iot/Program.cs b/Sln.Iot/Program.cs index 728c5b7..a58d2d1 100644 --- a/Sln.Iot/Program.cs +++ b/Sln.Iot/Program.cs @@ -38,6 +38,9 @@ class Program int bodyLength = 0; switch (info.DataType) { + case 0x08: + _business = ServiceProvider.GetService(); + break; case 0x21: //登录指令 _business = ServiceProvider.GetService(); break; diff --git a/Sln.Iot/appsettings.json b/Sln.Iot/appsettings.json index c3c9792..54ee4a2 100644 --- a/Sln.Iot/appsettings.json +++ b/Sln.Iot/appsettings.json @@ -1,8 +1,9 @@ { "AppConfig": { "logPath": "\\\\Mac\\Home\\Public\\WorkSpace\\Mesnac\\项目资料\\IOT物联网数据采集\\日志信息", - "CollectElectricTime": "3", "listernPort": 7001, + "virtualFlag": true, + "virtualValue": 99999, "SqlConfig": [ { "configId": "mesTD", diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.dll b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.dll index a62cc26..182f537 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.dll and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.dll differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.pdb b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.pdb index 5ae3984..7c7acdc 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.pdb and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.pdb differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Config.dll b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Config.dll index 784c497..e0a83b7 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Config.dll and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Config.dll differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Config.pdb b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Config.pdb index 0abf34b..d729b57 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Config.pdb and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Config.pdb differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.dll b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.dll index ec97308..df53cd1 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.dll and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.dll differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.pdb b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.pdb index 7017da6..e004f32 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.pdb and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.pdb differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.dll b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.dll index 39608dd..8bdd1a9 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.dll and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.dll differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.pdb b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.pdb index d150231..f5746df 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.pdb and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.pdb differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.dll b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.dll index 04505b8..94f880d 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.dll and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.dll differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.pdb b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.pdb index c4e3ad4..70937a5 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.pdb and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.pdb differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.dll b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.dll index 0794617..ed34dfd 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.dll and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.dll differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.pdb b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.pdb index 1f7251a..6f0fd87 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.pdb and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.pdb differ diff --git a/Sln.Iot/bin/Debug/net6.0/appsettings.json b/Sln.Iot/bin/Debug/net6.0/appsettings.json index c3c9792..54ee4a2 100644 --- a/Sln.Iot/bin/Debug/net6.0/appsettings.json +++ b/Sln.Iot/bin/Debug/net6.0/appsettings.json @@ -1,8 +1,9 @@ { "AppConfig": { "logPath": "\\\\Mac\\Home\\Public\\WorkSpace\\Mesnac\\项目资料\\IOT物联网数据采集\\日志信息", - "CollectElectricTime": "3", "listernPort": 7001, + "virtualFlag": true, + "virtualValue": 99999, "SqlConfig": [ { "configId": "mesTD", diff --git a/Sln.Iot/obj/Debug/net6.0/Sln.Iot.csproj.AssemblyReference.cache b/Sln.Iot/obj/Debug/net6.0/Sln.Iot.csproj.AssemblyReference.cache index c62e479..53c8437 100644 Binary files a/Sln.Iot/obj/Debug/net6.0/Sln.Iot.csproj.AssemblyReference.cache and b/Sln.Iot/obj/Debug/net6.0/Sln.Iot.csproj.AssemblyReference.cache differ diff --git a/Sln.Iot/obj/Debug/net6.0/Sln.Iot.dll b/Sln.Iot/obj/Debug/net6.0/Sln.Iot.dll index 0794617..ed34dfd 100644 Binary files a/Sln.Iot/obj/Debug/net6.0/Sln.Iot.dll and b/Sln.Iot/obj/Debug/net6.0/Sln.Iot.dll differ diff --git a/Sln.Iot/obj/Debug/net6.0/Sln.Iot.pdb b/Sln.Iot/obj/Debug/net6.0/Sln.Iot.pdb index 1f7251a..6f0fd87 100644 Binary files a/Sln.Iot/obj/Debug/net6.0/Sln.Iot.pdb and b/Sln.Iot/obj/Debug/net6.0/Sln.Iot.pdb differ