添加项目文件。

SlnMesnac.Business/SlnMesnac.Business.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SlnMesnac.Plc\SlnMesnac.Plc.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Rfid\SlnMesnac.Rfid.csproj" />
+  </ItemGroup>
+
+</Project>

SlnMesnac.Business/base/BaseBusiness.cs

@@ -0,0 +1,115 @@
+using Microsoft.Extensions.DependencyInjection;
+using SlnMesnac.Plc;
+using SlnMesnac.Rfid;
+using SlnMesnac.Serilog;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Business.base
+* 唯一标识：b00d95c1-a164-43a3-9f34-2a5d2efb3f34
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-04-12 17:36:19
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Business.@base
+{
+    internal class BaseBusiness
+    {
+        private readonly List<PlcAbsractFactory> _plcFactories;
+
+        private readonly List<RfidAbsractFactory> _rfidFactories;
+
+        private IServiceProvider _serviceProvider;
+
+        public BaseBusiness(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+
+            using (var scope = _serviceProvider.CreateScope())
+            {
+                _plcFactories = scope.ServiceProvider.GetRequiredService<List<PlcAbsractFactory>>(); 
+                _rfidFactories = scope.ServiceProvider.GetRequiredService<List<RfidAbsractFactory>>(); 
+            }
+        }
+
+        /// <summary>
+        /// 根据Key获取PLC连接信息
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <exception cref="InvalidOperationException"></exception>
+        public PlcAbsractFactory GetPlcByKey(string key)
+        {
+            if(_plcFactories == null)
+            {
+                throw new ArgumentNullException($"根据Key获取PLC连接信息异常:PLC 连接信息为空");
+            }
+
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentNullException("根据Key获取PLC连接信息异常:设备Key参数为空");
+            }
+
+            try
+            {
+                var info = _plcFactories.Where(x => x.ConfigKey == key).FirstOrDefault();
+
+                return info;
+            }catch(Exception ex)
+            {
+                throw new InvalidOperationException($"根据Key获取PLC连接信息异常:{ex.Message}");
+            }
+        }
+
+
+        /// <summary>
+        /// 根据Key获取Rfid连接信息
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <exception cref="InvalidOperationException"></exception>
+        public RfidAbsractFactory GetRfidByKey(string key)
+        {
+            if (_rfidFactories == null)
+            {
+                throw new ArgumentNullException($"根据Key获取RFID连接信息异常:PLC 连接信息为空");
+            }
+
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentNullException("根据Key获取RFID连接信息异常:设备Key参数为空");
+            }
+
+            try
+            {
+                var info = _rfidFactories.Where(x => x.ConfigKey == key).FirstOrDefault();
+
+                return info;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据Key获取RFID连接信息异常:{ex.Message}");
+            }
+        }
+    }
+}

SlnMesnac.Common/ExpressionExtensions.cs

@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Linq;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Common
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Common
+{
+    /// <summary>
+    /// 谓词表达式构建器
+    /// </summary>
+    public static class ExpressionExtensions
+    {
+        /// <summary>
+        /// 创建一个值恒为 <c>true</c> 的表达式。
+        /// </summary>
+        /// <typeparam name="T">表达式方法类型</typeparam>
+        /// <returns>一个值恒为 <c>true</c> 的表达式。</returns>
+        public static Expression<Func<T, bool>> True<T>() { return p => true; }
+
+        /// <summary>
+        /// 创建一个值恒为 <c>false</c> 的表达式。
+        /// </summary>
+        /// <typeparam name="T">表达式方法类型</typeparam>
+        /// <returns>一个值恒为 <c>false</c> 的表达式。</returns>
+        public static Expression<Func<T, bool>> False<T>() { return f => false; }
+
+        /// <summary>
+        /// 使用 Expression.OrElse 的方式拼接两个 System.Linq.Expression。
+        /// </summary>
+        /// <typeparam name="T">表达式方法类型</typeparam>
+        /// <param name="left">左边的 System.Linq.Expression 。</param>
+        /// <param name="right">右边的 System.Linq.Expression。</param>
+        /// <returns>拼接完成的 System.Linq.Expression。</returns>
+        public static Expression<T> Or<T>(this Expression<T> left, Expression<T> right)
+        {
+            return MakeBinary(left, right, Expression.OrElse);
+        }
+
+        /// <summary>
+        /// 使用 Expression.AndAlso 的方式拼接两个 System.Linq.Expression。
+        /// </summary>
+        /// <typeparam name="T">表达式方法类型</typeparam>
+        /// <param name="left">左边的 System.Linq.Expression 。</param>
+        /// <param name="right">右边的 System.Linq.Expression。</param>
+        /// <returns>拼接完成的 System.Linq.Expression。</returns>
+        public static Expression<T> And<T>(this Expression<T> left, Expression<T> right)
+        {
+            return MakeBinary(left, right, Expression.AndAlso);
+        }
+
+        /// <summary>
+        /// 使用自定义的方式拼接两个 System.Linq.Expression。
+        /// </summary>
+        /// <typeparam name="T">表达式方法类型</typeparam>
+        /// <param name="left">左边的 System.Linq.Expression 。</param>
+        /// <param name="right">右边的 System.Linq.Expression。</param>
+        /// <param name="func"> </param>
+        /// <returns>拼接完成的 System.Linq.Expression。</returns>
+        private static Expression<T> MakeBinary<T>(this Expression<T> left, Expression<T> right, Func<Expression, Expression, Expression> func)
+        {
+            return MakeBinary((LambdaExpression)left, right, func) as Expression<T>;
+        }
+
+        /// <summary>
+        /// 拼接两个 <paramref>
+        ///        <name>System.Linq.Expression</name>
+        ///      </paramref>  ，两个 <paramref>
+        ///                         <name>System.Linq.Expression</name>
+        ///                       </paramref>  的参数必须完全相同。
+        /// </summary>
+        /// <param name="left">左边的 <paramref>
+        ///                          <name>System.Linq.Expression</name>
+        ///                        </paramref> </param>
+        /// <param name="right">右边的 <paramref>
+        ///                           <name>System.Linq.Expression</name>
+        ///                         </paramref> </param>
+        /// <param name="func">表达式拼接的具体逻辑</param>
+        /// <returns>拼接完成的 <paramref>
+        ///                  <name>System.Linq.Expression</name>
+        ///                </paramref> </returns>
+        private static LambdaExpression MakeBinary(this LambdaExpression left, LambdaExpression right, Func<Expression, Expression, Expression> func)
+        {
+            var data = Combinate(right.Parameters, left.Parameters).ToArray();
+
+            right = ParameterReplace.Replace(right, data) as LambdaExpression;
+
+            return Expression.Lambda(func(left.Body, right.Body), left.Parameters.ToArray());
+        }
+
+        /// <summary>
+        /// 合并参数
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="left"></param>
+        /// <param name="right"></param>
+        /// <returns></returns>
+        private static IEnumerable<KeyValuePair<T, T>> Combinate<T>(IEnumerable<T> left, IEnumerable<T> right)
+        {
+            var a = left.GetEnumerator();
+            var b = right.GetEnumerator();
+            while (a.MoveNext() && b.MoveNext())
+                yield return new KeyValuePair<T, T>(a.Current, b.Current);
+        }
+    }
+
+    internal sealed class ParameterReplace : ExpressionVisitor
+    {
+        public static Expression Replace(Expression e, IEnumerable<KeyValuePair<ParameterExpression, ParameterExpression>> paramList)
+        {
+            var item = new ParameterReplace(paramList);
+            return item.Visit(e);
+        }
+
+        private readonly Dictionary<ParameterExpression, ParameterExpression> _parameters;
+
+        public ParameterReplace(IEnumerable<KeyValuePair<ParameterExpression, ParameterExpression>> paramList)
+        {
+            _parameters = paramList.ToDictionary(p => p.Key, p => p.Value, new ParameterEquality());
+        }
+
+        protected override Expression VisitParameter(ParameterExpression p)
+        {
+            ParameterExpression result;
+            if (_parameters.TryGetValue(p, out result))
+                return result;
+            return base.VisitParameter(p);
+        }
+
+        #region class: ParameterEquality
+        private class ParameterEquality : IEqualityComparer<ParameterExpression>
+        {
+            public bool Equals(ParameterExpression x, ParameterExpression y)
+            {
+                if (x == null || y == null)
+                    return false;
+
+                return x.Type == y.Type;
+            }
+
+            public int GetHashCode(ParameterExpression obj)
+            {
+                if (obj == null)
+                    return 0;
+
+                return obj.Type.GetHashCode();
+            }
+        }
+        #endregion
+    }
+}

SlnMesnac.Common/SlnMesnac.Common.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+  </ItemGroup>
+
+</Project>

SlnMesnac.Common/StringChange.cs

@@ -0,0 +1,225 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Common
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Common
+{
+    public class StringChange
+    {
+        /// <summary>
+        /// 将字符串强制转换成int，转换失败则返回0
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        public int ParseToInt(string str)
+        {
+            int returnInt = 0;
+            if (str == null || str.Trim().Length < 1)
+            {
+                return returnInt;
+            }
+            if (int.TryParse(str, out returnInt))
+            {
+                return returnInt;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// char数组转Array
+        /// </summary>
+        /// <param name="cha"></param>
+        /// <param name="len"></param>
+        /// <returns></returns>
+        public string CharArrayToString(char[] cha, int len)
+        {
+            string str = "";
+            for (int i = 0; i < len; i++)
+            {
+                str += string.Format("{0}", cha[i]);
+            }
+
+            return str;
+        }
+
+        public string bytesToHexStr(byte[] bytes, int iLen)//e.g. { 0x01, 0x01} ---> " 01 01"
+        {
+            string returnStr = "";
+            if (bytes != null)
+            {
+                for (int i = 0; i < iLen; i++)
+                {
+                    returnStr += bytes[i].ToString("X2");
+                }
+            }
+            return returnStr;
+        }
+
+        public byte[] HexStrTorbytes(string strHex)//e.g. " 01 01" ---> { 0x01, 0x01}
+        {
+            strHex = strHex.Replace(" ", "");
+            if ((strHex.Length % 2) != 0)
+                strHex += " ";
+            byte[] returnBytes = new byte[strHex.Length / 2];
+            for (int i = 0; i < returnBytes.Length; i++)
+                returnBytes[i] = Convert.ToByte(strHex.Substring(i * 2, 2), 16);
+            return returnBytes;
+        }
+
+        public string StringToHexString(string s, Encoding encode)
+        {
+            byte[] b = encode.GetBytes(s);          //按照指定编码将string编程字节数组
+            string result = string.Empty;
+            for (int i = 0; i < b.Length; i++)      //逐字节变为16进制字符，以%隔开
+            {
+                result += "%" + Convert.ToString(b[i], 16);
+            }
+            return result;
+        }
+
+        public string HexStringToString(string hs, Encoding encode)
+        {
+            //以%分割字符串，并去掉空字符
+            string[] chars = hs.Split(new char[] { '%' }, StringSplitOptions.RemoveEmptyEntries);
+            byte[] b = new byte[chars.Length];
+            //逐个字符变为16进制字节数据
+            for (int i = 0; i < chars.Length; i++)
+            {
+                b[i] = Convert.ToByte(chars[i], 16);
+            }
+            //按照指定编码将字节数组变为字符串
+            return encode.GetString(b);
+        }
+
+        public byte[] Swap16Bytes(byte[] OldU16)
+        {
+            byte[] ReturnBytes = new byte[2];
+            ReturnBytes[1] = OldU16[0];
+            ReturnBytes[0] = OldU16[1];
+            return ReturnBytes;
+        }
+
+
+        /// <param name="strbase64">64Base码</param>
+        /// <param name="path">保存路径</param>
+        /// <param name="filename">文件名称</param>
+        /// <returns></returns>
+        public bool Base64ToImage(string strbase64, string path, string filename)
+        {
+            bool Flag = false;
+            try
+            {
+                //base64编码的文本 转为 图片
+                //图片名称
+                byte[] arr = Convert.FromBase64String(strbase64);//将指定的字符串（它将二进制数据编码为 Base64 数字）转换为等效的 8 位无符号整数数组。
+                using (MemoryStream ms = new MemoryStream(arr))
+                {
+                    Bitmap bmp = new Bitmap(ms);//加载图像
+                    if (!Directory.Exists(path))//判断保存目录是否存在
+                    {
+                        Directory.CreateDirectory(path);
+                    }
+                    bmp.Save((path + "\\" + filename + ".png"), System.Drawing.Imaging.ImageFormat.Png);//将图片以JPEG格式保存在指定目录(可以选择其他图片格式)
+                    ms.Close();//关闭流并释放
+                    if (File.Exists(path + "\\" + filename + ".png"))//判断是否存在
+                    {
+                        Flag = true;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("图片保存失败：" + ex.Message);
+            }
+            return Flag;
+        }
+
+        /// <summary>
+        /// 获取时间戳
+        /// </summary>
+        /// <returns></returns>
+        public long GetTimeStamp()
+        {
+            TimeSpan ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
+            return Convert.ToInt64(ts.TotalSeconds);
+        }
+
+        public byte[] ConvertFloatToINt(byte[] floatBytes)
+        {
+            byte[] intBytes = new byte[floatBytes.Length / 2];
+            for (int i = 0; i < intBytes.Length; i++)
+            {
+                intBytes[i] = floatBytes[i * 2];
+            }
+            return intBytes;
+        }
+
+        //CRC异或校验
+        public byte CalculateVerify(byte[] pMessage, int iLength)
+        {
+            UInt16 i;
+            byte iVerify = 0;
+
+            iVerify = pMessage[0];
+            for (i = 1; i < iLength; i++)
+            {
+                iVerify = (byte)(iVerify ^ pMessage[i]);
+            }
+            return iVerify;
+        }
+
+        public int HexStringToNegative(string strNumber)
+        {
+
+            int iNegate = 0;
+            int iNumber = Convert.ToInt32(strNumber, 16);
+            if (iNumber > 127)
+            {
+                int iComplement = iNumber - 1;
+                string strNegate = string.Empty;
+                char[] binchar = Convert.ToString(iComplement, 2).PadLeft(8, '0').ToArray();
+                foreach (char ch in binchar)
+                {
+                    if (Convert.ToInt32(ch) == 48)
+                    {
+                        strNegate += "1";
+                    }
+                    else
+                    {
+                        strNegate += "0";
+                    }
+                }
+                iNegate = -Convert.ToInt32(strNegate, 2);
+            }
+            return iNegate;
+        }
+    }
+}

SlnMesnac.Config/AppConfig.cs

@@ -0,0 +1,87 @@
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Config
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Config
+{
+    /// <summary>
+    /// 系统配置
+    /// </summary>
+    #pragma warning disable CS8618 // Non-nullable field 'Data' must contain a non-null value when exiting constructor. Consider declaring the field as nullable.
+    public class AppConfig : IOptions<AppConfig>
+    {
+        /// <summary>
+        /// 日志文件路径
+        /// </summary>
+        public string logPath { get; set; }
+        
+        /// <summary>
+        /// Sql连接配置 
+        /// </summary>
+        public List<SqlConfig> sqlConfig { get; set; }
+        
+        /// <summary>
+        /// PLC连接配置
+        /// </summary>
+        public List<PlcConfig> plcConfig { get; set; }
+        
+        /// <summary>
+        /// RFID连接配置
+        /// </summary>
+        public List<RfidConfig> rfidConfig { get; set; }
+
+
+        /// <summary>
+        /// Redis配置
+        /// </summary>
+        public string redisConfig { get; set; }
+
+        /// <summary>
+        /// 修改配置文件
+        /// </summary>
+        /// <param name="appConfig"></param>
+        public void SetValue(AppConfig appConfig)
+        {
+            var jsonObject = JsonConvert.SerializeObject(new
+            {
+                AppConfig = new
+                {
+                    logPath = appConfig.logPath,
+                    SqlConfig = appConfig.sqlConfig,
+                    PlcConfig = appConfig.plcConfig,
+                    RfidConfig = appConfig.rfidConfig,
+                    RedisConfig = appConfig.redisConfig,
+                }
+            }, Newtonsoft.Json.Formatting.Indented);
+            var appSettingsPath = Path.Combine(AppContext.BaseDirectory, "appsettings.json");
+            File.WriteAllText(appSettingsPath, jsonObject);
+        }
+
+        public AppConfig Value => this;
+    }
+}

SlnMesnac.Config/PlcConfig.cs

@@ -0,0 +1,61 @@
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Config
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Config
+{
+    /// <summary>
+    /// PLC配置，通过AppConfig进行获取
+    /// </summary>
+    #pragma warning disable CS8618 // Non-nullable field 'Data' must contain a non-null value when exiting constructor. Consider declaring the field as nullable.
+    public class PlcConfig
+    {
+        /// <summary>
+        /// PLC配置ID
+        /// </summary>
+        public int configId { get; set; }
+        
+        /// <summary>
+        /// PIC类型
+        /// </summary>
+        public string plcType { get; set; }
+        
+        /// <summary>
+        /// PLC IP
+        /// </summary>
+        public string plcIp { get; set; }
+        
+        /// <summary>
+        /// PLC Port
+        /// </summary>
+        public int plcPort { get; set; }
+        
+        /// <summary>
+        /// PLC Key
+        /// </summary>
+        public string plcKey { get; set; }
+        
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool isFlage { get; set; }
+    }
+}

SlnMesnac.Config/RfidConfig.cs

@@ -0,0 +1,52 @@
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Config
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Config
+{
+    public class RfidConfig
+    {
+        /// <summary>
+        /// 配置ID
+        /// </summary>
+        public int configId { get; set; }
+        
+        /// <summary>
+        /// 设备 IP
+        /// </summary>
+        public string? equipIp { get; set; }
+        
+        /// <summary>
+        /// 设备 Port
+        /// </summary>
+        public int equipPort { get; set; }
+        
+        /// <summary>
+        /// 设备 Key
+        /// </summary>
+        public string? equipKey { get; set; }
+        
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool isFlage { get; set; }
+    }
+}

SlnMesnac.Config/SlnMesnac.Config.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
+
+</Project>

SlnMesnac.Config/SqlConfig.cs

@@ -0,0 +1,46 @@
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Config
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Config
+{
+    /// <summary>
+    /// Sql连接配置
+    /// </summary>
+    #pragma warning disable CS8618 // Non-nullable field 'Data' must contain a non-null value when exiting constructor. Consider declaring the field as nullable.
+    public class SqlConfig
+    {
+        /// <summary>
+        /// Sql 配置ID，实体通过该ID关联数据源
+        /// </summary>
+        public string configId { get; set; }
+        
+        /// <summary>
+        /// 数据库类型，MySql-0;SqlServer-1;Sqlite-2;Oracle-3
+        /// </summary>
+        public int dbType { get; set; }
+        
+        /// <summary>
+        /// 连接字符串
+        /// </summary>
+        public string connStr { get; set; }
+    }
+}

SlnMesnac.Extensions/PlcFactorySetup.cs

@@ -0,0 +1,131 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+using SlnMesnac.Config;
+using SlnMesnac.Plc;
+using SlnMesnac.Plc.Factory;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Extensions
+* 唯一标识：9bf604b4-3937-476a-adb0-27adc6fbea28
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-04-12 15:25:47
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Extensions
+{
+    /// <summary>
+    /// PLC工厂
+    /// </summary>
+    public static class PlcFactorySetup
+    {
+
+        public static void AddPlcFactorySetup(this IServiceCollection services)
+        {
+            services.AddSingleton<List<PlcAbsractFactory>>(x =>
+            {
+                AppConfig appConfig = x.GetService<AppConfig>();
+
+                List<PlcAbsractFactory> absractFactories = new List<PlcAbsractFactory>();
+
+                try
+                {
+                    do
+                    {
+                        if (!HslCommunication.Authorization.SetAuthorizationCode("1839541f-8fb4-42c4-a13f-733b027fe5af"))
+                        {
+                            Log.Information("HslCommunication激活失败，可用时长为24小时");
+                            break;
+                        }
+                        else
+                        {
+                            Log.Information("HslCommunication激活成功");
+                        }
+
+                        if (appConfig.plcConfig != null)
+                        {
+                            foreach (var item in appConfig.plcConfig)
+                            {
+                                if (item.isFlage)
+                                {
+                                    PlcAbsractFactory _plc = InitPlc(x, item.plcType);
+
+                                    var connectResult = _plc.Connect(item.plcIp, item.plcPort);
+                                    if (connectResult)
+                                    {
+                                        Log.Information($"PLC：{item.plcIp}:{item.plcPort};连接成功，时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+                                        _plc.ConfigKey = item.plcKey;
+
+                                        if (absractFactories.Contains(_plc))
+                                        {
+                                            absractFactories.Remove(_plc);
+                                        }
+
+                                        absractFactories.Add(_plc);
+                                    }
+                                    else
+                                    {
+                                        Log.Information($"PLC：{item.plcIp}:{item.plcPort};连接失败，时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+                                    }
+                                }
+                            }
+                        }
+                    }while(false);
+                }
+                catch (Exception e)
+                {
+                    Log.Error($"PLC初始化连接异常：{e.Message}");
+                }
+
+                return absractFactories;
+            });
+        }
+
+        private static PlcAbsractFactory InitPlc(IServiceProvider serviceProvider,string plcType)
+        {
+            PlcAbsractFactory _plc = null;
+            var _inovance = serviceProvider.GetRequiredService<InovanceFactory>();
+            var _melsecBinary = serviceProvider.GetRequiredService<MelsecBinaryFactory>();
+            var _omronNj = serviceProvider.GetRequiredService<OmronNJFactory>();
+            var _siemens = serviceProvider.GetRequiredService<SiemensFactory>();
+
+            switch (plcType)
+            {
+                case "InovancePlc":
+                    _plc = _inovance;
+                    break;
+                case "MelsecBinaryPlc":
+                    _plc = _melsecBinary;
+                    break;
+                case "OmronNJPlc":
+                    _plc = _omronNj;
+                    break;
+                case "SiemensPlc":
+                    _plc = _siemens;
+                    break;
+                default:
+                    break;
+            }
+
+            return _plc;
+        }
+    }
+}

SlnMesnac.Extensions/RfidFactorySetup.cs

@@ -0,0 +1,87 @@
+using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+using SlnMesnac.Config;
+using SlnMesnac.Plc;
+using SlnMesnac.Rfid;
+using SlnMesnac.Rfid.Factory;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Extensions
+* 唯一标识：007aaf92-2adf-42a1-8b64-4e02925e3d5b
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-04-12 17:08:27
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Extensions
+{
+    public static class RfidFactorySetup
+    {
+        public static void AddRfidFactorySetup(this IServiceCollection services)
+        {
+            services.AddSingleton<List<RfidAbsractFactory>>(x =>
+            {
+                AppConfig appConfig = x.GetService<AppConfig>();
+                List <RfidAbsractFactory> absractFactories = new List<RfidAbsractFactory>();
+
+                try
+                {
+                    if (appConfig.rfidConfig != null)
+                    {
+                        foreach (var item in appConfig.rfidConfig)
+                        {
+                            if (item.isFlage)
+                            {
+                                RfidAbsractFactory _rfid = x.GetService<RflyFactory>();
+                                bool connectResult = _rfid.Connect(item.equipIp, item.equipPort);
+                                if (connectResult)
+                                {
+                                    Log.Information($"RFID：{item.equipIp}:{item.equipPort};连接成功，时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+                                    _rfid.ConfigKey = item.equipKey;
+
+                                    if (absractFactories.Contains(_rfid))
+                                    {
+                                        absractFactories.Remove(_rfid);
+                                    }
+
+                                    absractFactories.Add(_rfid);
+                                }
+                                else
+                                {
+                                    Log.Information($"RFID：{item.equipIp}:{item.equipPort};连接失败，时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        Log.Error("RFID配置信息为空");
+                    }
+                }
+                catch (Exception e)
+                {
+                    Log.Error($"RFID初始化连接异常：{e.Message}");
+                }
+
+                return absractFactories;
+            });
+        }
+    }
+}

SlnMesnac.Extensions/SlnMesnac.Extensions.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SlnMesnac.Config\SlnMesnac.Config.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Plc\SlnMesnac.Plc.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Rfid\SlnMesnac.Rfid.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Serilog\SlnMesnac.Serilog.csproj" />
+  </ItemGroup>
+
+</Project>

SlnMesnac.Extensions/SqlsugarSetup.cs

@@ -0,0 +1,69 @@
+using Microsoft.Extensions.DependencyInjection;
+using SlnMesnac.Config;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Extensions
+* 唯一标识：bbb46406-e99d-4205-8046-ad954cf88315
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-04-12 17:31:43
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Extensions
+{
+    public static class SqlsugarSetup
+    {
+        /// <summary>
+        /// 注册SqlSugar
+        /// </summary>
+        /// <param name="services"></param>
+        public static void AddSqlSugarSetup(this IServiceCollection services)
+        {
+            services.AddSingleton<ISqlSugarClient>(x =>
+            {
+                var appConfig = x.GetService<AppConfig>();
+
+                var connectConfigList = new List<ConnectionConfig>();
+                if (appConfig.sqlConfig != null)
+                {
+                    foreach (var item in appConfig.sqlConfig)
+                    {
+                        var config = new ConnectionConfig()
+                        {
+                            ConfigId = item.configId,
+                            DbType = (DbType)item.dbType,
+                            ConnectionString = item.connStr,
+                            InitKeyType = InitKeyType.Attribute,
+                            IsAutoCloseConnection = true,
+                        };
+                        connectConfigList.Add(config);
+                    }
+                }
+                SqlSugarScope Db = new SqlSugarScope(connectConfigList, db =>
+                {
+                    db.Aop.OnLogExecuting = (sql, pars) => { };
+                });
+
+                return Db;
+            });
+        }
+    }
+}

SlnMesnac.Generate/GenerateCode.cs

@@ -0,0 +1,113 @@
+using SlnMesnac.Generate.Templates.Service;
+using SlnMesnac.Generate.Templates.Service.Impl;
+using SqlSugar;
+using System;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Generate
+* 唯一标识：78595105-fab6-40f0-97b4-1272dc3e0e86
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-04-11 13:35:01
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Generate
+{
+    /// <summary>
+    /// 生成代码
+    /// </summary>
+    public class GenerateCode
+    {
+        private readonly ISqlSugarClient _sqlSugarClient;
+
+        public GenerateCode(ISqlSugarClient sqlSugarClient)
+        {
+            _sqlSugarClient = sqlSugarClient;
+        }
+
+        public bool CreateCode(string configId,string tableName,string savePath,string nameSpace)
+        {
+            if (string.IsNullOrEmpty(configId))
+            {
+                throw new ArgumentNullException($"代码生成异常:configId参数为空");
+            }
+
+            if (string.IsNullOrEmpty(tableName))
+            {
+                throw new ArgumentNullException($"代码生成异常:表格名称参数为空");
+            }
+
+            if (string.IsNullOrEmpty(savePath))
+            {
+                throw new ArgumentNullException($"代码生成异常:文件存储路径参数为空");
+            }
+
+            if (string.IsNullOrEmpty(nameSpace))
+            {
+                throw new ArgumentNullException($"代码生成异常:命名空间参数为空");
+            }
+
+            try
+            {
+                savePath += $"\\{tableName}";
+
+                var scope = _sqlSugarClient.AsTenant().GetConnectionScope(configId);
+
+                scope.DbFirst.IsCreateAttribute()
+                    .FormatPropertyName(it=> ToCamelCase(it)).Where(p => p == tableName).CreateClassFile($"{savePath}\\Entity", nameSpace);
+
+                var isc = new IServiceCreate();
+                bool iscRes = isc.Create(tableName, nameSpace, savePath);
+                if (!iscRes)
+                {
+                    throw new InvalidOperationException($"Service接口生成失败");
+                }
+
+                var sc = new ServiceCreate();
+                var scRes = sc.Create(tableName, nameSpace, savePath);
+
+                if (!scRes)
+                {
+                    throw new InvalidOperationException($"Service实现类生成失败");
+                }
+
+                return true;
+            }catch (Exception ex)
+            {
+                throw new InvalidOperationException($"代码生成异常:{ex.Message}");
+            }
+        }
+
+        private static string ToCamelCase(string input)
+        {
+            // 将字符串转换为驼峰格式，但保持每个单词的首字母大写
+            string[] words = input.Split('_');
+            for (int i = 0; i < words.Length; i++)
+            {
+                if (i > 0)
+                {
+                    words[i] = char.ToUpper(words[i][0]) + words[i].Substring(1).ToLower();
+                }
+                else
+                {
+                    words[i] = words[i].ToLower();
+                }
+            }
+            return string.Join("", words);
+        }
+    }
+}

SlnMesnac.Generate/SlnMesnac.Generate.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NVelocity" Version="1.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SlnMesnac.Repository\SlnMesnac.Repository.csproj" />
+  </ItemGroup>
+
+</Project>

SlnMesnac.Generate/Templates/Service/IServiceCreate.cs

@@ -0,0 +1,78 @@
+using Commons.Collections;
+using NVelocity.App;
+using NVelocity.Runtime;
+using NVelocity;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Generate.Templates
+* 唯一标识：4dbafd45-d689-4d1a-b54d-b936dae7d17c
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-04-11 13:28:04
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Generate.Templates.Service
+{
+    public class IServiceCreate
+    {
+        private static readonly string templateDir = @"F:\桌面\SlnMesnac\SlnMesnac.Generate\Templates\Service";
+
+        public bool Create(string tableName, string NameSpace, string outdir)
+        {
+
+            try
+            {
+                VelocityEngine velocityEngine = new VelocityEngine();
+                ExtendedProperties props = new ExtendedProperties();
+                props.AddProperty(RuntimeConstants.RESOURCE_LOADER, @"file");
+                props.AddProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, templateDir);
+                props.AddProperty(RuntimeConstants.INPUT_ENCODING, "utf-8");
+                props.AddProperty(RuntimeConstants.OUTPUT_ENCODING, "utf-8");
+                //模板的缓存设置
+                props.AddProperty(RuntimeConstants.FILE_RESOURCE_LOADER_CACHE, true);              //是否缓存
+                props.AddProperty("file.resource.loader.modificationCheckInterval", (Int64)30);    //缓存时间(秒)
+                velocityEngine.Init(props);
+                //为模板变量赋值
+                VelocityContext context = new VelocityContext();
+                context.Put("tableName", tableName);
+                context.Put("NameSpace", NameSpace);
+                context.Put("outdir", outdir);
+                //从文件中读取模板
+                Template template = velocityEngine.GetTemplate(@"\IServices.vm");
+                if (!Directory.Exists(outdir + "\\IServices"))
+                {
+                    Directory.CreateDirectory(outdir + "\\IServices");
+                }
+                //合并模板
+                using (StreamWriter writer = new StreamWriter(outdir + $"\\IServices\\I{tableName.Substring(0, 1).ToUpper()}{tableName.Substring(1)}Service.cs", false))
+                {
+                    template.Merge(context, writer);
+                }
+                return true;
+            }catch(Exception ex)
+            {
+                throw new InvalidOperationException($"Service接口模板创建异常:{ex.Message}");
+            }
+        }
+
+        
+    }
+}

SlnMesnac.Generate/Templates/Service/IServices.vm

@@ -0,0 +1,13 @@
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.@base;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ${NameSpace}.service
+{
+    public interface I${tableName}Services: IBaseService<${tableName}>
+    {
+
+    }
+}

SlnMesnac.Generate/Templates/Service/Impl/ServiceCreate.cs

@@ -0,0 +1,75 @@
+using Commons.Collections;
+using NVelocity.App;
+using NVelocity.Runtime;
+using NVelocity;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Generate.Templates
+* 唯一标识：4acc596a-6223-4156-b16c-952c225eff25
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-04-11 13:27:33
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Generate.Templates.Service.Impl
+{
+    public class ServiceCreate
+    {
+        private static readonly string templateDir = @"F:\桌面\SlnMesnac\SlnMesnac.Generate\Templates\Service\Impl\";
+
+        public bool Create(string tableName, string NameSpace, string outdir)
+        {
+            try
+            {
+                VelocityEngine velocityEngine = new VelocityEngine();
+                ExtendedProperties props = new ExtendedProperties();
+                props.AddProperty(RuntimeConstants.RESOURCE_LOADER, @"file");
+                props.AddProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, templateDir);
+                props.AddProperty(RuntimeConstants.INPUT_ENCODING, "utf-8");
+                props.AddProperty(RuntimeConstants.OUTPUT_ENCODING, "utf-8");
+                //模板的缓存设置
+                props.AddProperty(RuntimeConstants.FILE_RESOURCE_LOADER_CACHE, true);              //是否缓存
+                props.AddProperty("file.resource.loader.modificationCheckInterval", (Int64)30);    //缓存时间(秒)
+                velocityEngine.Init(props);
+                //为模板变量赋值
+                VelocityContext context = new VelocityContext();
+                context.Put("tableName", tableName);
+                context.Put("NameSpace", NameSpace);
+                context.Put("outdir", outdir);
+                //从文件中读取模板
+                Template template = velocityEngine.GetTemplate(@"\Services.vm");
+                if (!Directory.Exists(outdir + "\\Services"))
+                {
+                    Directory.CreateDirectory(outdir + "\\Services");
+                }
+                //合并模板
+                using (StreamWriter writer = new StreamWriter(outdir + $"\\Services\\{tableName.Substring(0, 1).ToUpper()}{tableName.Substring(1)}ServiceImpl.cs", false))
+                {
+                    template.Merge(context, writer);
+                }
+                return true;
+            }catch(Exception ex)
+            {
+                throw new InvalidOperationException($"Service实现类模板创建异常:{ex.Message}");
+            }
+        }
+    }
+}

SlnMesnac.Generate/Templates/Service/Impl/Services.vm

@@ -0,0 +1,14 @@
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.@base;
+using System;
+using System.Collections.Generic;
+
+namespace ${NameSpace}.service.Impl
+{
+    public class ${tableName}ServiceImpl : BaseServiceImpl<${tableName}>, I${tableName}Service
+    {
+        public ${tableName}ServiceImpl(Repository<${tableName}> repository):base(repository)
+        {
+        }
+    }
+}

SlnMesnac.Model/SlnMesnac.Model.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.134" />
+  </ItemGroup>
+
+</Project>

SlnMesnac.Model/domain/BaseMaterialInfo.cs

@@ -0,0 +1,309 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Xml.Linq;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Model.domain
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Model.domain
+{
+
+
+    [SugarTable("BasMaterial"), TenantAttribute("mes")]
+    [DataContract(Name = "BasMaterial 物料信息")]
+    #pragma warning disable CS8618 // Non-nullable field 'Data' must contain a non-null value when exiting constructor. Consider declaring the field as nullable.
+    public class BaseMaterialInfo
+    {
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "ObjID", IsPrimaryKey = true)]
+        public int ObjID { get; set; }
+        /// <summary>
+        /// 大类+小类+规格+胶代码或最后4顺序号    
+        ///</summary>
+        [SugarColumn(ColumnName = "MaterialCode")]
+        public string MaterialCode { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "MajorTypeID")]
+        public int? MajorTypeID { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "MinorTypeID")]
+        public string MinorTypeID { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: ('')
+        ///</summary>
+        [SugarColumn(ColumnName = "RubCode")]
+        public string RubCode { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "MaterialName")]
+        public string MaterialName { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "MaterialOtherName")]
+        public string MaterialOtherName { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "MaterialSimpleName")]
+        public string MaterialSimpleName { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "ProductMaterialCode")]
+        public string ProductMaterialCode { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "MaterialLevel")]
+        public string MaterialLevel { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "MaterialGroup")]
+        public string MaterialGroup { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "UserCode")]
+        public string UserCode { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "PlanPrice")]
+        public decimal? PlanPrice { get; set; }
+        /// <summary>
+        /// 具体到县级市，长度为6，国外的只具体国家 
+        ///</summary>
+        [SugarColumn(ColumnName = "ProductArea")]
+        public string ProductArea { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "MinStock")]
+        public decimal? MinStock { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "MaxStock")]
+        public decimal? MaxStock { get; set; }
+        /// <summary>
+        /// 千克，克，块，桶，升 
+        ///</summary>
+        [SugarColumn(ColumnName = "UnitID")]
+        public int? UnitID { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "StaticUnitID")]
+        public int? StaticUnitID { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "StaticUnitCoefficient")]
+        public decimal? StaticUnitCoefficient { get; set; }
+        /// <summary>
+        /// 显为百分比    
+        ///</summary>
+        [SugarColumn(ColumnName = "CheckPermitError")]
+        public decimal? CheckPermitError { get; set; }
+        /// <summary>
+        /// 按小时计算 
+        ///</summary>
+        [SugarColumn(ColumnName = "MaxParkTime")]
+        public decimal? MaxParkTime { get; set; }
+        /// <summary>
+        /// 小时计算 
+        ///</summary>
+        [SugarColumn(ColumnName = "MinParkTime")]
+        public decimal? MinParkTime { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: (getdate())
+        ///</summary>
+        [SugarColumn(ColumnName = "DefineDate")]
+        public DateTime? DefineDate { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "StandardCode")]
+        public string StandardCode { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: ((1))
+        ///</summary>
+        [SugarColumn(ColumnName = "StaticClass")]
+        public int? StaticClass { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: ((0))
+        ///</summary>
+        [SugarColumn(ColumnName = "IsEqualMaterial")]
+        public string IsEqualMaterial { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: ((0))
+        ///</summary>
+        [SugarColumn(ColumnName = "IsPutJar")]
+        public string IsPutJar { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: ((1))
+        ///</summary>
+        [SugarColumn(ColumnName = "IsQualityRateCount")]
+        public string IsQualityRateCount { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "ERPCode")]
+        public string ERPCode { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "Remark")]
+        public string Remark { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "DeleteFlag")]
+        public string DeleteFlag { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: ((0))
+        ///</summary>
+        [SugarColumn(ColumnName = "ValidDate")]
+        public decimal ValidDate { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: ((0))
+        ///</summary>
+        [SugarColumn(ColumnName = "ValidDateB")]
+        public decimal ValidDateB { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "SAPMaterialCode")]
+        public string SAPMaterialCode { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "SAPMaterialShortCode")]
+        public string SAPMaterialShortCode { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "ERPCode_Bak")]
+        public string ErpcodeBak { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "OperSourceTemp")]
+        public string OperSourceTemp { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "IsQualityrateCountBak")]
+        public int? IsQualityrateCountBak { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "CMaterialLevel")]
+        public string CMaterialLevel { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "CMaterialGroup")]
+        public string CMaterialGroup { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "XBStock")]
+        public decimal? XBStock { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "HFCode")]
+        public string HFCode { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "HFCode2")]
+        public string HFCode2 { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "UNITName")]
+        public string UNITName { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "KFACSTATUS")]
+        public string Kfacstatus { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "Ordertype")]
+        public string Ordertype { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "CreateDate")]
+        public string CreateDate { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "UpdateDate")]
+        public string UpdateDate { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "UnAudit")]
+        public string UnAudit { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "ChkStand")]
+        public string ChkStand { get; set; }
+        /// <summary>
+        /// 1 KG 2 PC 3 标准KG 
+        /// 默认值: ((1))
+        ///</summary>
+        [SugarColumn(ColumnName = "SapUpUnit")]
+        public int? SapUpUnit { get; set; }
+        /// <summary>
+        /// 是否为轨道事业部物料：0：不是，1：是 
+        ///</summary>
+        [SugarColumn(ColumnName = "IsGDMaterial")]
+        public int? IsGDMaterial { get; set; }
+    }
+}

SlnMesnac.Model/domain/BaseUser.cs

@@ -0,0 +1,131 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Security.Principal;
+using System.Text;
+using System.Xml.Linq;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Model.domain
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Model.domain
+{
+    /// <summary>
+    /// 系统基础资料-人员基础资料   yuany
+    ///</summary>
+    [SugarTable("BasUser"), TenantAttribute("mes")]
+    [DataContract(Name = "BaseUser 人员基础资料")]
+    #pragma warning disable CS8618 // Non-nullable field 'Data' must contain a non-null value when exiting constructor. Consider declaring the field as nullable.
+    public class BaseUser
+    {
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "ObjID", IsPrimaryKey = true, IsIdentity = true)]
+        public int ObjID { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "UserName")]
+        public string UserName { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "UserPWD")]
+        public string UserPWD { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "RealName")]
+        public string RealName { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: ((1))
+        ///</summary>
+        [SugarColumn(ColumnName = "Sex")]
+        public int? Sex { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "Telephone")]
+        public string Telephone { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "WorkBarcode")]
+        public string WorkBarcode { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "DeptCode")]
+        public string DeptCode { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "WorkID")]
+        public int? WorkID { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "ShiftID")]
+        public int? ShiftID { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "WorkShopID")]
+        public int? WorkShopID { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "HRCode")]
+        public string HRCode { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "ERPCode")]
+        public string ERPCode { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: ((0))
+        ///</summary>
+        [SugarColumn(ColumnName = "DeleteFlag")]
+        public string DeleteFlag { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "Remark")]
+        public string Remark { get; set; }
+        /// <summary>
+        ///  
+        /// 默认值: ((1))
+        ///</summary>
+        [SugarColumn(ColumnName = "IsEmployee")]
+        public string IsEmployee { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "RecordTime")]
+        public DateTime? RecordTime { get; set; }
+    }
+}
+

SlnMesnac.Model/dto/TagInfo.cs

@@ -0,0 +1,40 @@
+using System;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Model.dto
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Model.dto
+{
+    #pragma warning disable CS8618 // Non-nullable field 'Data' must contain a non-null value when exiting constructor. Consider declaring the field as nullable.
+    public class TagInfo
+    {
+        public byte[] PC = new byte[2];
+        public int Count { get; set; }
+        public int RSSI{ get; set; }
+        public int Antana{ get; set; }
+        public byte[] EPC{ get; set; }
+        public byte[] Data{ get; set; }
+        public string PCstring = (string) null;
+        public string EPCstring = (string) null;
+        public DateTime Time{ get; set; }
+    }
+}

SlnMesnac.Mqtt/MqttClient.cs

@@ -0,0 +1,169 @@
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using System.Threading;
+using MQTTnet.Client;
+using System.Security.Authentication;
+using MQTTnet;
+using Microsoft.Extensions.Logging;
+using SlnMesnac.Serilog;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Mqtt
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Mqtt
+{
+    /// <summary>
+    /// MQTT客户端
+    /// </summary>
+    public class MqttClient
+    {
+        public readonly SerilogHelper _logger;
+
+        private IMqttClient _client;
+
+        public MqttClient(SerilogHelper logger)
+        {
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// 链接服务器
+        /// </summary>
+        /// <param name="ip"></param>
+        /// <param name="port"></param>
+        /// <param name="clientId"></param>
+        /// <param name="username"></param>
+        /// <param name="password"></param>
+        public async void Connect(string ip, int port, string clientId, string username, string password)
+        {
+            try
+            {
+                MqttClientOptions options = new MqttClientOptionsBuilder()
+                .WithTcpServer(ip, port)
+                .WithClientId(clientId)
+                .WithCredentials(username, password)
+                .WithTls(o =>   //开启ssl
+                {
+                    o.CertificateValidationHandler = _ => true;
+
+                    o.SslProtocol = SslProtocols.Tls12;
+                })
+                .Build();
+                _client = new MqttFactory().CreateMqttClient();
+
+                _client.ApplicationMessageReceivedAsync += MqttClient_ApplicationMessageReceived;
+
+                MqttClientConnectResult result = await _client.ConnectAsync(options);
+
+                if (result != null)
+                {
+                    if (result.ResultCode == MQTTnet.Client.MqttClientConnectResultCode.Success)
+                    {
+                        _logger.Info($"连接服务器成功{ip}:{port}");
+                    }
+                    else
+                    {
+                        _logger.Info($"连接服务器失败");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.Error("连接服务器异常",ex);
+            }
+        }
+
+        /// <summary>
+        /// 断开链接
+        /// </summary>
+        public void DisConnect()
+        {
+            _client.DisconnectAsync();
+            _logger.Info($"断开连接");
+        }
+
+        /// <summary>
+        /// 订阅主题
+        /// </summary>
+        /// <param name="topic"></param>
+        public async void SubscriptionAsync(string topic)
+        {
+            try
+            {
+                var mqttFactory = new MqttFactory();
+                var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder()
+                    .WithTopicFilter(
+                        f =>
+                        {
+                            f.WithTopic(topic);
+                        })
+                    .Build();
+
+                MqttClientSubscribeResult result = await _client.SubscribeAsync(mqttSubscribeOptions, CancellationToken.None);
+
+                _logger.Info($"订阅主题:{topic}");
+            }
+            catch (Exception ex)
+            {
+                _logger.Error("订阅主题异常",ex);
+            }
+        }
+
+        /// <summary>
+        /// 取消订阅
+        /// </summary>
+        /// <param name="topic"></param>
+        public void Unsubscribe(string topic)
+        {
+            _client.UnsubscribeAsync(topic);
+            _logger.Info($"取消订阅，主题：{topic}");
+        }
+
+        /// <summary>
+        /// 推送消息
+        /// </summary>
+        /// <param name="topic"></param>
+        /// <param name="message"></param>
+        public void Publish(string topic, string message)
+        {
+            try
+            {
+                var msg = new MqttApplicationMessageBuilder().WithTopic(topic).WithPayload(message)
+                .Build();
+                _client.PublishAsync(msg, CancellationToken.None);
+                _logger.Info($"向服务端推送成功，主题：{topic}；内容：{message}");
+            }
+            catch (Exception ex)
+            {
+                _logger.Error("向服务端推送消息异常",ex);
+            }
+        }
+
+        private async Task MqttClient_ApplicationMessageReceived(MqttApplicationMessageReceivedEventArgs eventArgs)
+        {
+            var info = $"接收到主题：{eventArgs.ApplicationMessage.Topic}的消息，内容：{Encoding.UTF8.GetString(eventArgs.ApplicationMessage.Payload)}";
+            _logger.Info(info);
+        }
+
+    }
+}

SlnMesnac.Mqtt/SlnMesnac.Mqtt.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="MQTTnet" Version="4.3.3.952" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SlnMesnac.Serilog\SlnMesnac.Serilog.csproj" />
+  </ItemGroup>
+
+</Project>

SlnMesnac.Plc/Factory/InovanceFactory.cs

@@ -0,0 +1,346 @@
+using System;
+using HslCommunication;
+using HslCommunication.Profinet.Inovance;
+using SlnMesnac.Common;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Plc.Factory
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Plc.Factory
+{
+    public class InovanceFactory:PlcAbsractFactory
+    {
+        private StringChange _stringChange;
+
+        private InovanceTcpNet inovanceTcp = null;
+
+        public InovanceFactory(StringChange stringChange)
+        {
+            _stringChange = stringChange;
+
+            this.inovanceTcp = new InovanceTcpNet();
+            this.inovanceTcp.ConnectTimeOut = 2000;
+        }
+        
+        public override bool IsConnected { get; set; }
+
+        /// <summary>
+        /// 建立连接
+        /// </summary>
+        /// <param name="ip"></param>
+        /// <param name="port"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentException"></exception>
+        public override bool Connect(string ip, int port)
+        {
+            try
+            {
+                inovanceTcp?.ConnectClose();
+                if (inovanceTcp != null)
+                {
+                    inovanceTcp.IpAddress = ip;
+                    inovanceTcp.Port = port;
+                    inovanceTcp.DataFormat = HslCommunication.Core.DataFormat.CDAB;
+
+                    OperateResult connect = inovanceTcp.ConnectServer();
+                    this.IsConnected = connect.IsSuccess;
+                    if (!connect.IsSuccess)
+                    {
+                        throw new InvalidOperationException($"汇川PLC连接失败:{connect.Message}");
+                    }
+
+                    return connect.IsSuccess;
+                }
+                else
+                {
+                    throw new ArgumentException($"汇川PLC实例inovanceTcp为null");
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"汇川PLC连接异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 断开连接
+        /// </summary>
+        /// <returns></returns>
+        /// <exception cref="ArgumentException"></exception>
+        public override bool DisConnect()
+        {
+            try
+            {
+                OperateResult disConnect = inovanceTcp.ConnectClose();
+                this.IsConnected = false;
+                if (!disConnect.IsSuccess)
+                {
+                    throw new InvalidOperationException($"汇川PLC断开连接失败:{disConnect.Message}");
+                }
+                return disConnect.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"汇川PLC断开连接异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据地址读取指定长度数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="len"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override byte[] readValueByAddress(string address, int len)
+        {
+            try
+            {
+                OperateResult<byte[]> read = inovanceTcp.Read(address, (ushort)(len));
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取指定长度数据失败：{read.Message}");
+                }
+                return _stringChange.ConvertFloatToINt(read.Content);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取指定长度数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据地址读取int16数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override int readInt16ByAddress(string address)
+        {
+            try
+            {
+                OperateResult<short> read = inovanceTcp.ReadInt16(address);
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取int16数据失败：{read.Content}");
+                }
+                return read.Content;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取int16数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据地址写入int16数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeInt16ByAddress(string address, int value)
+        {
+            try
+            {
+                OperateResult operateResult = new OperateResult();
+                int s = 0;
+                string[] strArry = address.Split('.');
+
+                //先读取整个块的内容
+                var info = inovanceTcp.ReadInt16(strArry[0]);
+                if (info.Content == 0)
+                {
+                    int length = _stringChange.ParseToInt(strArry[1]) + 1;
+                    string[] array = new string[length];
+                    for (int i = 0; i < length; i++)
+                    {
+                        if (i == _stringChange.ParseToInt(strArry[1]))
+                        {
+                            array[i] = value.ToString();
+                        }
+                        else
+                        {
+                            array[i] = "0";
+                        }
+                    }
+                    //反转
+                    Array.Reverse(array);
+                    byte[] buffer = new byte[array.Length];
+                    string result = "";
+                    for (int i = 0; i < array.Length; i++)
+                    {
+                        result += (byte)Convert.ToInt32(array[i], 16);
+                    }
+                    s = Convert.ToInt32(result.Trim(), 2);
+                    operateResult = inovanceTcp.Write(strArry[0], (ushort)s);
+                }
+                else
+                {
+                    var inf2 = Convert.ToString(info.Content, 2);
+                    string[] infoArray = new string[inf2.Length];
+                    for (int i = 0; i < inf2.Length; i++)
+                    {
+                        infoArray[i] = inf2.Substring(i, 1);
+                    }
+                    Array.Reverse(infoArray);
+                    infoArray[_stringChange.ParseToInt(strArry[1])] = value.ToString();
+                    string result = "";
+                    foreach (var item in infoArray)
+                    {
+                        result = result + item;
+                    }
+                    s = Convert.ToInt32(result.Trim(), 10);
+                    operateResult = inovanceTcp.Write(strArry[0], s);
+                }
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入int16数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入int16数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址读取string类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="length"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override string readStringByAddress(string address, ushort length)
+        {
+            try
+            {
+                OperateResult<String> read = inovanceTcp.ReadString(address, length);
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取string数据失败：{read.Content}");
+                }
+                return read.Content;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取string数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址写入String类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeStringByAddress(string address, string value)
+        {
+            try
+            {
+                OperateResult operateResult = inovanceTcp.Write(address, value);
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入string数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入string数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址读取Bool类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool readBoolByAddress(string address)
+        {
+            try
+            {
+                OperateResult<bool> read = inovanceTcp.ReadBool(address);
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取bool数据失败：{read.Content}");
+                }
+                return read.Content;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取bool数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址写入Bool类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeBoolByAddress(string address, bool value)
+        {
+            try
+            {
+                OperateResult operateResult = inovanceTcp.Write(address, short.Parse(_stringChange.ParseToInt(value ? "1" : "0").ToString()));
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入bool数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入bool数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址写入Double类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeDoubleByAddress(string address, int value)
+        {
+            try
+            {
+                OperateResult operateResult = inovanceTcp.Write(address, Convert.ToDouble(value));
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入double数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入double数据异常：{ex.Message}");
+            }
+        }
+    }
+}

SlnMesnac.Plc/Factory/MelsecBinaryFactory.cs

@@ -0,0 +1,287 @@
+using System;
+using HslCommunication;
+using HslCommunication.Profinet.Melsec;
+using SlnMesnac.Common;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Plc.Factory
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Plc.Factory
+{
+    public class MelsecBinaryFactory:PlcAbsractFactory
+    {
+        private StringChange _stringChange;
+
+        private MelsecMcNet melsec_net = null;
+
+        public MelsecBinaryFactory(StringChange stringChange)
+        {
+            _stringChange = stringChange;
+
+            this.melsec_net = new MelsecMcNet();
+            this.melsec_net.ConnectTimeOut = 2000;
+        }
+        
+        public override bool IsConnected { get; set; }
+
+        /// <summary>
+        /// 建立连接
+        /// </summary>
+        /// <param name="iP"></param>
+        /// <param name="port"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool Connect(string iP, int port)
+        {
+            try
+            {
+                melsec_net.IpAddress = iP;
+                melsec_net.Port = port;
+                OperateResult connect = melsec_net.ConnectServer();
+                this.IsConnected = connect.IsSuccess;
+                if (!connect.IsSuccess)
+                {
+                    throw new InvalidOperationException($"三菱PLC连接失败:{connect.Message}");
+                }
+
+                return connect.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"三菱PLC连接异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 断开连接
+        /// </summary>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool DisConnect()
+        {
+            try
+            {
+                OperateResult disConnect = melsec_net.ConnectClose();
+                this.IsConnected = false;
+                if (!disConnect.IsSuccess)
+                {
+                    throw new InvalidOperationException($"三菱PLC断开连接失败:{disConnect.Message}");
+                }
+                return disConnect.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"三菱PLC断开连接异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据地址读取指定长度数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="len"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override byte[] readValueByAddress(string address, int len)
+        {
+            try
+            {
+                OperateResult<byte[]> read = melsec_net.Read(address, (ushort)(len));
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取指定长度数据失败：{read.Message}");
+                }
+                return _stringChange.ConvertFloatToINt(read.Content);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取指定长度数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据地址读取int16数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override int readInt16ByAddress(string address)
+        {
+            try
+            {
+                OperateResult<short> read = melsec_net.ReadInt16(address);
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取int16数据失败：{read.Content}");
+                }
+                return read.Content;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取int16数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据地址写入int16数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeInt16ByAddress(string address, int value)
+        {
+            try
+            {
+                OperateResult operateResult = melsec_net.Write(address, Convert.ToInt16(value));
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入int16数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入int16数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址读取string类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="length"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override string readStringByAddress(string address, ushort length)
+        {
+            try
+            {
+                OperateResult<String> read = melsec_net.ReadString(address, length);
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取string数据失败：{read.Content}");
+                }
+                return read.Content;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取string数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址写入String类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeStringByAddress(string address, string value)
+        {
+            try
+            {
+                OperateResult operateResult = melsec_net.Write(address, value);
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入string数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入string数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址读取Bool类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool readBoolByAddress(string address)
+        {
+            try
+            {
+                OperateResult<bool> read = melsec_net.ReadBool(address);
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取bool数据失败：{read.Content}");
+                }
+                return read.Content;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取bool数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址写入Bool类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeBoolByAddress(string address, bool value)
+        {
+            try
+            {
+                OperateResult operateResult = melsec_net.Write(address, short.Parse(_stringChange.ParseToInt(value ? "1" : "0").ToString()));
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入bool数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入bool数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址写入Double类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeDoubleByAddress(string address, int value)
+        {
+            try
+            {
+                OperateResult operateResult = melsec_net.Write(address, Convert.ToDouble(value));
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入double数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入double数据异常：{ex.Message}");
+            }
+        }
+    }
+}

SlnMesnac.Plc/Factory/OmronNJFactory.cs

@@ -0,0 +1,290 @@
+using System;
+using HslCommunication;
+using HslCommunication.Profinet.Omron;
+using SlnMesnac.Common;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Plc.Factory
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Plc.Factory
+{
+    public class OmronNJFactory:PlcAbsractFactory
+    {
+        private StringChange _stringChange;
+
+        private OmronFinsNet omronFinsNet = null;
+
+        public OmronNJFactory(StringChange stringChange)
+        {
+            _stringChange = stringChange;
+
+            this.omronFinsNet = new OmronFinsNet();
+            this.omronFinsNet.ConnectTimeOut = 2000;
+        }
+        
+        public override bool IsConnected { get; set; }
+
+        /// <summary>
+        /// 建立连接
+        /// </summary>
+        /// <param name="iP"></param>
+        /// <param name="port"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool Connect(string iP, int port)
+        {
+            try
+            {
+                omronFinsNet.IpAddress = iP;
+                omronFinsNet.Port = 9600;
+                omronFinsNet.SA1 = (byte)192;
+                omronFinsNet.DA1 = (byte)239;
+                omronFinsNet.DA2 = (byte)0;
+                OperateResult connect = omronFinsNet.ConnectServer();
+                this.IsConnected = connect.IsSuccess;
+                if (!connect.IsSuccess)
+                {
+                    throw new InvalidOperationException($"欧姆龙PLC连接失败:{connect.Message}");
+                }
+
+                return connect.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"欧姆龙PLC连接异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 断开连接
+        /// </summary>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool DisConnect()
+        {
+            try
+            {
+                OperateResult disConnect = omronFinsNet.ConnectClose();
+                this.IsConnected = false;
+                if (!disConnect.IsSuccess)
+                {
+                    throw new InvalidOperationException($"欧姆龙PLC断开连接失败:{disConnect.Message}");
+                }
+                return disConnect.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"欧姆龙PLC断开连接异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据地址读取指定长度数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="len"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override byte[] readValueByAddress(string address, int len)
+        {
+            try
+            {
+                OperateResult<byte[]> read = omronFinsNet.Read(address, (ushort)(len));
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取指定长度数据失败：{read.Message}");
+                }
+                return _stringChange.ConvertFloatToINt(read.Content);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取指定长度数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据地址读取int16数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override int readInt16ByAddress(string address)
+        {
+            try
+            {
+                OperateResult<short> read = omronFinsNet.ReadInt16(address);
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取int16数据失败：{read.Content}");
+                }
+                return read.Content;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取int16数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据地址写入int16数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeInt16ByAddress(string address, int value)
+        {
+            try
+            {
+                OperateResult operateResult = omronFinsNet.Write(address, Convert.ToInt16(value));
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入int16数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入int16数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址读取string类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="length"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override string readStringByAddress(string address, ushort length)
+        {
+            try
+            {
+                OperateResult<String> read = omronFinsNet.ReadString(address, length);
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取string数据失败：{read.Content}");
+                }
+                return read.Content;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取string数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址写入String类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeStringByAddress(string address, string value)
+        {
+            try
+            {
+                OperateResult operateResult = omronFinsNet.Write(address, value);
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入string数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入string数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址读取Bool类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool readBoolByAddress(string address)
+        {
+            try
+            {
+                OperateResult<bool> read = omronFinsNet.ReadBool(address);
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取bool数据失败：{read.Content}");
+                }
+                return read.Content;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取bool数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址写入Bool类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeBoolByAddress(string address, bool value)
+        {
+            try
+            {
+                OperateResult operateResult = omronFinsNet.Write(address, short.Parse(_stringChange.ParseToInt(value ? "1" : "0").ToString()));
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入bool数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入bool数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址写入Double类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeDoubleByAddress(string address, int value)
+        {
+            try
+            {
+                OperateResult operateResult = omronFinsNet.Write(address, Convert.ToDouble(value));
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入double数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入double数据异常：{ex.Message}");
+            }
+        }
+    }
+}

SlnMesnac.Plc/Factory/SiemensFactory.cs

@@ -0,0 +1,287 @@
+using System;
+using HslCommunication;
+using HslCommunication.Profinet.Siemens;
+using SlnMesnac.Common;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Plc.Factory
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Plc.Factory
+{
+    public class SiemensFactory:PlcAbsractFactory
+    {
+        
+        private StringChange _stringChange;
+
+        private const SiemensPLCS type = SiemensPLCS.S200Smart;
+
+        private SiemensS7Net s7 = new SiemensS7Net(type);
+
+        public SiemensFactory(StringChange stringChange)
+        {
+            _stringChange = stringChange;
+        }
+        
+        public override bool IsConnected { get; set; }
+
+        /// <summary>
+        /// 建立连接
+        /// </summary>
+        /// <param name="iP"></param>
+        /// <param name="port"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool Connect(string iP, int port)
+        {
+            try
+            {
+                s7.IpAddress = iP;
+                s7.Port = 102;
+                OperateResult connect = s7.ConnectServer();
+                this.IsConnected = connect.IsSuccess;
+                if (!connect.IsSuccess)
+                {
+                    throw new InvalidOperationException($"西门子S系列PLC连接失败:{connect.Message}");
+                }
+
+                return connect.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"西门子S系列PLC连接异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 断开连接
+        /// </summary>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool DisConnect()
+        {
+            try
+            {
+                OperateResult disConnect = s7.ConnectClose();
+                this.IsConnected = false;
+                if (!disConnect.IsSuccess)
+                {
+                    throw new InvalidOperationException($"西门子S系列PLC断开连接失败:{disConnect.Message}");
+                }
+                return disConnect.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"西门子S系列PLC断开连接异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据地址读取指定长度数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="len"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override byte[] readValueByAddress(string address, int len)
+        {
+            try
+            {
+                OperateResult<byte[]> read = s7.Read(address, (ushort)(len));
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取指定长度数据失败：{read.Message}");
+                }
+                return _stringChange.ConvertFloatToINt(read.Content);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取指定长度数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据地址读取int16数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override int readInt16ByAddress(string address)
+        {
+            try
+            {
+                OperateResult<short> read = s7.ReadInt16(address);
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取int16数据失败：{read.Content}");
+                }
+                return read.Content;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取int16数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据地址写入int16数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeInt16ByAddress(string address, int value)
+        {
+            try
+            {
+                OperateResult operateResult = s7.Write(address, Convert.ToInt16(value));
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入int16数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入int16数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址读取string类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="length"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override string readStringByAddress(string address, ushort length)
+        {
+            try
+            {
+                OperateResult<String> read = s7.ReadString(address, length);
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取string数据失败：{read.Content}");
+                }
+                return read.Content;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取string数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址写入String类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeStringByAddress(string address, string value)
+        {
+            try
+            {
+                OperateResult operateResult = s7.Write(address, value);
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入string数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入string数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址读取Bool类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool readBoolByAddress(string address)
+        {
+            try
+            {
+                OperateResult<bool> read = s7.ReadBool(address);
+                if (!read.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};读取bool数据失败：{read.Content}");
+                }
+                return read.Content;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};读取bool数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址写入Bool类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeBoolByAddress(string address, bool value)
+        {
+            try
+            {
+                OperateResult operateResult = s7.Write(address, short.Parse(_stringChange.ParseToInt(value ? "1" : "0").ToString()));
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入bool数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入bool数据异常：{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 通过PLC地址写入Double类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool writeDoubleByAddress(string address, int value)
+        {
+            try
+            {
+                OperateResult operateResult = s7.Write(address, Convert.ToDouble(value));
+                if (!operateResult.IsSuccess)
+                {
+                    throw new InvalidOperationException($"根据地址:{address};写入double数据失败：{operateResult.Message}");
+                }
+                return operateResult.IsSuccess;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据地址:{address};写入double数据异常：{ex.Message}");
+            }
+        }
+    }
+}

SlnMesnac.Plc/PlcAbsractFactory.cs

@@ -0,0 +1,109 @@
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Plc
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Plc
+{
+    public abstract class PlcAbsractFactory
+    {
+
+        public string ConfigKey { get;set; }
+
+        /// <summary>
+        /// 是否连接
+        /// </summary>
+        public abstract bool IsConnected { get; set; }
+        
+        /// <summary>
+        /// 建立连接
+        /// </summary>
+        /// <param name="ip"></param>
+        /// <param name="port"></param>
+        /// <returns></returns>
+        public abstract bool Connect(string ip, int port);
+        
+        /// <summary>
+        /// 断开连接
+        /// </summary>
+        /// <returns></returns>
+        public abstract bool DisConnect();
+        
+        /// <summary>
+        /// 根据地址读取指定长度数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="len"></param>
+        /// <returns></returns>
+        public abstract byte[] readValueByAddress(string address,int len);
+        
+        /// <summary>
+        /// 通过PLC地址读取int16类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <returns></returns>
+        public abstract int readInt16ByAddress(string address);
+        
+        /// <summary>
+        /// 通过PLC地址写入int16类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public abstract bool writeInt16ByAddress(string address,int value);
+        
+        /// <summary>
+        /// 通过PLC地址读取string类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <returns></returns>
+        public abstract string readStringByAddress(string address, ushort length);
+
+        /// <summary>
+        /// 通过PLC地址写入String类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="SFC"></param>
+        /// <returns></returns>
+        public abstract bool writeStringByAddress(string address, string value);
+
+        /// <summary>
+        /// 通过PLC地址读取Bool类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <returns></returns>
+        public abstract bool readBoolByAddress(string address);
+
+        /// <summary>
+        /// 通过PLC地址写入Bool类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <returns></returns>
+        public abstract bool writeBoolByAddress(string address, bool value);
+
+        /// <summary>
+        /// 通过PLC地址写入Double类型数据
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public abstract bool writeDoubleByAddress(string address, int value);
+    }
+}

SlnMesnac.Plc/SlnMesnac.Plc.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="HslCommunication" Version="11.8.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SlnMesnac.Common\SlnMesnac.Common.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Config\SlnMesnac.Config.csproj" />
+  </ItemGroup>
+
+</Project>

SlnMesnac.Quartz/Job/Job2.cs

@@ -0,0 +1,48 @@
+using Microsoft.Extensions.Logging;
+using Quartz;
+using SlnMesnac.Serilog;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Quartz.Job
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Quartz.Job
+{
+    internal class Job2 : IJob
+    {
+        private readonly SerilogHelper _logger;
+
+        public Job2(SerilogHelper logger)
+        {
+            _logger = logger;
+        }
+
+        public Task Execute(IJobExecutionContext context)
+        {
+            _logger.Info($"执行Job2：{DateTime.Now.ToString("HH:mm:ss")}");
+            return Task.CompletedTask;
+        }
+    }
+}

SlnMesnac.Quartz/Job/MyJob.cs

@@ -0,0 +1,48 @@
+using Microsoft.Extensions.Logging;
+using Quartz;
+using SlnMesnac.Serilog;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Quartz.Job
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Quartz.Job
+{
+    public class MyJob : IJob
+    {
+        private readonly SerilogHelper _logger;
+
+        public MyJob(SerilogHelper logger)
+        {
+            _logger = logger;
+        }
+
+        public Task Execute(IJobExecutionContext context)
+        {
+            _logger.Info($"执行MyJob：{DateTime.Now.ToString("HH:mm:ss")}");
+            return Task.CompletedTask;
+        }
+    }
+}

SlnMesnac.Quartz/QuartzSetUp.cs

@@ -0,0 +1,54 @@
+using Microsoft.Extensions.DependencyInjection;
+using Quartz;
+using SlnMesnac.Quartz.Job;
+using System;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Quartz
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Quartz
+{
+    public static class QuartzSetUp
+    {
+        [Obsolete]
+        public static void AddQuartzSetUp(this IServiceCollection services)
+        {
+            services.AddQuartz(q =>
+            {
+                q.UseMicrosoftDependencyInjectionJobFactory();
+
+                q.ScheduleJob<MyJob>(trigger =>
+                    trigger.WithCronSchedule("*/3 * * * * ?").WithIdentity("MyJob", "MyJobGroup") // 示例：每3s执行一次
+                );
+
+                q.ScheduleJob<Job2>(trigger =>
+                    trigger.WithCronSchedule("*/5 * * * * ?").WithIdentity("Job2", "Job2Group") // 示例：每5s执行一次
+                );
+            });
+
+            services.AddQuartzHostedService(options => options.WaitForJobsToComplete = true);
+
+            services.AddSingleton<IScheduler>(provider => provider.GetRequiredService<ISchedulerFactory>().GetScheduler().Result);
+
+        }
+    }
+}

SlnMesnac.Quartz/SlnMesnac.Quartz.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Quartz.AspNetCore" Version="3.8.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SlnMesnac.Serilog\SlnMesnac.Serilog.csproj" />
+  </ItemGroup>
+
+</Project>

SlnMesnac.Redis/RedisHandler.cs

@@ -0,0 +1,93 @@
+using Microsoft.Extensions.Logging;
+using SlnMesnac.Config;
+using SlnMesnac.Serilog;
+using StackExchange.Redis;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Redis
+* 唯一标识：00418016-53c9-4f87-a13f-daa19d656bba
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-04-12 15:15:25
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Redis
+{
+    public class RedisHandler
+    {
+        private SerilogHelper _logger;
+
+        private readonly AppConfig _appConfig;
+
+        private readonly ISubscriber _subscriber;
+
+        private readonly ConnectionMultiplexer redis;
+
+        public RedisHandler(AppConfig appConfig, SerilogHelper logger)
+        {
+            _appConfig = appConfig;
+
+            redis = ConnectionMultiplexer.Connect(_appConfig.redisConfig);
+            _subscriber = redis.GetSubscriber();
+            _logger = logger;
+        }
+
+
+
+        /// <summary>
+        /// 推送消息
+        /// </summary>
+        /// <param name="channel"></param>
+        /// <param name="message"></param>
+        public void PublishMessage(string channel, string message)
+        {
+            long res = _subscriber.Publish(channel, message);
+
+            _logger.Info($"向主题:{channel};推送消息:{message};结果:{res}");
+        }
+
+        /// <summary>
+        /// 订阅消息
+        /// </summary>
+        /// <param name="channel"></param>
+        /// <param name="onMessageReceived"></param>
+        public void SubscribeToChannel(string channel, Action<string, string> onMessageReceived)
+        {
+            _subscriber.Subscribe(channel, (ch, message) =>
+            {
+                onMessageReceived(ch, message);
+                _logger.Info($"订阅主题:{channel};收到主题:{ch};推送的消息:{message}");
+            });
+        }
+
+        public void CleanExpiredMessages(string channel)
+        {
+            var redis = _subscriber.Multiplexer.GetDatabase();
+            redis.KeyDelete(channel);
+        }
+
+        public void SetValue(string key, string message)
+        {
+            IDatabase db = redis.GetDatabase(0);
+            TimeSpan expiry = TimeSpan.FromSeconds(10);
+            db.StringSet(key, message, expiry);
+        }
+    }
+}

SlnMesnac.Redis/SlnMesnac.Redis.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="StackExchange.Redis" Version="2.7.33" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SlnMesnac.Config\SlnMesnac.Config.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Serilog\SlnMesnac.Serilog.csproj" />
+  </ItemGroup>
+
+</Project>

SlnMesnac.Repository/Repository.cs

@@ -0,0 +1,42 @@
+using SqlSugar;
+using System;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Repository
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Repository
+{
+    public class Repository<T> : SimpleClient<T> where T : class, new()
+    {
+        public ITenant itenant = null;//多租户事务、GetConnection、IsAnyConnection等功能
+
+        public Repository(ISqlSugarClient db)
+        {
+            itenant = db.AsTenant();//用来处理事务
+            base.Context = db.AsTenant().GetConnectionScopeWithAttr<T>();//获取子Db
+
+            //如果不想通过注入多个仓储
+            //用到ChangeRepository或者Db.GetMyRepository需要看标题4写法
+        }
+
+    }
+}

SlnMesnac.Repository/SlnMesnac.Repository.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SlnMesnac.Common\SlnMesnac.Common.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Config\SlnMesnac.Config.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Model\SlnMesnac.Model.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Serilog\SlnMesnac.Serilog.csproj" />
+  </ItemGroup>
+
+</Project>

SlnMesnac.Repository/service/IBaseMaterialService.cs

@@ -0,0 +1,62 @@
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.@base;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Repository.service
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Repository.service
+{
+    public interface IBaseMaterialService : IBaseService<BaseMaterialInfo>
+    {
+
+        /// <summary>
+        /// 获取所有的物料信息
+        /// </summary>
+        /// <returns></returns>
+        List<BaseMaterialInfo> GetMaterialInfos();
+
+        /// <summary>
+        /// 通过物料编码获取物料信息
+        /// </summary>
+        /// <param name="materialCode"></param>
+        /// <returns></returns>
+        BaseMaterialInfo GetMaterialInfoByMaterialCode(string materialCode);
+
+        /// <summary>
+        /// 通过SAP物料编码获取物料信息
+        /// </summary>
+        /// <param name="sapMaterialCode"></param>
+        /// <returns></returns>
+        BaseMaterialInfo GetMaterialInfoBySapMaterialCode(string sapMaterialCode);
+
+        /// <summary>
+        /// 通过物料类别获取物料信息
+        /// </summary>
+        /// <param name="majorTypeId">物料大类</param>
+        /// <param name="minorTypeId">物料细类</param>
+        /// <returns></returns>
+        List<BaseMaterialInfo> GetMaterialInfosByMaterialType(int majorTypeId, string minorTypeId);
+    }
+}

SlnMesnac.Repository/service/IBaseUserService.cs

@@ -0,0 +1,46 @@
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.@base;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Repository.service
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Repository.service
+{
+    public interface IBaseUserService:IBaseService<BaseUser>
+    {
+        /// <summary>
+        /// 获取用户信息
+        /// </summary>
+        /// <returns></returns>
+        List<BaseUser> GetUsers();
+
+        /// <summary>
+        /// 验证添加用户信息，有一个错误时进行回滚
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        bool InsertUsers(List<BaseUser> users);
+    }
+}

SlnMesnac.Repository/service/Impl/BaseMaterialServiceImpl.cs

@@ -0,0 +1,132 @@
+using Microsoft.Extensions.Logging;
+using SlnMesnac.Model.domain;
+using SlnMesnac.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text;
+using SlnMesnac.Repository.service.@base;
+using SlnMesnac.Serilog;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Repository.service.Impl
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Repository.service.Impl
+{
+    public class BaseMaterialServiceImpl : BaseServiceImpl<BaseMaterialInfo>, IBaseMaterialService
+    {
+        private SerilogHelper _logger;
+
+        public BaseMaterialServiceImpl(Repository<BaseMaterialInfo> repository, SerilogHelper logger) :base(repository)
+        {
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// 通过物料编码获取物料信息
+        /// </summary>
+        /// <param name="materialCode"></param>
+        /// <returns></returns>
+        public BaseMaterialInfo GetMaterialInfoByMaterialCode(string materialCode)
+        {
+            BaseMaterialInfo materialInfo = null;
+            try
+            {
+                materialInfo = base._rep.GetFirst(x => x.MaterialCode == materialCode);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error($"根据物料编号获取物料信息异常:{ex.Message}");
+            }
+            return materialInfo;
+        }
+
+        /// <summary>
+        /// 通过SAP物料编码获取物料信息
+        /// </summary>
+        /// <param name="sapMaterialCode"></param>
+        /// <returns></returns>
+        public BaseMaterialInfo GetMaterialInfoBySapMaterialCode(string sapMaterialCode)
+        {
+            BaseMaterialInfo materialInfo = null;
+            try
+            {
+                materialInfo = base._rep.GetFirst(x => x.SAPMaterialCode == sapMaterialCode);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error($"根据SAP物料编号获取物料信息异常:{ex.Message}");
+            }
+            return materialInfo;
+        }
+
+        /// <summary>
+        /// 获取所有的物料信息
+        /// </summary>
+        /// <returns></returns>
+        public List<BaseMaterialInfo> GetMaterialInfos()
+        {
+            List<BaseMaterialInfo> materialInfos = null;
+            try
+            {
+                materialInfos = base._rep.GetList();
+            }
+            catch (Exception ex)
+            {
+                _logger.Error($"获取物料信息异常:{ex.Message}");
+            }
+            return materialInfos;
+        }
+
+        /// <summary>
+        /// 通过物料类别获取物料信息
+        /// </summary>
+        /// <param name="majorTypeId">物料大类</param>
+        /// <param name="minorTypeId">物料细类</param>
+        /// <returns></returns>
+        public List<BaseMaterialInfo> GetMaterialInfosByMaterialType(int majorTypeId, string minorTypeId)
+        {
+            List<BaseMaterialInfo> materialInfos = null;
+            try
+            {
+                Expression<Func<BaseMaterialInfo, bool>> exp = x => true;
+
+                if (majorTypeId != 0)
+                {
+                    exp = exp.And(x => x.MajorTypeID == majorTypeId);
+                }
+                else if (!string.IsNullOrEmpty(minorTypeId))
+                {
+                    exp = exp.And(x => x.MinorTypeID == minorTypeId);
+                }
+
+                materialInfos = base._rep.GetList(exp);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error($"通过物料类型获取物料信息异常:{ex.Message}");
+            }
+            return materialInfos;
+        }
+    }
+}
+

SlnMesnac.Repository/service/Impl/BaseUserServiceImpl.cs

@@ -0,0 +1,76 @@
+using Microsoft.Extensions.Logging;
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.@base;
+using SlnMesnac.Serilog;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Repository.service.Impl
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Repository.service.Impl
+{
+    public class BaseUserServiceImpl : BaseServiceImpl<BaseUser>,IBaseUserService
+    {
+        private readonly SerilogHelper _logger;
+
+        public BaseUserServiceImpl(Repository<BaseUser> rep, SerilogHelper logger) :base(rep)
+        {
+            _logger = logger;
+        }
+
+
+        public List<BaseUser> GetUsers()
+        {
+            List<BaseUser> users = null;
+            try
+            {
+                users = base._rep.GetList();
+            }
+            catch (Exception ex)
+            {
+                _logger.Error($"获取用户信息异常{ex.Message}");
+            }
+            return users;
+        }
+
+        public bool InsertUsers(List<BaseUser> users)
+        {
+            bool result = false;
+            try
+            {
+                base._rep.AsTenant().BeginTran();
+
+                result = base._rep.InsertRange(users);
+
+                base._rep.AsTenant().CommitTran();
+            }
+            catch (Exception ex)
+            {
+                base._rep.AsTenant().RollbackTran();
+                _logger.Error($"用户信息添加异常:{ex.Message}");
+            }
+            return result;
+        }
+    }
+}

SlnMesnac.Repository/service/base/BaseServiceImpl.cs

@@ -0,0 +1,358 @@
+using Microsoft.Extensions.Logging;
+using SlnMesnac.Repository.service.@base;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Repository.service.Impl
+* 唯一标识：70cc8c3a-2c3b-4034-894b-f1a4f04aa21e
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-04-08 09:49:07
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Repository.service.@base
+{
+    public class BaseServiceImpl<T> : IBaseService<T> where T : class, new()
+    {
+        public readonly Repository<T> _rep;
+
+        public BaseServiceImpl(Repository<T> rep)
+        {
+            _rep = rep;
+        }
+
+        /// <summary>
+        /// 添加实体信息
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <exception cref="InvalidOperationException"></exception>
+        public bool Insert(T model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException($"添加实体信息异常:实体参数为空");
+            }
+
+            try
+            {
+                return _rep.Insert(model);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"添加实体信息异常:{ex.Message}");
+            }
+
+        }
+
+        /// <summary>
+        /// 批量添加实体集合
+        /// </summary>
+        /// <param name="lisT"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <exception cref="InvalidOperationException"></exception>
+        public bool Insert(List<T> lisT)
+        {
+            if (lisT == null)
+            {
+                throw new ArgumentNullException($"批量添加实体集合异常:实体集合参数为空");
+            }
+            try
+            {
+                _rep.AsTenant().BeginTran();
+                var info = _rep.InsertRange(lisT);
+                _rep.AsTenant().CommitTran();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _rep.AsTenant().RollbackTran();
+                throw new InvalidOperationException($"批量添加实体集合异常:{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据id 删除信息
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public bool DeleteById(object id)
+        {
+            if (id == null)
+            {
+                throw new ArgumentNullException($"根据id删除信息异常:Id参数为空");
+            }
+            try
+            {
+                return _rep.DeleteById(id);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据id删除信息异常:{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据实体删除信息
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <exception cref="InvalidOperationException"></exception>
+        public bool Delete(T model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException($"根据实体删除信息异常:实体参数为空");
+            }
+            try
+            {
+                return _rep.DeleteById(model);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据实体删除信息异常:{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据实体集合批量删除信息
+        /// </summary>
+        /// <param name="entitys"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public bool Deletes(List<T> entitys)
+        {
+            if (entitys == null)
+            {
+                throw new ArgumentNullException($"根据实体集合批量删除信息异常:实体集合参数为空");
+            }
+            try
+            {
+                return _rep.Delete(entitys);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据实体集合批量删除信息异常:{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据实体更新信息
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public bool Update(T model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException($"根据实体更新信息异常:实体参数为空");
+            }
+            try
+            {
+                return _rep.Update(model);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据实体更新信息异常:{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 批量更新实体集合信息
+        /// </summary>
+        /// <param name="entitys"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public bool Update(List<T> entitys)
+        {
+            if (entitys == null)
+            {
+                throw new ArgumentNullException($"批量更新实体集合信息异常:实体集合参数为空");
+            }
+
+            try
+            {
+                return _rep.UpdateRange(entitys);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"批量更新实体集合信息异常:{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据Where条件更新实体信息
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="strWhere"></param>
+        /// <returns></returns>
+        public bool Update(T entity, string strWhere)
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException($"根据Where条件更新实体信息异常:实体参数为空");
+            }
+
+            if (string.IsNullOrEmpty(strWhere))
+            {
+                throw new ArgumentNullException($"根据Where条件更新实体信息异常:Where参数为空");
+            }
+
+            try
+            {
+                return _rep.AsUpdateable(entity).Where(strWhere).ExecuteCommandHasChange();
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据Where条件更新实体信息异常:{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据实体更新指定列
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="lstColumns"></param>
+        /// <param name="lstIgnoreColumns"></param>
+        /// <param name="strWhere"></param>
+        /// <returns></returns>
+        public bool Update(T entity, List<string> lstColumns = null, List<string> lstIgnoreColumns = null, string strWhere = "")
+        {
+            try
+            {
+                IUpdateable<T> up = _rep.AsUpdateable(entity);
+                if (lstIgnoreColumns != null && lstIgnoreColumns.Count > 0)
+                {
+                    up = up.IgnoreColumns(lstIgnoreColumns.ToArray());
+                }
+                if (lstColumns != null && lstColumns.Count > 0)
+                {
+                    up = up.UpdateColumns(lstColumns.ToArray());
+                }
+                if (!string.IsNullOrEmpty(strWhere))
+                {
+                    up = up.Where(strWhere);
+                }
+                return up.ExecuteCommandHasChange();
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据实体更新指定列异常:{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 查询所有信息
+        /// </summary>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public List<T> Query()
+        {
+            try
+            {
+                return _rep.GetList();
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"查询所有信息异常:{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据Id查询实体
+        /// </summary>
+        /// <param name="objId"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public T Query(object objId)
+        {
+            if (objId == null)
+            {
+                throw new ArgumentNullException($"根据Id查询实体信息异常:Id参数为空");
+            }
+            try
+            {
+                return _rep.GetById(objId);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据Id查询实体信息异常:{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据表达式查询
+        /// </summary>
+        /// <param name="whereExpression"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public List<T> Query(Expression<Func<T, bool>> whereExpression)
+        {
+            if (whereExpression == null)
+            {
+                throw new ArgumentNullException($"根据表达式查询实体信息异常:表达式参数为空");
+            }
+            try
+            {
+                return _rep.GetList(whereExpression);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据表达式查询实体信息异常:{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 根据表达式排序查询
+        /// </summary>
+        /// <param name="whereExpression"></param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="isAsc"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public List<T> Query(Expression<Func<T, bool>> whereExpression, Expression<Func<T, object>> orderByExpression, bool isAsc = true)
+        {
+            if (whereExpression == null)
+            {
+                throw new ArgumentNullException($"根据表达式排序查询信息异常:条件表达式参数为空");
+            }
+
+            if (orderByExpression == null)
+            {
+                throw new ArgumentNullException($"根据表达式排序查询信息异常:排序表达式参数为空");
+            }
+
+            try
+            {
+                return _rep.AsQueryable().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToList();
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据表达式排序查询信息异常:{ex.Message}");
+            }
+        }
+    }
+}

SlnMesnac.Repository/service/base/IBaseService.cs

@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text;
+
+namespace SlnMesnac.Repository.service.@base
+{
+    public interface IBaseService<T> where T : class
+    {
+        /// <summary>
+        /// 添加实体信息
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        bool Insert(T model);
+
+        /// <summary>
+        /// 批量添加实体集合
+        /// </summary>
+        /// <param name="lisT"></param>
+        /// <returns></returns>
+        bool Insert(List<T> lisT);
+
+        /// <summary>
+        /// 根据id 删除信息
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        bool DeleteById(object id);
+
+        /// <summary>
+        /// 根据实体删除信息
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        bool Delete(T model);
+
+        /// <summary>
+        /// 根据实体集合批量删除信息
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        bool Deletes(List<T> entitys);
+
+        /// <summary>
+        /// 根据实体更新信息
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        bool Update(T model);
+
+        /// <summary>
+        /// 批量更新实体集合信息
+        /// </summary>
+        /// <param name="entitys"></param>
+        /// <returns></returns>
+        bool Update(List<T> entitys);
+
+        /// <summary>
+        /// 根据Where条件更新实体信息
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="strWhere"></param>
+        /// <returns></returns>
+        bool Update(T entity, string strWhere);
+
+        /// <summary>
+        /// 根据实体更新指定列
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="lstColumns"></param>
+        /// <param name="lstIgnoreColumns"></param>
+        /// <param name="strWhere"></param>
+        /// <returns></returns>
+        bool Update(T entity, List<string> lstColumns = null, List<string> lstIgnoreColumns = null, string strWhere = "");
+
+        /// <summary>
+        /// 查询所有信息
+        /// </summary>
+        /// <returns></returns>
+        List<T> Query();
+
+        /// <summary>
+        /// 根据Id查询实体
+        /// </summary>
+        /// <param name="objId"></param>
+        /// <returns></returns>
+        T Query(object objId);
+
+        /// <summary>
+        /// 根据表达式查询
+        /// </summary>
+        /// <param name="whereExpression"></param>
+        /// <returns></returns>
+        List<T> Query(Expression<Func<T, bool>> whereExpression);
+
+        /// <summary>
+        /// 根据表达式排序查询
+        /// </summary>
+        /// <param name="whereExpression">查询条件</param>
+        /// <param name="orderByExpression">排序条件</param>
+        /// <param name="isAsc">是否正序</param>
+        /// <returns></returns>
+        List<T> Query(Expression<Func<T, bool>> whereExpression, Expression<Func<T, object>> orderByExpression, bool isAsc = true);
+    }
+}

SlnMesnac.Rfid/Dto/MessagePack.cs

@@ -0,0 +1,31 @@
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Rfid.Dto
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Rfid.Dto
+{
+    public class MessagePack
+    {
+        //public byte m_beginChar1 = 0xBB;   //开始包
+        public byte[] m_pData = null; //发送数据
+        //public byte m_EndChar1 = 0x0D;   //结束包
+    }
+}

SlnMesnac.Rfid/Enum/RecvState.cs

@@ -0,0 +1,43 @@
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Rfid.Enum
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Rfid.Enum
+{
+    public enum RecvState
+    {
+        //RFly-I160 返回数据 BB DD 00 01 40 41 0D
+        WaitingBeginChar1_State = 1,         //等待接收帧同步字符1 0xBB
+        WaitingBeginChar2_State = 2,         //等待接收帧同步字符2 0xDD
+        WaitingForBarcodeLength_State = 3,  //等待条码长度不固定
+        WaitingForCode_State = 4,           //等待指令编号Code 0x02
+        WaitingForStus_State = 5,           //等待接受状态码 0x00
+        WaitingForTagCount_State = 6,           //等待接受标签组数不固定
+        WaitingForCount_State = 7,          //等待接收第一组标签读取次数 0x01
+        WaitingForRSSI_State = 8,           //等待接收读取信号强度 0xCB
+        WaitingForAnt_State = 9,           //等待接收天线端口 0x01
+        WaitingForPC1_State = 10,           //等待接收EPC区域 0x00
+        WaitingForPC2_State = 11,           //等待接收EPC区域 0x00
+        WaitingForData_State = 12,          //等待接收数据字符
+        WaitingForXor_State = 13,           //等待比对校验位
+        WaitingForEndChar_State = 14,        //等待接收尾字符	0x0D
+    }
+}

SlnMesnac.Rfid/Factory/RflyFactory.cs

@@ -0,0 +1,484 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using SlnMesnac.Common;
+using SlnMesnac.Model.dto;
+using SlnMesnac.Rfid.Dto;
+using SlnMesnac.Rfid.Enum;
+using SlnMesnac.Serilog;
+using TouchSocket.Core;
+using TouchSocket.Sockets;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Rfid.Factory
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Rfid.Factory
+{
+    public class RflyFactory:RfidAbsractFactory
+    {
+        private SerilogHelper _logger;
+        private readonly TcpClient _tcpClient = new TcpClient();
+        private readonly StringChange _stringChange;
+
+        public RflyFactory(SerilogHelper logger,StringChange stringChange)
+        {
+            _logger = logger;
+            _stringChange = stringChange;
+        }
+        
+        /// <summary>
+        /// 建立连接
+        /// </summary>
+        /// <param name="ip"></param>
+        /// <param name="port"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override bool Connect(string ip, int port)
+        {
+            try
+            {
+                _tcpClient.Setup(new TouchSocketConfig().SetRemoteIPHost($"{ip}:{port}"));
+                _tcpClient.Connect();
+                return true;
+            }
+            catch (Exception e)
+            {
+                throw new InvalidOperationException($"设备连接异常：{e.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 按时间段盘点
+        /// </summary>
+        /// <param name="timeout"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public override List<TagInfo> TimePeriodRead(int timeout = 5000)
+        {
+            byte[] u16byte = new byte[2];
+            byte[] bCRC = new byte[4];
+            try
+            {
+                #region 指令封装
+                MessagePack pMessagePack = new MessagePack();
+                pMessagePack.m_pData = new byte[8];
+                pMessagePack.m_pData[0] = 0xAA;
+                pMessagePack.m_pData[1] = 0x55;
+                pMessagePack.m_pData[2] = 0x02;
+                pMessagePack.m_pData[3] = 0x02;
+                u16byte = BitConverter.GetBytes(timeout);  //超时时间
+                u16byte = _stringChange.Swap16Bytes(u16byte);  //协议里为大端在前
+                Array.Copy(u16byte, 0, pMessagePack.m_pData, 4, 2);
+                Array.Copy(pMessagePack.m_pData, 2, bCRC, 0, 4);
+                pMessagePack.m_pData[6] = _stringChange.CalculateVerify(bCRC, bCRC.Length);
+                pMessagePack.m_pData[7] = 0x0D;
+                #endregion
+
+                var waitClient = _tcpClient.CreateWaitingClient(new WaitingOptions()
+                {
+                    FilterFunc = response =>
+                    {
+                        return true;
+                    }
+                });
+                
+                byte[] reciveBuffer = waitClient.SendThenReturn(pMessagePack.m_pData, timeout);
+                
+                _logger.Info($"接收原始报文：{_stringChange.bytesToHexStr(reciveBuffer,reciveBuffer.Length)}");
+                
+                byte[] resultBuffer = PareReceiveBufferData(reciveBuffer,reciveBuffer.Length);
+                
+                List<TagInfo> tagInfoList = Device_DealTagInfoList(resultBuffer);
+                
+                return tagInfoList;
+            }
+            catch (Exception e)
+            {
+                throw new InvalidOperationException($"按时间段盘点异常：{e.Message}");
+            }
+        }
+
+        #region 标签解析
+
+        /// <summary>
+        /// 状态机函数
+        /// </summary>
+        /// <param name="buffer"></param>
+        /// <param name="iLen"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        private byte[] PareReceiveBufferData(byte[] buffer, int iLen)
+        {
+            RecvState enumRecvState = RecvState.WaitingBeginChar1_State;
+            int m_iPosition = 0;
+            UInt16 m_iFullMessageLength = 0;
+            int iBarcodeLength = 0;//条码长度
+            ArrayList m_FrecvData = new ArrayList();
+            byte m_iVerify = 0;
+            try
+            {
+                var bufferStr = _stringChange.bytesToHexStr(buffer, iLen);
+                byte[] m_szFullMessage = new byte[iLen];
+                for (int i = 0; i < iLen; i++)
+                {
+                    switch (enumRecvState)
+                    {
+                        case RecvState.WaitingBeginChar1_State:         //开始接受数据帧1 0xBB
+                            Array.Clear(m_szFullMessage, 0, iLen);//清空为0
+                            if (buffer[i] == 0xBB)
+                            {
+                                m_szFullMessage[m_iPosition] = buffer[i];
+                                m_iPosition++;
+                                enumRecvState = RecvState.WaitingBeginChar2_State;
+                            }
+                            else
+                            {
+                                m_iFullMessageLength = 0;
+                                m_iPosition = 0;
+                                enumRecvState = RecvState.WaitingBeginChar1_State;
+                            }
+                            break;
+                        case RecvState.WaitingBeginChar2_State:             //开始接受数据帧1 0xDD
+                            if (buffer[i] == 0xDD)
+                            {
+                                m_szFullMessage[m_iPosition] = buffer[i];
+                                m_iPosition++;
+                                enumRecvState = RecvState.WaitingForBarcodeLength_State;
+                            }
+                            else
+                            {
+                                m_iFullMessageLength = 0;
+                                m_iPosition = 0;
+                                enumRecvState = RecvState.WaitingBeginChar1_State;
+                            }
+                            break;
+                        case RecvState.WaitingForBarcodeLength_State:         //开始接受数据长度(TagCount - EPC)                        
+                            m_szFullMessage[m_iPosition] = buffer[i];
+                            iBarcodeLength = buffer[i];                      //单组标签：18；两组标签：35
+                            m_iPosition++;
+                            enumRecvState = RecvState.WaitingForCode_State;
+                            break;
+
+                        case RecvState.WaitingForCode_State:                //开始接受指令编号
+                            if (buffer[i] == 0x02)
+                            {
+                                m_szFullMessage[m_iPosition] = buffer[i];
+                                m_iPosition++;
+                                enumRecvState = RecvState.WaitingForStus_State;
+                            }
+                            else if (buffer[i] == 0x90)          // 如果是心跳BB DD 01 90 00 1F 8E 0D 
+                            {
+                                m_szFullMessage[m_iPosition] = buffer[i];
+                                m_iPosition++;
+                                enumRecvState = RecvState.WaitingForEndChar_State;
+                            }
+                            else if (buffer[i] == 0xBF)          // 如果是心跳BB DD 04 BF 00 00 00 F9 0B 49 0D
+                            {
+                                m_szFullMessage[m_iPosition] = buffer[i];
+                                m_iPosition++;
+                                enumRecvState = RecvState.WaitingForEndChar_State;
+                            }
+                            else
+                            {
+                                m_iFullMessageLength = 0;
+                                m_iPosition = 0;
+                                enumRecvState = RecvState.WaitingBeginChar1_State;
+                            }
+                            break;
+                        case RecvState.WaitingForStus_State:        //开始接受状态码
+                            if (buffer[i] == 0x00)
+                            {
+                                m_szFullMessage[m_iPosition] = buffer[i];
+                                m_iPosition++;
+                                enumRecvState = RecvState.WaitingForTagCount_State;
+                            }
+                            else if (buffer[i] == 0x40)
+                            {
+                                m_szFullMessage[m_iPosition] = buffer[i];
+                                //LogService.Instance.Debug("RFU620等待接受WaitingForEndChar_State:Noread");
+                                lock (m_FrecvData)
+                                {
+                                    m_FrecvData.Add(m_szFullMessage);
+                                }
+                                m_iPosition = 0;
+                                i = iLen;
+                                enumRecvState = RecvState.WaitingBeginChar1_State;
+                                //LogService.Instance.Debug("RFly-I160状态机结束。");
+                            }
+                            break;
+                        case RecvState.WaitingForTagCount_State:         //开始接受标签组数                        
+                            Array.Copy(buffer, i, m_szFullMessage, m_iPosition, iBarcodeLength);//m_iPosition = 5
+                            byte[] tempData = new byte[iBarcodeLength];
+                            Array.Clear(tempData, 0, iBarcodeLength);
+                            Array.Copy(buffer, i, tempData, 0, iBarcodeLength);
+                            m_iPosition = m_iPosition + iBarcodeLength;     //m_iPosition = 39
+                            i = i + iBarcodeLength - 1;                         //i = 39
+                            enumRecvState = RecvState.WaitingForXor_State;
+                            break;
+                        case RecvState.WaitingForXor_State:         //开始比对校验位 Rfly160 
+                            byte[] m_CRCVerify = new byte[1024];     //此数组用于校验位计算
+                            Array.Clear(m_CRCVerify, 0, m_CRCVerify.Length);
+                            Array.Copy(m_szFullMessage, 2, m_CRCVerify, 0, iBarcodeLength + 3); //校验位计算是从Length - EPC 结束
+                            m_szFullMessage[m_iPosition] = buffer[i];
+                            m_iVerify = m_szFullMessage[m_iPosition];
+                            if (m_iVerify == _stringChange.CalculateVerify(m_CRCVerify, m_CRCVerify.Length))
+                            {
+                                m_iPosition++;
+                                enumRecvState = RecvState.WaitingForEndChar_State;
+                            }
+                            else	   //如果校验不成功
+                            {
+                                m_iFullMessageLength = 0;
+                                m_iPosition = 0;
+                                enumRecvState = RecvState.WaitingBeginChar1_State;
+                            }
+                            break;
+                        case RecvState.WaitingForEndChar_State:
+                            if (buffer[0] == 0xBB && buffer[1] == 0xDD && buffer[2] == 0x00 && buffer[3] != 0x90) //此处为Noread数据显示
+                            {
+                                m_szFullMessage[0] = 0xBB;
+                                m_szFullMessage[1] = 0xDD;
+                                m_szFullMessage[2] = 0x00;
+                                lock (m_FrecvData)
+                                {
+                                    m_FrecvData.Add(m_szFullMessage);
+                                }
+                                m_iPosition = 0;
+                                i = iLen;
+                                enumRecvState = RecvState.WaitingBeginChar1_State;
+                            }
+                            else if (buffer[0] == 0xBB && buffer[1] == 0xDD && buffer[2] == 0x04 && buffer[3] == 0xBF)
+                            {
+                                Array.Copy(buffer, 0, m_szFullMessage, 0, 11);
+                                i = 11;
+                                lock (m_FrecvData)
+                                {
+                                    m_FrecvData.Add(m_szFullMessage);
+                                }
+                                i = iLen;
+                            }
+                            else if (buffer[i] == 0x00)         //获取温度
+                            {
+                                Array.Copy(buffer, 0, m_szFullMessage, 0, 8);
+                                i = 8;
+                                lock (m_FrecvData)
+                                {
+                                    m_FrecvData.Add(m_szFullMessage);
+                                }
+                                i = iLen;
+                            }
+                            else if (buffer[i] == 0x11)
+                            {
+                                Array.Copy(buffer, 0, m_szFullMessage, 0, 7);
+                                i = 7;
+                                lock (m_FrecvData)
+                                {
+                                    m_FrecvData.Add(m_szFullMessage);
+                                }
+                            }
+                            else if (buffer[i] == 0x01)
+                            {
+                                Array.Copy(buffer, 0, m_szFullMessage, 0, 8);
+                                i = 8;
+                                lock (m_FrecvData)
+                                {
+                                    m_FrecvData.Add(m_szFullMessage);
+                                }
+                            }
+                            else
+                            {
+                                m_szFullMessage[m_iPosition] = buffer[i];
+                                m_iPosition++;
+                                if (buffer[i] == 0x0D)
+                                {
+                                    lock (m_FrecvData)
+                                    {
+                                        m_FrecvData.Add(m_szFullMessage);
+                                    }
+                                }
+                            }
+                            m_iPosition = 0;
+                            enumRecvState = RecvState.WaitingBeginChar1_State;
+                            break;
+                    }
+                }
+
+                return m_szFullMessage;
+            }
+            catch (Exception e)
+            {
+                throw new InvalidOperationException($"状态机逻辑处理异常：{e.Message}");
+            }
+        }
+        
+        private Mutex mutauto = new Mutex();
+        /// <summary>
+        /// 解析函数
+        /// </summary>
+        /// <param name="AutoDealReportData"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public List<TagInfo> Device_DealTagInfoList(byte[] AutoDealReportData)
+        {
+            List<TagInfo> tagInfoList = new List<TagInfo>();
+            byte[] bResultEPC_Data = new byte[14];
+            byte[] m_AutoReadEPC = null;
+            int m_readEPCDataLen = 0;
+            try
+            {
+                mutauto.WaitOne();
+                int iFirstCountPos = 6;     //第一次读取标签次数位置
+                int iFirstRSSIPos = 7;      //第一次读取标签强度位置
+                int iFirstAnt = 8;
+                int iFirstPC = 9;   //第一次读取标签天线位置
+                int iFirstLeftBarcketPos = 11;//EPC数据起始位置
+                UInt16 tempDataCount = 0;
+                int tempDataRSSI = 0;
+                UInt16 tempDataANT = 0;
+                int iBarcodeGroupCount = Convert.ToInt32(AutoDealReportData[5].ToString()); //标签组数
+                int iBarcodeLength = 16;        //标签长度
+                int iCommonSecondFlag = 0;
+                for (int j = 0; j < iBarcodeGroupCount; j++)
+                {
+                    TagInfo tag = new TagInfo();
+                    byte[] tempPCByte = new byte[2];     //取出PC
+                    Array.Clear(tempPCByte, 0, 2);
+                    Array.Copy(AutoDealReportData, iFirstPC, tempPCByte, 0, 2);
+
+                    int pc = Convert.ToInt32(tempPCByte[0].ToString("X"));
+                    int epcLength = EPCLengthByPC(pc);
+                    iBarcodeLength = epcLength;
+
+                    byte[] tempDataByte = new byte[epcLength];
+                    Array.Clear(tempDataByte, 0, iBarcodeLength);
+                    Array.Copy(AutoDealReportData, iFirstLeftBarcketPos, tempDataByte, 0, iBarcodeLength);
+
+                    byte[] tempCountByte = new byte[1];     //取出标签次数
+                    Array.Clear(tempCountByte, 0, 1);
+                    Array.Copy(AutoDealReportData, iFirstCountPos, tempCountByte, 0, 1);
+                    tempDataCount = tempCountByte[0];
+
+                    byte[] tempRSSIByte = new byte[1];     //取出标签强度
+                    Array.Clear(tempRSSIByte, 0, 1);
+                    Array.Copy(AutoDealReportData, iFirstRSSIPos, tempRSSIByte, 0, 1);
+
+                    tempDataRSSI = _stringChange.HexStringToNegative(_stringChange.bytesToHexStr(tempRSSIByte, 1));
+
+                    #region add by wenjy 20220829 取出天线号
+                    byte[] tempAntByte = new byte[1];     //取出天线号
+                    Array.Clear(tempAntByte, 0, 1);
+                    Array.Copy(AutoDealReportData, iFirstAnt, tempAntByte, 0, 1);
+                    tempDataANT = tempAntByte[0];
+                    #endregion
+
+                    tag.Count = tempDataCount;
+                    tag.RSSI = tempDataRSSI;
+                    tag.EPC = tempDataByte;
+
+                    if (pc == 24)
+                    {
+                        tag.EPCstring = _stringChange.bytesToHexStr(tempDataByte, tempDataByte.Length).Substring(0, 7);
+                    }
+                    else
+                    {
+                        tag.EPCstring = Encoding.ASCII.GetString(tempDataByte);
+                    }
+
+                    tag.PC = tempPCByte;
+                    tag.Antana = tempDataANT;
+                    tagInfoList.Add(tag);
+                    int iBarcodeListLen = tagInfoList.Count; //特别注意，必须这样，要不然会多一条数据
+
+                    iFirstCountPos = iFirstCountPos + iBarcodeLength + 5; //次数
+                    iFirstRSSIPos = iFirstCountPos + 1; //强度
+                    iFirstAnt = iFirstRSSIPos + 1; //天线
+                    iFirstPC = iFirstAnt + 1;
+                    iFirstLeftBarcketPos = iFirstLeftBarcketPos + iBarcodeLength + 5;
+
+                    _logger.Info("----函数调用:Device_DealTagInfoList 第[" + (iCommonSecondFlag + 1) + "]次数据解析为：" + tag.EPCstring + ",读取标签次数：[" + tempDataCount + "],标签信号强度：[" + tempDataRSSI + "],天线号：[" + tempDataANT + "]");
+                    iCommonSecondFlag++;
+                    if (iCommonSecondFlag == iBarcodeGroupCount)
+                    {
+                        mutauto.ReleaseMutex();
+                        _logger.Info("《《《返回标签数据！");
+                        return tagInfoList;
+                    }
+                }
+                return tagInfoList;
+            }
+            catch (Exception ex)
+            {
+                mutauto.ReleaseMutex();
+                throw new InvalidOperationException($"Device_AutoDealContent 自动处理函数异常:{ex.Message}");
+            }
+        }
+        
+        /// <summary>
+        /// 根据PC获取EPC长度
+        /// </summary>
+        /// <param name="pcValue"></param>
+        /// <returns></returns>
+        private int EPCLengthByPC(int pcValue)
+        {
+            int epcLength = 0;
+            if (pcValue >= 10 && pcValue < 20)
+            {
+                epcLength = 4;
+            }
+            else if (pcValue >= 20 && pcValue < 30)
+            {
+                epcLength = 8;
+            }
+            else if (pcValue >= 30 && pcValue < 40)
+            {
+                epcLength = 12;
+            }
+            else if (pcValue >= 40 && pcValue < 50)
+            {
+                epcLength = 16;
+            }
+            else if (pcValue >= 50 && pcValue < 60)
+            {
+                epcLength = 20;
+            }
+            else if (pcValue >= 60 && pcValue < 70)
+            {
+                epcLength = 24;
+            }
+            else if (pcValue >= 70 && pcValue < 80)
+            {
+                epcLength = 28;
+            }
+            else if (pcValue >= 80 && pcValue < 90)
+            {
+                epcLength = 30;
+            }
+            return epcLength;
+        }
+
+        #endregion
+    }
+}

SlnMesnac.Rfid/RfidAbsractFactory.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using SlnMesnac.Model.dto;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Rfid
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Rfid
+{
+    /// <summary>
+    /// RFID抽象工厂
+    /// </summary>
+    public abstract class RfidAbsractFactory
+    {
+
+        public string ConfigKey { get; set; }
+
+        /// <summary>
+        /// 建立连接
+        /// </summary>
+        /// <param name="ip"></param>
+        /// <param name="port"></param>
+        /// <returns></returns>
+        public abstract bool Connect(string ip, int port);
+
+        /// <summary>
+        /// 按时间段盘点
+        /// </summary>
+        /// <param name="timeout"></param>
+        /// <returns></returns>
+        public abstract List<TagInfo> TimePeriodRead(int timeout = 5000);
+    }
+}

SlnMesnac.Rfid/SlnMesnac.Rfid.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.1</TargetFramework>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\SlnMesnac.Common\SlnMesnac.Common.csproj" />
+      <ProjectReference Include="..\SlnMesnac.Model\SlnMesnac.Model.csproj" />
+      <ProjectReference Include="..\SlnMesnac.TouchSocket\SlnMesnac.TouchSocket.csproj" />
+    </ItemGroup>
+
+</Project>

SlnMesnac.Serilog/SerilogExtensions.cs

@@ -0,0 +1,69 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+using Serilog.Events;
+using SlnMesnac.Config;
+using System;
+using System.IO;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Serilog
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Serilog
+{
+    /// <summary>
+    /// Serilog
+    /// </summary>
+    public static class SerilogExtensions
+    {
+        public static void UseSerilogExtensions(this IServiceProvider service)
+        {
+            #region 通过配置文件读取日志存放位置
+            var appConfig = service.GetService<AppConfig>();
+            var logPath = $"{appConfig.logPath}/Logs/";
+
+            #endregion
+
+            //Log.Logger = new LoggerConfiguration().MinimumLevel.Information().WriteTo.Console()
+            //                .WriteTo.File(Path.Combine(logPath, "Info.log"), LogEventLevel.Information)
+            //                .WriteTo.File(Path.Combine(logPath, "Error.log"), LogEventLevel.Error)
+            //                .WriteTo.File(Path.Combine(logPath, "Warn.log"), LogEventLevel.Warning)
+            //                //.WriteTo.File(Path.Combine(logPath, "Debug.log"), LogEventLevel.Debug, fileSizeLimitBytes: 5 * 1024)
+            //                .CreateLogger();
+
+            Log.Logger = new LoggerConfiguration().MinimumLevel.Information().WriteTo.Console()
+            .WriteTo.Logger(lc => lc
+                .Filter.ByIncludingOnly(logEvent => logEvent.Properties.ContainsKey("Module") && logEvent.Properties["Module"].ToString().Contains("Info"))
+                .WriteTo.File(Path.Combine($"{logPath}/Info/", "Info.log"), rollingInterval: RollingInterval.Day))
+            .WriteTo.Logger(lc => lc
+                .Filter.ByIncludingOnly(logEvent => logEvent.Properties.ContainsKey("Module") && logEvent.Properties["Module"].ToString().Contains("Plc"))
+                .WriteTo.File(Path.Combine($"{logPath}/Plc/", "Plc.log"), rollingInterval: RollingInterval.Day))
+            .WriteTo.Logger(lc => lc
+                .Filter.ByIncludingOnly(logEvent => logEvent.Properties.ContainsKey("Module") && logEvent.Properties["Module"].ToString().Contains("Camera"))
+                .WriteTo.File(Path.Combine($"{logPath}/Camera/", "Camera.log"), rollingInterval: RollingInterval.Day))
+            .WriteTo.Logger(lc => lc
+                .Filter.ByIncludingOnly(logEvent => logEvent.Properties.ContainsKey("Module") && logEvent.Properties["Module"].ToString().Contains("Error"))
+                .WriteTo.File(Path.Combine($"{logPath}/Error/", "Error.log"), rollingInterval: RollingInterval.Day))
+            .CreateLogger();
+        }
+    }
+}

SlnMesnac.Serilog/SerilogHelper.cs

@@ -0,0 +1,108 @@
+using Serilog;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：T14-GEN3-7895
+* 命名空间：SlnMesnac.Serilog
+* 唯一标识：fae9d68d-1992-4a03-b299-19edd9fc786d
+*
+* 创建者：WenJY
+* 电子邮箱：
+* 创建时间：2024-12-26 8:46:21
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Serilog
+{
+    /// <summary>
+    /// Serilog日志类
+    /// </summary>
+    public class SerilogHelper
+    {
+        private readonly ILogger? Info_logger = Log.ForContext("Module", "Info");
+        private readonly ILogger? Plc_logger = Log.ForContext("Module", "Plc");
+        private readonly ILogger? Error_logger = Log.ForContext("Module", "Error");
+        private readonly ILogger? Camera_logger = Log.ForContext("Module", "Camera");
+
+        /// <summary>
+        /// Info日志
+        /// </summary>
+        /// <param name="msg"></param>
+        public void Info(string msg)
+        {
+            if (Info_logger != null)
+            {
+                this.Info_logger.Information(msg);
+            }
+        }
+
+        /// <summary>
+        /// Plc日志
+        /// </summary>
+        /// <param name="msg"></param>
+        public void Plc(string msg)
+        {
+            if (Plc_logger != null)
+            {
+                this.Plc_logger.Information(msg);
+            }
+        }
+
+        /// <summary>
+        /// 相机日志
+        /// </summary>
+        /// <param name="msg"></param>
+        public void Camera(string msg)
+        {
+            if (Camera_logger != null)
+            {
+                this.Camera_logger.Information(msg);
+            }
+        }
+
+        /// <summary>
+        /// Error日志
+        /// </summary>
+        /// <param name="msg"></param>
+        /// <param name="ex"></param>
+        public void Error(string msg, Exception ex = null)
+        {
+            if (!string.IsNullOrEmpty(msg) && ex == null)
+            {
+                this.Error_logger.Information("【附加信息】 : {0}<br>", new object[] { msg });
+            }
+            else if (!string.IsNullOrEmpty(msg) && ex != null)
+            {
+                string errorMsg = BeautyErrorMsg(ex);
+                this.Error_logger.Information("【附加信息】 : {0}<br>{1}", new object[] { msg, errorMsg });
+            }
+            else if (string.IsNullOrEmpty(msg) && ex != null)
+            {
+                string errorMsg = BeautyErrorMsg(ex);
+                this.Error_logger.Information(errorMsg);
+            }
+        }
+
+        private string BeautyErrorMsg(Exception ex)
+        {
+            string errorMsg = string.Format("【异常类型】：{0} <br>【异常信息】：{1} <br>【堆栈调用】：{2}", new object[] { ex.GetType().Name, ex.Message, ex.StackTrace });
+            errorMsg = errorMsg.Replace("\r\n", "<br>");
+            errorMsg = errorMsg.Replace("位置", "<strong style=\"color:red\">位置</strong>");
+            return errorMsg;
+        }
+
+    }
+}

SlnMesnac.Serilog/SlnMesnac.Serilog.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SlnMesnac.Config\SlnMesnac.Config.csproj" />
+  </ItemGroup>
+
+</Project>

SlnMesnac.TouchSocket/ApiServer.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using TouchSocket.Rpc;
+using TouchSocket.WebApi;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：T14-GEN3-7895
+* 命名空间：SlnMesnac.TouchSocket
+* 唯一标识：649766cc-308e-4bf3-8d69-dea48ec40642
+*
+* 创建者：WenJY
+* 电子邮箱：
+* 创建时间：2024-09-04 10:51:54
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.TouchSocket
+{
+    public class ApiServer: RpcServer
+    {
+
+        public delegate void RefreshScanInfoInCenterStart();
+        /// <summary>
+        /// 入库开始事件刷新
+        /// </summary>
+        public event RefreshScanInfoInCenterStart RefreshScanInfoInCenterStartEvent;
+
+        public delegate void RefreshScanInfoInCenterStop();
+        /// <summary>
+        /// 入库结束事件刷新
+        /// </summary>
+        public event RefreshScanInfoInCenterStop RefreshScanInfoInCenterStopEvent;
+
+        public delegate void RefreshScanInfoOutCenterStart();
+        /// <summary>
+        /// 出库开始事件刷新
+        /// </summary>
+        public event RefreshScanInfoOutCenterStart RefreshScanInfoOutCenterStartEvent;
+
+        public delegate void RefreshScanInfoOutCenterStop();
+        /// <summary>
+        /// 出库结束事件刷新
+        /// </summary>
+        public event RefreshScanInfoOutCenterStop RefreshScanInfoOutCenterStopEvent;
+
+        /// <summary>
+        /// 入库开始
+        /// </summary>
+        /// <param name="messageHeader"></param>
+        /// <returns></returns>
+        [EnableCors("cors")]
+        [WebApi(HttpMethodType.POST)]
+        public object getScanInfoInCenterStart(string messageHeader)
+        {
+            RefreshScanInfoInCenterStartEvent?.Invoke();
+            return true;
+        }
+
+        /// <summary>
+        /// 入库结束
+        /// </summary>
+        /// <param name="messageHeader"></param>
+        /// <returns></returns>
+        [EnableCors("cors")]
+        [WebApi(HttpMethodType.POST)]
+        public object getScanInfoInCenterStop(string messageHeader)
+        {
+            RefreshScanInfoInCenterStopEvent?.Invoke();
+            return true;
+        }
+
+        /// <summary>
+        /// 出库开始
+        /// </summary>
+        /// <param name="messageHeader"></param>
+        /// <returns></returns>
+        [WebApi(HttpMethodType.POST)]
+        public object getScanInfoOutCenterStart(string messageHeader)
+        {
+            RefreshScanInfoOutCenterStartEvent?.Invoke();
+            return true;
+        }
+
+        /// <summary>
+        /// 出库结束
+        /// </summary>
+        /// <param name="messageHeader"></param>
+        /// <returns></returns>
+        [WebApi(HttpMethodType.POST)]
+        public object getScanInfoOutCenterStop(string messageHeader)
+        {
+            RefreshScanInfoOutCenterStopEvent?.Invoke();
+            return true;
+        }
+
+    }
+}

SlnMesnac.TouchSocket/SlnMesnac.TouchSocket.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="TouchSocket" Version="2.0.17" />
+    <PackageReference Include="TouchSocket.WebApi" Version="2.0.17" />
+    <PackageReference Include="TouchSocket.WebApi.Swagger" Version="2.0.17" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SlnMesnac.Serilog\SlnMesnac.Serilog.csproj" />
+  </ItemGroup>
+
+</Project>

SlnMesnac.TouchSocket/TcpServer.cs

@@ -0,0 +1,115 @@
+using Microsoft.Extensions.Logging;
+using SlnMesnac.Serilog;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using TouchSocket.Core;
+using TouchSocket.Sockets;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.TouchSocket
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.TouchSocket
+{
+    public class TcpServer
+    {
+        private SerilogHelper _logger;
+        private readonly TcpService _service;
+        /// <summary>
+        /// 接收客户端指令委托
+        /// </summary>
+        public delegate void ReceivedClientBuffer(byte[] buffer);
+        public event ReceivedClientBuffer? ReceivedClientBufferEvent;
+
+        public delegate void RefreshClientInfo(TcpService tcpService);
+        public event RefreshClientInfo? RefreshClientInfoEvent;
+
+        public TcpServer(SerilogHelper logger, TcpService tcpService)
+        {
+            _logger = logger;
+            _service = tcpService;
+        }
+
+        public void Init(int serverPort)
+        {
+            try
+            {
+                _service.Connecting = (client, e) => {  
+                    _logger.Info($"客户端{client.IP}正在接入服务");
+                    return EasyTask.CompletedTask;
+                };
+                _service.Connected = (client, e) => {   
+                    _logger.Info($"客户端{client.IP}接入服务成功");
+                    RefreshClientInfoEvent?.Invoke(_service);
+                    return EasyTask.CompletedTask;
+                };
+                _service.Disconnected = (client, e) => { 
+                    _logger.Info($"客户端{client.IP}断开连接");
+                    RefreshClientInfoEvent?.Invoke(_service);
+                    return EasyTask.CompletedTask;
+                };
+                _service.Received = (client, e) =>
+                {
+                    //从客户端收到信息
+                    var mes = Encoding.UTF8.GetString(e.ByteBlock.Buffer, 0, e.ByteBlock.Len);//注意：数据长度是byteBlock.Len
+
+                    byte[] receivedBuffer = new byte[e.ByteBlock.Len];
+                    Array.Copy(e.ByteBlock.Buffer, 0, receivedBuffer, 0, e.ByteBlock.Len);
+                    ReceivedClientBufferEvent?.Invoke(receivedBuffer);
+                    
+                    return EasyTask.CompletedTask;
+                };
+
+                _service.Setup(new TouchSocketConfig()//载入配置     
+                    .SetListenIPHosts(new IPHost[] { new IPHost($"0.0.0.0:{serverPort}") })
+                    .ConfigureContainer(a =>//容器的配置顺序应该在最前面
+                    {
+                        a.AddConsoleLogger();
+                    })
+                    .ConfigurePlugins(a =>
+                    {
+                        //自定义插件
+                    }));
+                _service.Start();
+                _logger.Info($"TcpServer启动成功，监听端口：{serverPort}");
+            }
+            catch (Exception ex)
+            {
+                //throw new InvalidOperationException($"TcpServer启动异常：{ex.Message}");
+                _logger.Error($"TcpServer启动异常：{ex.Message}");
+            }
+
+        }
+
+        /// <summary>
+        /// 向所有客户端发送心跳
+        /// </summary>
+        public void SendHeartBeat()
+        {
+            var clients = _service.SocketClients.GetClients();
+            foreach (var item in clients)
+            {
+                _service.Send(item.Id,"heartbeat");
+            }
+        }
+    }
+}

SlnMesnac.TouchSocket/TouchSocketSetup.cs

@@ -0,0 +1,48 @@
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Builder;
+using TouchSocket.Sockets;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.TouchSocket
+* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-27 21:58:35
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.TouchSocket
+{
+    /// <summary>
+    /// 注册服务
+    /// </summary>
+    public static class TouchSocketSetup
+    {
+        
+        public static IApplicationBuilder UseTouchSocketExtensions(this IApplicationBuilder app)
+        {
+            var _server = app.ApplicationServices.GetService<TcpServer>();
+            _server.Init(20108);
+
+            var _apiServer = app.ApplicationServices.GetService<WebApiServer>();
+            _apiServer.Init();
+            return app;
+        }
+    }
+}

SlnMesnac.TouchSocket/WebApiServer.cs

@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using TouchSocket.Core;
+using TouchSocket.Http;
+using TouchSocket.Rpc;
+using TouchSocket.Sockets;
+using TouchSocket.WebApi.Swagger;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：T14-GEN3-7895
+* 命名空间：SlnMesnac.TouchSocket
+* 唯一标识：4e47989b-9d43-426e-b67a-529de3b1b0e8
+*
+* 创建者：WenJY
+* 电子邮箱：
+* 创建时间：2024-09-04 10:51:29
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.TouchSocket
+{
+    public class WebApiServer
+    {
+        private ApiServer _apiServer;
+
+        public WebApiServer(ApiServer apiServer)
+        {
+            _apiServer = apiServer;
+        }
+
+        public void Init()
+        {
+            try
+            {
+                var service = new HttpService();
+                service.Setup(new TouchSocketConfig()
+                   .SetListenIPHosts(7789)
+                   .ConfigureContainer(a =>
+                   {
+                       a.AddRpcStore(store =>
+                       {
+
+                           store.RegisterServer<ApiServer>(_apiServer);//注册服务
+                       });
+
+                       a.AddCors(corsOption =>
+                       {
+                           corsOption.Add("cors", corsBuilder =>
+                           {
+                               corsBuilder.AllowAnyMethod()
+                                   .AllowAnyOrigin();
+                           });
+                       });
+
+                       a.AddLogger(logger =>
+                       {
+                           logger.AddConsoleLogger();
+                           logger.AddFileLogger();
+                       });
+                   })
+                   .ConfigurePlugins(a =>
+                   {
+                       a.UseCheckClear();
+
+                       a.Add<AuthenticationPlugin>();
+
+                       a.UseWebApi()
+                       .ConfigureConverter(converter =>
+                       {
+                           converter.AddJsonSerializerFormatter(new Newtonsoft.Json.JsonSerializerSettings() { Formatting = Newtonsoft.Json.Formatting.None });
+                       });
+
+                       a.UseSwagger();//使用Swagger页面
+                       //.UseLaunchBrowser();
+
+                       a.UseDefaultHttpServicePlugin();
+                   }));
+                service.Start();
+
+                Console.WriteLine("以下连接用于测试webApi");
+                Console.WriteLine($"使用：http://127.0.0.1:7789/swagger/index.html");
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex.ToString());
+            }
+
+            //Console.ReadLine();
+        }
+    }
+
+    internal class AuthenticationPlugin : PluginBase, IHttpPlugin
+    {
+        public async Task OnHttpRequest(IHttpSocketClient client, HttpContextEventArgs e)
+        {
+            await e.InvokeNext();
+        }
+    }
+}

SlnMesnac.WPF/App.xaml

@@ -0,0 +1,36 @@
+<Application x:Class="SlnMesnac.WPF.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:SlnMesnac.WPF">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.LightBlue.xaml" />
+
+                <!--<ResourceDictionary Source="Templates\Languages\StringResource.en-US.xaml" />
+                <ResourceDictionary Source="Templates\Languages\StringResource.zh-CN.xaml" />-->
+            </ResourceDictionary.MergedDictionaries>
+            <!--重写框架主体色-->
+            <SolidColorBrush x:Key="PrimaryHueLightBrush" Color="#3b76ee" />
+            <SolidColorBrush x:Key="PrimaryHueLightForegroundBrush" Color="#3b76ee"  />
+            <SolidColorBrush x:Key="PrimaryHueMidBrush" Color="#3b76ee"  />
+            <SolidColorBrush x:Key="PrimaryHueMidForegroundBrush" Color="#3b76ee"  />
+            <SolidColorBrush x:Key="PrimaryHueDarkBrush" Color="#3b76ee"  />
+            <SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="#3b76ee"  />
+
+            <!-- DataGrid列标题居中样式 -->
+            <Style x:Key="DataGridColumnHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                <Setter Property="HorizontalAlignment" Value="Center"/>
+            </Style>
+
+            <!-- DataGrid单元格居中样式 -->
+            <Style x:Key="DataGridCellCenterStyle" TargetType="DataGridCell">
+                <Setter Property="HorizontalAlignment" Value="Center"/>
+                <Setter Property="VerticalAlignment" Value="Center"/>
+            </Style>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>

SlnMesnac.WPF/App.xaml.cs

@@ -0,0 +1,155 @@
+using Lierda.WPFHelper;
+using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+using SlnMesnac.Config;
+using System;
+using System.Windows;
+using Microsoft.Extensions.Configuration;
+using SlnMesnac.Extensions;
+using SlnMesnac.Serilog;
+using System.Reflection;
+using TouchSocket.Sockets;
+using SlnMesnac.WPF.Attribute;
+using SlnMesnac.WPF.Page.Login;
+
+namespace SlnMesnac.WPF
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+        private System.Threading.Mutex? mutex = null;
+        private LierdaCracker cracker = new LierdaCracker();
+        public static IServiceProvider? ServiceProvider = null;
+
+        public new static App Current => (App)Application.Current;
+
+        // Startup事件
+        protected override async void OnStartup(StartupEventArgs e)
+        {
+
+            this.DispatcherUnhandledException += App_DispatcherUnhandledException;  //全局异常处理
+
+            #region 进程判断，避免重复开启
+            bool ret;
+            mutex = new System.Threading.Mutex(true, System.Diagnostics.Process.GetCurrentProcess().ProcessName, out ret);
+            if (!ret)
+            {
+                MessageBox.Show("应用程序已开启，禁止重复运行");
+                Environment.Exit(0);
+            }
+            #endregion
+
+            cracker.Cracker(100); //设置GC回收间隔
+
+            base.OnStartup(e);
+
+            // 设置ServiceCollection
+            var services = new ServiceCollection();
+            ConfigureServices(services); // 配置服务
+
+            // 创建ServiceProvider
+            ServiceProvider = services.BuildServiceProvider();
+
+            // 配置Serilog和其他扩展
+            ServiceProvider.UseSerilogExtensions();
+
+            var appConfig = ServiceProvider.GetService<AppConfig>();
+            Log.Information($"系统初始化完成,日志存放路径：{appConfig?.logPath}");
+
+            var loginWindow = ServiceProvider.GetRequiredService<LoginWindow>();
+            loginWindow.WindowStartupLocation = WindowStartupLocation.CenterScreen;
+            loginWindow.Show();
+
+        }
+
+
+        /// <summary>
+        /// ConfigureServices
+        /// </summary>
+        /// <param name="services"></param>
+        private void ConfigureServices(IServiceCollection services)
+        {
+            // 注册AppConfig
+            services.AddSingleton<AppConfig>(provider =>
+            {
+                var configurationBuilder = new ConfigurationBuilder()
+                    .SetBasePath(AppDomain.CurrentDomain.BaseDirectory)
+                    .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true);
+                IConfiguration configuration = configurationBuilder.Build();
+                var ap = configuration.GetSection("AppConfig").Get<AppConfig>();
+                return ap;
+            });
+
+            services.AddSingleton(typeof(SerilogHelper));
+
+            Assembly[] assemblies = {
+                Assembly.LoadFrom("SlnMesnac.Repository.dll"),
+                Assembly.LoadFrom("SlnMesnac.Plc.dll"),
+                Assembly.LoadFrom("SlnMesnac.Rfid.dll"),
+                Assembly.LoadFrom("SlnMesnac.Common.dll"),
+                Assembly.LoadFrom("SlnMesnac.TouchSocket.dll"),
+                Assembly.LoadFrom("SlnMesnac.Business.dll"),
+                Assembly.LoadFrom("SlnMesnac.Generate.dll")
+           }; 
+
+            services.Scan(scan => scan.FromAssemblies(assemblies)
+                                .AddClasses()
+                                .AsImplementedInterfaces()
+                                .AsSelf()
+                                .WithTransientLifetime());
+            services.AddSingleton(typeof(TcpService));
+            services.AddLogging(x => x.AddSerilog());
+
+            services.Scan(scan => scan
+                .FromAssemblyOf<LoginWindow>()
+                .AddClasses(classes => classes.WithAttribute<RegisterAsSingletonAttribute>()).AsSelf().WithSingletonLifetime());
+            services.Scan(scan => scan
+                .FromAssemblyOf<LoginWindow>()
+                .AddClasses(classes => classes.WithAttribute<RegisterAsTransientAttribute>()).AsSelf().WithTransientLifetime());
+
+
+            // 注册ORM
+            services.AddSqlSugarSetup();
+
+            // 注册PLC工厂
+            //services.AddPlcFactorySetup();
+
+            //services.AddJob();
+
+            // 注册 EventBus 服务
+            //services.AddEventBus(builder =>
+            //{
+            //    // 注册 ToDo 事件订阅者
+            //    builder.AddSubscriber<ToDoEventSubscriber>();
+            //});
+
+
+
+
+        }
+
+        // Exit事件
+        protected override void OnExit(ExitEventArgs e)
+        {
+            base.OnExit(e);
+
+            Log.Information($"系统退出，当前时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+            // 释放资源
+            // ...
+        }
+
+        private void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
+        {
+            // 处理异常
+            var info = e.Exception;
+            MessageBox.Show(e.Exception.Message);
+            Log.Error($"全局异常：{e.Exception.Message}", e.Exception);
+
+            // 防止默认的崩溃行为
+            e.Handled = true;
+        }
+
+    }
+}

SlnMesnac.WPF/AssemblyInfo.cs

@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]

SlnMesnac.WPF/Attribute/RegisterAsSingletonAttribute.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SlnMesnac.WPF.Attribute
+{
+    public class RegisterAsSingletonAttribute:System.Attribute
+    {
+    }
+}

SlnMesnac.WPF/Attribute/RegisterAsTransientAttribute.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SlnMesnac.WPF.Attribute
+{
+    public class RegisterAsTransientAttribute:System.Attribute
+    {
+    }
+}

SlnMesnac.WPF/Attribute/RequirePermissionAttribute.cs

@@ -0,0 +1,109 @@
+using Microsoft.Extensions.DependencyInjection;
+using Rougamo;
+using Rougamo.Context;
+using SlnMesnac.WPF.Page.Loading;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Threading;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：T14-GEN3-7895
+* 命名空间：SlnMesnac.WPF.Attribute
+* 唯一标识：fff40cb6-18aa-47e0-917c-1fa653e6f978
+*
+* 创建者：WenJY
+* 电子邮箱：
+* 创建时间：2024-12-30 10:19:41
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.WPF.Attribute
+{
+    /// <summary>
+    /// 权限过滤
+    /// </summary>
+    public class RequirePermissionAttribute : MoAttribute
+    {
+        private LoadingWindow loadingWindow;
+        private string _permissionName;
+
+        public RequirePermissionAttribute(string permissionName)
+        {
+            _permissionName = permissionName;
+
+            
+        }
+        public override void OnEntry(MethodContext context)
+        {
+            Thread newWindowThread = new Thread(new ThreadStart(ThreadStartingPoint));
+            newWindowThread.SetApartmentState(ApartmentState.STA); // 设置为 STA 模式
+            newWindowThread.IsBackground = true; // 设置为后台线程
+            newWindowThread.Start();
+
+            bool hasPermission = CheckPermission(_permissionName);
+
+            if (!hasPermission)
+            {
+                // 如果用户没有权限，抛出异常或采取其他措施
+                throw new UnauthorizedAccessException("User does not have the required permission.");
+            }
+
+            base.OnEntry(context);
+        }
+
+
+        public override void OnExit(MethodContext context)
+        {
+            Thread.Sleep(200);
+            if(loadingWindow != null)
+            {
+                loadingWindow.Dispatcher.Invoke(new Action(() =>
+                {
+                    loadingWindow.Close(); // 关闭窗口
+                }));
+            }
+
+            
+            base.OnExit(context);
+        }
+
+        /// <summary>
+        /// 判断权限
+        /// </summary>
+        /// <param name="permissionName"></param>
+        /// <returns></returns>
+        private bool CheckPermission(string permissionName)
+        {
+            return true; 
+        }
+
+        private void ThreadStartingPoint()
+        {
+            Dispatcher.CurrentDispatcher.Invoke(new Action(() =>
+            {
+                loadingWindow = App.ServiceProvider.GetService<LoadingWindow>();
+                loadingWindow.WindowStartupLocation = WindowStartupLocation.CenterScreen;
+                loadingWindow.Topmost = true;
+                loadingWindow.Show();
+            }));
+
+            Dispatcher.Run();
+        }
+    }
+}

SlnMesnac.WPF/Converter/Generate/RowToIndexConverter.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.WPF.Converter.Generate
+* 唯一标识：38e34c93-1c10-4a1c-83b0-c545affdc224
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-04-11 10:27:10
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.WPF.Converter.Generate
+{
+    internal class RowToIndexConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            var item = values[0];
+            var dataGrid = values[1] as DataGrid;
+
+            if (item == null || dataGrid == null)
+                return null;
+
+            var index = dataGrid.Items.IndexOf(item) + 1;
+            return index;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

SlnMesnac.WPF/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <Rougamo />
+</Weavers>

SlnMesnac.WPF/MainWindow.xaml

@@ -0,0 +1,268 @@
+<Window x:Class="SlnMesnac.WPF.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:SlnMesnac.WPF"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="1080" Width="1920"
+        WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize" Topmost="False">
+    <Window.Background>
+        <ImageBrush ImageSource="/Templates/image/background.jpg" />
+    </Window.Background>
+
+    <Border Margin="5" Background="Transparent" CornerRadius="10">
+        <Border.Effect>
+            <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
+        </Border.Effect>
+
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="7*"/>
+                <RowDefinition Height="0.7*"/>
+            </Grid.RowDefinitions>
+            <Border Grid.Row="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="7*"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
+                    <StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center">
+                        <TextBlock Text="生产控制系统" FontSize="50" Foreground="White" FontWeight="Bold"/>
+                    </StackPanel>
+
+                    <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Grid.Column="0" Text="白班" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,30,0"/>
+                            <TextBlock Grid.Column="1" Text="|" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,30,0"/>
+                            <TextBlock Grid.Column="2" Text="SCADA" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,10,0"/>
+                        </Grid>
+                    </StackPanel>
+                </Grid>
+
+            </Border>
+            <Border Grid.Row="1" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,25,2,2">
+                <ContentControl Content="{Binding UserContent}"/>
+            </Border>
+            <Border Grid.Row="2" BorderBrush="#1254AB" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="6,2,6,7">
+                <Border.Effect>
+                    <DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
+                </Border.Effect>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <StackPanel Grid.Column="0" VerticalAlignment="Center"  HorizontalAlignment="Left" Orientation="Horizontal">
+                        <Button Content="首  页" x:Name="Index"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=Index}" Style="{StaticResource MaterialDesignFlatMidBgButton}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
+                        <Button Content="代码生成"  x:Name="Generate"  Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Generate}" Style="{StaticResource MaterialDesignFlatMidBgButton}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
+                        <Button Content="键  盘"  Command="{Binding OpenSystemKeyboardCommand}" Style="{StaticResource MaterialDesignFlatMidBgButton}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
+                        <Button Content="最小化" x:Name="Minimized"  Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource MaterialDesignFlatMidBgButton}"  Width="100" Height="30" Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0"/>
+                        <Button Content="退  出" x:Name="Exit"  Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource MaterialDesignFlatMidBgButton}"  Width="100" Height="30" Background="#FF0033" BorderBrush="#FF0033" Margin="0,0,10,0"/>
+                    </StackPanel>
+
+                    <StackPanel Grid.Column="1" VerticalAlignment="Center"  HorizontalAlignment="Right" Orientation="Horizontal">
+
+                        <!--多行状态显示-->
+                        <!--<Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+                            <StackPanel Grid.Row="0" Margin="0,0,0,0"  VerticalAlignment="Center">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <StackPanel Grid.Column="0">
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*"/>
+                                                <ColumnDefinition Width="*"/>
+                                            </Grid.ColumnDefinitions>
+                                            <StackPanel Grid.Column="1">
+                                                <TextBlock Text="连接状态" FontSize="15" Foreground="Black" Margin="2,0,10,0"/>
+                                            </StackPanel>
+                                            <StackPanel Grid.Column="0">
+                                                <Ellipse Width="20" Height="20">
+                                                    <Ellipse.Style>
+                                                        <Style TargetType="Ellipse">
+                                                            <Style.Triggers>
+                                                                <DataTrigger Binding="{Binding PresentColor}" Value="0">
+                                                                    <Setter Property="Shape.Fill" Value="Orange"/>
+                                                                </DataTrigger>
+                                                                <DataTrigger Binding="{Binding PresentColor}" Value="1">
+                                                                    <Setter Property="Shape.Fill" Value="Green"/>
+                                                                </DataTrigger>
+                                                                <DataTrigger Binding="{Binding PresentColor}" Value="2">
+                                                                    <Setter Property="Shape.Fill" Value="Red"/>
+                                                                </DataTrigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </Ellipse.Style>
+                                                </Ellipse>
+                                            </StackPanel>
+                                        </Grid>
+                                    </StackPanel>
+                                </Grid>
+                            </StackPanel>
+
+                            <StackPanel Grid.Row="1" Margin="0,10,0,0" VerticalAlignment="Center">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <StackPanel Grid.Column="0">
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*"/>
+                                                <ColumnDefinition Width="*"/>
+                                            </Grid.ColumnDefinitions>
+                                            <StackPanel Grid.Column="1">
+                                                <TextBlock Text="连接状态" FontSize="15" Foreground="Black" Margin="2,0,10,0"/>
+                                            </StackPanel>
+                                            <StackPanel Grid.Column="0">
+                                                <Ellipse Width="20" Height="20">
+                                                    <Ellipse.Style>
+                                                        <Style TargetType="Ellipse">
+                                                            <Style.Triggers>
+                                                                <DataTrigger Binding="{Binding PresentColor}" Value="0">
+                                                                    <Setter Property="Shape.Fill" Value="Orange"/>
+                                                                </DataTrigger>
+                                                                <DataTrigger Binding="{Binding PresentColor}" Value="1">
+                                                                    <Setter Property="Shape.Fill" Value="Green"/>
+                                                                </DataTrigger>
+                                                                <DataTrigger Binding="{Binding PresentColor}" Value="2">
+                                                                    <Setter Property="Shape.Fill" Value="Red"/>
+                                                                </DataTrigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </Ellipse.Style>
+                                                </Ellipse>
+                                            </StackPanel>
+                                        </Grid>
+                                    </StackPanel>
+                                </Grid>
+                            </StackPanel>
+                        </Grid>-->
+
+                        <!--单行状态显示-->
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+
+                            <StackPanel Grid.Column="0">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <StackPanel Grid.Column="0">
+                                        <Ellipse Width="30" Height="30">
+                                            <Ellipse.Style>
+                                                <Style TargetType="Ellipse">
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding ShellScannerStatus}" Value="0">
+                                                            <Setter Property="Shape.Fill" Value="Orange"/>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding ShellScannerStatus}" Value="1">
+                                                            <Setter Property="Shape.Fill" Value="Green"/>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding ShellScannerStatus}" Value="2">
+                                                            <Setter Property="Shape.Fill" Value="Red"/>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </Ellipse.Style>
+                                        </Ellipse>
+                                    </StackPanel>
+                                    <StackPanel Grid.Column="1"  VerticalAlignment="Center">
+                                        <TextBlock Text="箱壳扫码器" FontSize="15" Foreground="#FFFFFF" Margin="2,0,10,0"/>
+                                    </StackPanel>
+                                </Grid>
+                            </StackPanel>
+
+                            <StackPanel Grid.Column="1">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <StackPanel Grid.Column="0">
+                                        <Ellipse Width="30" Height="30">
+                                            <Ellipse.Style>
+                                                <Style TargetType="Ellipse">
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding BoldScannerStatus}" Value="0">
+                                                            <Setter Property="Shape.Fill" Value="Orange"/>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding BoldScannerStatus}" Value="1">
+                                                            <Setter Property="Shape.Fill" Value="Green"/>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding BoldScannerStatus}" Value="2">
+                                                            <Setter Property="Shape.Fill" Value="Red"/>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </Ellipse.Style>
+                                        </Ellipse>
+                                    </StackPanel>
+                                    <StackPanel Grid.Column="1"  VerticalAlignment="Center">
+                                        <TextBlock Text="内胆扫码器" FontSize="15" Foreground="#FFFFFF" Margin="2,0,10,0"/>
+                                    </StackPanel>
+                                </Grid>
+                            </StackPanel>
+
+                            <StackPanel Grid.Column="2">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <StackPanel Grid.Column="0">
+                                        <Ellipse Width="30" Height="30">
+                                            <Ellipse.Style>
+                                                <Style TargetType="Ellipse">
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding PlcStatus}" Value="0">
+                                                            <Setter Property="Shape.Fill" Value="Orange"/>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding PlcStatus}" Value="1">
+                                                            <Setter Property="Shape.Fill" Value="Green"/>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding PlcStatus}" Value="2">
+                                                            <Setter Property="Shape.Fill" Value="Red"/>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </Ellipse.Style>
+                                        </Ellipse>
+                                    </StackPanel>
+                                    <StackPanel Grid.Column="1"  VerticalAlignment="Center">
+                                        <TextBlock Text="PLC状态" FontSize="15" Foreground="#FFFFFF" Margin="2,0,10,0"/>
+                                    </StackPanel>
+                                </Grid>
+                            </StackPanel>
+                        </Grid>
+
+                    </StackPanel>
+                </Grid>
+
+
+            </Border>
+        </Grid>
+    </Border>
+
+</Window>

SlnMesnac.WPF/MainWindow.xaml.cs

@@ -0,0 +1,33 @@
+using SlnMesnac.WPF.Attribute;
+using SlnMesnac.WPF.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace SlnMesnac.WPF
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    [RegisterAsSingletonAttribute]
+    public partial class MainWindow : Window
+    {
+        public MainWindow(MainWindowViewModel mainWindowViewModel)
+        {
+            InitializeComponent();
+
+            this.DataContext = mainWindowViewModel;
+        }
+    }
+}

SlnMesnac.WPF/Page/Generate/GenerateControl.xaml

@@ -0,0 +1,56 @@
+<UserControl x:Class="SlnMesnac.WPF.Page.Generate.GenerateControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:SlnMesnac.WPF.Page.Generate"
+             xmlns:local1="clr-namespace:SlnMesnac.WPF.Converter.Generate"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800" Background="Transparent">
+    <Control.Resources>
+        <local1:RowToIndexConverter x:Key="RowToIndexConverter" />
+    </Control.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="8*"/>
+        </Grid.RowDefinitions>
+        <Border Grid.Row="0" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Margin="0,0,0,10">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
+                
+                <TextBlock Text="数据库连接:" FontSize="20" Foreground="White" VerticalAlignment="Center" Margin="10,0,10,0"/>
+                <ComboBox Width="200" Height="35" FontSize="18" VerticalAlignment="Center" Name="comboBox1" ItemsSource="{Binding Options}" SelectedItem="{Binding SelectedOption, Mode=TwoWay}" DisplayMemberPath="."/>
+
+                <TextBlock Text="表名:" FontSize="20" Foreground="White" VerticalAlignment="Center" Margin="30,0,10,0"/>
+                <TextBox x:Name="queryParam" Foreground="White" FontSize="18" Width="200" Height="35"/>
+
+                <Button Content="查  询" FontSize="16"  Width="120" Height="35" Background="#007DFA" BorderBrush="#007DFA" Margin="20,0,10,0" Command="{Binding QuerySearchCommand}" CommandParameter="{Binding Text, ElementName=queryParam}" />
+
+            </StackPanel>
+        </Border>
+        <Border Grid.Row="1" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Margin="0,0,0,10">
+            <DataGrid x:Name="datagrid" Grid.Row="0" ItemsSource="{Binding TablesDataGrid}" Background="Transparent" 
+                FontSize="15" ColumnHeaderHeight="35" 
+                RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
+                GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
+                ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" HorizontalAlignment="Center"
+                Foreground="#FFFFFF" >
+                <!--resourceStyle 399行修改选中字体颜色-->
+                <DataGrid.Columns>
+                    <DataGridTextColumn Binding="{Binding Name}" Header="表名" Width="3*" IsReadOnly="True"/>
+                    <DataGridTextColumn Binding="{Binding Description}" Header="说明" Width="3*" IsReadOnly="True"/>
+                    <DataGridTemplateColumn Header="操作" Width="2*">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Content="生成代码" CommandParameter="{Binding Name}" Background="#009999" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="#009999" BorderThickness="0" Width="100" Command="{Binding DataContext.CreateCodeCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+
+                    </DataGridTemplateColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+        </Border>
+    </Grid>
+</UserControl>

SlnMesnac.WPF/Page/Generate/GenerateControl.xaml.cs

@@ -0,0 +1,32 @@
+using SlnMesnac.WPF.Attribute;
+using SlnMesnac.WPF.ViewModel.Generate;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace SlnMesnac.WPF.Page.Generate
+{
+    /// <summary>
+    /// GenerateControl.xaml 的交互逻辑
+    /// </summary>
+    [RegisterAsSingletonAttribute]
+    public partial class GenerateControl : UserControl
+    {
+        public GenerateControl(GenerateControlViewModel generateControlViewModel)
+        {
+            InitializeComponent();
+            this.DataContext = generateControlViewModel;
+        }
+    }
+}

SlnMesnac.WPF/Page/Loading/LoadingWindow.xaml

@@ -0,0 +1,19 @@
+<Window x:Class="SlnMesnac.WPF.Page.Loading.LoadingWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:SlnMesnac.WPF.Page.Loading"
+        xmlns:gif="http://wpfanimatedgif.codeplex.com"
+        mc:Ignorable="d"
+        Height="200" Width="400" 
+        WindowStyle="None" 
+        ResizeMode="NoResize" 
+        Topmost="True" 
+        AllowsTransparency="True" 
+        Background="Transparent"
+        Opacity="0.8">
+    <Grid>
+        <Image gif:ImageBehavior.AnimatedSource="pack://application:,,,/Templates/gif/loading.gif" Height="180"/>
+    </Grid>
+</Window>

SlnMesnac.WPF/Page/Loading/LoadingWindow.xaml.cs

@@ -0,0 +1,26 @@
+using SlnMesnac.WPF.Attribute;
+using System;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace SlnMesnac.WPF.Page.Loading
+{
+    /// <summary>
+    /// LoadingWindow.xaml 的交互逻辑
+    /// </summary>
+    [RegisterAsTransientAttribute]
+    public partial class LoadingWindow : Window
+    {
+        public LoadingWindow()
+        {
+            InitializeComponent();
+        }
+
+        protected override void OnClosed(EventArgs e)
+        {
+            base.OnClosed(e);
+            // 停止 Dispatcher 消息循环
+            Dispatcher.BeginInvokeShutdown(DispatcherPriority.Background);
+        }
+    }
+}

SlnMesnac.WPF/Page/Login/LoginWindow.xaml

@@ -0,0 +1,58 @@
+<Window x:Class="SlnMesnac.WPF.Page.Login.LoginWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:SlnMesnac.WPF.Page.Login"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        mc:Ignorable="d"
+        Title="{Binding SystemTitle}" Height="600" Width="980">
+    <Window.Background>
+        <ImageBrush ImageSource="/Templates/image/login-background.jpg" />
+    </Window.Background>
+    <Grid>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="10*"/>
+                <ColumnDefinition Width="5*"/>
+                <ColumnDefinition Width="2*"/>
+            </Grid.ColumnDefinitions>
+            <StackPanel Grid.Column="0" Background="Transparent" Height="50" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="50,50">
+                <Label Content="{Binding SystemTitle}" Foreground="#007DFA" FontSize="25"/>
+            </StackPanel>
+            <Border Grid.Column="1" Background="White" Height="300" CornerRadius="10" >
+                <Grid Cursor="">
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <StackPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <TextBlock Foreground="Gray" Text="用户登录" FontSize="20"/>
+                    </StackPanel>
+                    <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <!--<TextBlock Foreground="Gray" Text="账号:" FontSize="16" Margin="0,10,10,0"/>
+                        <TextBox x:Name="UserNameStr" Foreground="Gray" FontSize="16" Width="150" Height="35"/>-->
+                        <materialDesign:PackIcon Kind="AccountKeyOutline" VerticalAlignment="Bottom"  Height="25" Width="25"  Margin="0,0,10,0"/>
+                        <TextBox x:Name="UserNameStr" Width="150" FontSize="16" VerticalAlignment="Center" materialDesign:HintAssist.Hint="请输入用户名" Style="{StaticResource MaterialDesignFloatingHintTextBox}" />
+                    </StackPanel>
+                    <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <!--<TextBlock Foreground="Gray" Text="密码:" FontSize="16" Margin="0,10,10,0"/>-->
+                        <!--<PasswordBox x:Name="PasswordStr" HorizontalAlignment="Left" VerticalContentAlignment="Center" Width="150" PasswordChar="*" />-->
+                        <materialDesign:PackIcon Kind="AccountLockOutline" VerticalAlignment="Bottom"  Height="25" Width="25" Margin="0,0,10,0"/>
+                        <PasswordBox
+                          x:Name="PasswordStr" Width="150" FontSize="16"
+                          materialDesign:HintAssist.Foreground="Green"
+                          materialDesign:HintAssist.Hint="请输入密码"
+                          materialDesign:TextFieldAssist.UnderlineBrush="Green"
+                          Style="{StaticResource MaterialDesignFloatingHintPasswordBox}" Cursor="Hand" />
+                    </StackPanel>
+                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="3">
+                        <Button x:Name="LoginBtn" Content="登录" Background="#007DFA" ToolTip="MaterialDesignFlatMidButton" Margin="10,0,10,0" Style="{StaticResource MaterialDesignFlatMidBgButton}" Foreground="White" FontSize="16" Width="150" Height="30" Click="LoginBtn_Click"/>
+                    </StackPanel>
+                </Grid>
+            </Border>
+        </Grid>
+    </Grid>
+</Window>

SlnMesnac.WPF/Page/Login/LoginWindow.xaml.cs

@@ -0,0 +1,54 @@
+using SlnMesnac.WPF.Attribute;
+using SlnMesnac.WPF.ViewModel.Login;
+using System;
+using System.Windows;
+
+namespace SlnMesnac.WPF.Page.Login
+{
+    /// <summary>
+    /// LoginWindow.xaml 的交互逻辑
+    /// </summary>
+    [RegisterAsSingletonAttribute]
+    public partial class LoginWindow : Window
+    {
+        private readonly LoginViewModel _loginViewModel;
+        public LoginWindow(LoginViewModel loginViewModel)
+        {
+            _loginViewModel = loginViewModel;
+            InitializeComponent();
+            this.DataContext = _loginViewModel;
+        }
+
+        private async void LoginBtn_Click(object sender, RoutedEventArgs e)
+        {
+            string userName = UserNameStr.Text.ToString();
+            string password = PasswordStr.Password;
+
+            //if (string.IsNullOrEmpty(userName))
+            //{
+            //    MessageBox.Show("用户名不允许为空");
+            //    return;
+            //}
+
+            //if (string.IsNullOrEmpty(password))
+            //{
+            //    MessageBox.Show("密码不允许为空");
+            //    return;
+            //}
+
+            bool res = _loginViewModel.Login(userName,password);
+            if (res)
+            {
+                this.Closing += MainWindow_Closing;
+                this.Close();
+            }
+        }
+
+        private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            this.Closing -= MainWindow_Closing; // 防止多次绑定
+            e.Cancel = true;
+            this.Visibility = Visibility.Hidden; // 隐藏窗口
+        }
+    }
+}

SlnMesnac.WPF/SlnMesnac.WPF.csproj

@@ -0,0 +1,57 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net6.0-windows</TargetFramework>
+
+		<Nullable>enable</Nullable>
+		<UseWPF>true</UseWPF>
+	</PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="appsettings.json" />
+    <None Remove="Templates\gif\loading.gif" />
+    <None Remove="Templates\image\background.jpg" />
+    <None Remove="Templates\image\login-background.jpg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SlnMesnac.Business\SlnMesnac.Business.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Common\SlnMesnac.Common.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Config\SlnMesnac.Config.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Extensions\SlnMesnac.Extensions.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Generate\SlnMesnac.Generate.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Model\SlnMesnac.Model.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Mqtt\SlnMesnac.Mqtt.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Plc\SlnMesnac.Plc.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Quartz\SlnMesnac.Quartz.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Repository\SlnMesnac.Repository.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Rfid\SlnMesnac.Rfid.csproj" />
+    <ProjectReference Include="..\SlnMesnac.Serilog\SlnMesnac.Serilog.csproj" />
+    <ProjectReference Include="..\SlnMesnac.TouchSocket\SlnMesnac.TouchSocket.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+    <PackageReference Include="Lierda.WPFHelper" Version="1.0.3" />
+    <PackageReference Include="MaterialDesignThemes" Version="5.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="Rougamo.Fody" Version="5.0.0" />
+    <PackageReference Include="Scrutor" Version="6.0.1" />
+    <PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
+    <PackageReference Include="WpfAnimatedGif" Version="2.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Resource Include="Templates\gif\loading.gif" />
+    <Resource Include="Templates\image\background.jpg" />
+    <Resource Include="Templates\image\login-background.jpg" />
+  </ItemGroup>
+
+</Project>

SlnMesnac.WPF/Templates/style/resourceStyle.xaml

@@ -0,0 +1,424 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:SlnMesnac.WPF">
+    <Style x:Key="Window" TargetType="Window">
+        <Setter Property="WindowStyle" Value="None"/>
+        <Setter Property="AllowsTransparency" Value="True"/>
+        <Setter Property="Background" Value="Transparent"/>
+    </Style>
+    <Style x:Key="BUTTON_MENUBAR" TargetType="Button">
+        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="HorizontalAlignment" Value="Right"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Grid  Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                        <Grid Name="g" Opacity="0" Background="LightGray"/>
+                        <Grid Name="grd" RenderTransformOrigin="0.5,0.5" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" VerticalAlignment="Center" HorizontalAlignment="Center" >
+                            <Grid.RenderTransform>
+                                <TransformGroup>
+                                    <!--<RotateTransform x:Name="rotate" Angle="0"-->
+                                    <ScaleTransform x:Name="scale" ScaleX="0.8" ScaleY="0.8"/>
+                                </TransformGroup>
+                            </Grid.RenderTransform>
+                        </Grid>
+                        <ContentPresenter HorizontalAlignment="Left" VerticalAlignment="Center" />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard >
+                                    <Storyboard>
+                                        <DoubleAnimation To="0.2"  Duration="0:0:0.2" Storyboard.TargetName="g" Storyboard.TargetProperty="Opacity" />
+                                        <DoubleAnimation To="1"  Duration="0:0:0.2" Storyboard.TargetName="scale" Storyboard.TargetProperty="ScaleX" />
+                                        <DoubleAnimation To="1"  Duration="0:0:0.2" Storyboard.TargetName="scale" Storyboard.TargetProperty="ScaleY" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard >
+                                    <Storyboard>
+                                        <DoubleAnimation To="0"  Duration="0:0:0.2" Storyboard.TargetName="g" Storyboard.TargetProperty="Opacity" />
+                                        <DoubleAnimation To="0.8"  Duration="0:0:0.2" Storyboard.TargetName="scale" Storyboard.TargetProperty="ScaleX" />
+                                        <DoubleAnimation To="0.8"  Duration="0:0:0.2" Storyboard.TargetName="scale" Storyboard.TargetProperty="ScaleY" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="BUTTON_MENUBAR_PATH" TargetType="Button">
+        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="Foreground" Value="Gray" />
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="Auto"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Grid  Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                        <Grid Name="g" Background="LightGray" Opacity="0" />
+                        <Grid Name="grd"  Width="22" Height="22" Background="{TemplateBinding Background}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                        <ContentPresenter VerticalAlignment="Center" HorizontalAlignment="Center" />
+                        <Path Width="10" Height="30" HorizontalAlignment="Right" VerticalAlignment="Center" Data="M3,10 L7,15 L3,20" Stroke="Gray" StrokeThickness="1"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard >
+                                    <Storyboard>
+                                        <DoubleAnimation To="0.4"  Duration="0:0:0.2" Storyboard.TargetName="g" Storyboard.TargetProperty="Opacity" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard >
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetName="g" Storyboard.TargetProperty="Opacity" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="BUTTON_MENUBAR_MINI" TargetType="Button">
+        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="HorizontalAlignment" Value="Right"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Grid  Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" ClipToBounds="True">
+                        <Border Name="bdr" BorderBrush="LightGray" BorderThickness="2" Opacity="0">
+                            <Border.Effect>
+                                <DropShadowEffect x:Name="effect" BlurRadius="20" Opacity="0.8" ShadowDepth="0"  Color="LightGray"/>
+                            </Border.Effect>
+                        </Border>
+                        <Grid Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" VerticalAlignment="Center" HorizontalAlignment="Center" >
+
+                        </Grid>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard >
+                                    <Storyboard>
+                                        <DoubleAnimation To="1"  Duration="0:0:0.3" Storyboard.TargetName="bdr" Storyboard.TargetProperty="Opacity" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard >
+                                    <Storyboard>
+                                        <DoubleAnimation To="0"  Duration="0:0:0.3" Storyboard.TargetName="bdr" Storyboard.TargetProperty="Opacity" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="BUTTON_AGREE" TargetType="{x:Type Button}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Name="bdr" CornerRadius="3" Opacity="1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1">
+                        <!--可使用ContentPresenter代替-->
+                        <!--Foreground的值White可以替换为{TemplateBinding Foreground}-->
+                        <Label VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Foreground="White" Content="{TemplateBinding Content}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard >
+                                    <Storyboard>
+                                        <DoubleAnimation To="0.6"  Duration="0:0:0.2" Storyboard.TargetName="bdr" Storyboard.TargetProperty="Opacity" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard >
+                                    <Storyboard>
+                                        <DoubleAnimation To="1"  Duration="0:0:0.2" Storyboard.TargetName="bdr"  Storyboard.TargetProperty="Opacity" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="BUTTON_DISAGREE" TargetType="{x:Type Button}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border CornerRadius="3" BorderBrush="#FFEBEBEB" BorderThickness="1">
+                        <Grid>
+                            <Border Name="bdr" CornerRadius="3" Background="Gray" Opacity="0"/>
+                            <Label VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Foreground="{TemplateBinding Foreground}" Content="{TemplateBinding Content}"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard >
+                                    <Storyboard>
+                                        <DoubleAnimation To="0.2"  Duration="0:0:0.2" Storyboard.TargetName="bdr" Storyboard.TargetProperty="Opacity" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard >
+                                    <Storyboard>
+                                        <DoubleAnimation To="0"  Duration="0:0:0.2" Storyboard.TargetName="bdr" Storyboard.TargetProperty="Opacity" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <SolidColorBrush x:Key="SOLIDCOLORBRUSH_LIGHT" Color="#FF6FD1FF"/>
+    <Color x:Key="COLOR_LIGHT" R="111" G="209" B="255" A="255" />
+
+
+    <Style x:Key="BUTTON_ELLIPSE" TargetType="{x:Type Button}">
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="ToolTip" Value="下一步"/>
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border CornerRadius="15" Width="30" Height="30" Background="{DynamicResource SOLIDCOLORBRUSH_LIGHT}">
+                        <Border.Effect>
+                            <DropShadowEffect x:Name="effect" BlurRadius="7" Opacity="0.6" ShadowDepth="0"  Color="{DynamicResource COLOR_LIGHT}"/>
+                        </Border.Effect>
+                        <Grid>
+                            <Path Name="path" HorizontalAlignment="Left"  Margin="0,0,0,0" Data="M5,15 L 15,23 L24,9" Stroke="White" StrokeThickness="1"/>
+                            <Path Name="path2" HorizontalAlignment="Left" Opacity="0" Margin="0,0,0,0" Data="M5,15 H25 L17,7 M25,15 L17,22 " Stroke="White" StrokeThickness="1"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard >
+                                    <Storyboard>
+                                        <DoubleAnimation To="0.9"  Duration="0:0:0.3" Storyboard.TargetName="effect" Storyboard.TargetProperty="Opacity" />
+                                        <DoubleAnimation To="15"  Duration="0:0:0.3" Storyboard.TargetName="effect" Storyboard.TargetProperty="BlurRadius" />
+                                        <DoubleAnimation To="0"  Duration="0:0:0.5" Storyboard.TargetName="path" Storyboard.TargetProperty="Opacity" />
+                                        <DoubleAnimation To="1"  Duration="0:0:0.5" BeginTime="0:0:0.3" Storyboard.TargetName="path2" Storyboard.TargetProperty="Opacity" />
+
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard >
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0:0:0.3" Storyboard.TargetName="effect" Storyboard.TargetProperty="Opacity" />
+                                        <DoubleAnimation Duration="0:0:0.3" Storyboard.TargetName="effect" Storyboard.TargetProperty="BlurRadius" />
+                                        <DoubleAnimation Duration="0:0:0.5" BeginTime="0:0:0.3" Storyboard.TargetName="path" Storyboard.TargetProperty="Opacity" />
+                                        <DoubleAnimation Duration="0:0:0.5" Storyboard.TargetName="path2" Storyboard.TargetProperty="Opacity" />
+
+                                    </Storyboard>
+                                </BeginStoryboard>
+
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+    </Style>
+    
+    
+    <!--DataGrid样式-->
+    <Style TargetType="{x:Type DataGrid}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+        <Setter Property="BorderBrush" Value="#FF688CAF"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="AutoGenerateColumns" Value="False"/>
+        <Setter Property="ColumnHeaderHeight" Value="50"/>
+        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="RowHeight" Value="50"/>
+        <Setter Property="AlternationCount" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGrid}">
+                    <Grid>
+                        <Border Background="Transparent" CornerRadius="0">
+                            <Border.Effect>
+                                <DropShadowEffect ShadowDepth="0" Direction="0" Color="#FFDADADA"/>
+                            </Border.Effect>
+                        </Border>
+                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                            <ScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
+                                <ScrollViewer.Template>
+                                    <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="Auto"/>
+                                                <ColumnDefinition Width="*"/>
+                                                <ColumnDefinition Width="Auto"/>
+                                            </Grid.ColumnDefinitions>
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto"/>
+                                                <RowDefinition Height="*"/>
+                                                <RowDefinition Height="Auto"/>
+                                            </Grid.RowDefinitions>
+                                            <Grid Background="Transparent" Grid.Column="1">
+                                                <Grid.Effect>
+                                                    <DropShadowEffect Direction="270" Color="#FFF3F3F3"/>
+                                                </Grid.Effect>
+                                            </Grid>
+                                            <Button Command="{x:Static DataGrid.SelectAllCommand}" Focusable="false" Style="{DynamicResource {ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle, TypeInTargetAssembly={x:Type DataGrid}}}" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                                            <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                                            <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" Grid.ColumnSpan="2" Grid.Row="1"/>
+
+                                            <ScrollBar x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
+                                            <Grid Grid.Column="1" Grid.Row="2">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                                                    <ColumnDefinition Width="*"/>
+                                                </Grid.ColumnDefinitions>
+                                                <ScrollBar x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}"/>
+                                            </Grid>
+                                        </Grid>
+                                    </ControlTemplate>
+                                </ScrollViewer.Template>
+                                <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            </ScrollViewer>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsGrouping" Value="true"/>
+                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+            </MultiTrigger>
+        </Style.Triggers>
+    </Style>
+    <Style TargetType="DataGridColumnHeader">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridColumnHeader">
+                    <Grid Background="{TemplateBinding Background}">
+                        <!--<Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="20"/>
+                        </Grid.ColumnDefinitions>-->
+                        <ContentPresenter Margin="20 0 0 0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+                        <!--<TextBlock Grid.Column="1" x:Name="SortArrow" Visibility="Visible"   VerticalAlignment="Center" FontFamily="/DataGrid;component/Fonts/#FontAwesome"/>-->
+                    </Grid>
+                    <!--<ControlTemplate.Triggers>
+                        <Trigger Property="SortDirection" Value="Ascending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="SortArrow" Property="Text" Value="&#xf160;" />
+                        </Trigger>
+                        <Trigger Property="SortDirection" Value="Descending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="SortArrow" Property="Text" Value="&#xf161;" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>-->
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style TargetType="DataGridRow">
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template" >
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridRow">
+                    <Grid >
+                        <Border x:Name="border" Background="{TemplateBinding Background}" BorderThickness="1" BorderBrush="Transparent"/>
+                        <DataGridCellsPresenter />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" TargetName="border"  Value="#00BCD4"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter Property="BorderBrush" TargetName="border"  Value="#00BCD4"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="ItemsControl.AlternationIndex"
+                         Value="0">
+                <Setter Property="Background" Value="Transparent" />
+            </Trigger>
+            <Trigger Property="ItemsControl.AlternationIndex"
+                         Value="1">
+                <Setter Property="Background" Value="Transparent" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style TargetType="DataGridCell">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridCell">
+                    <Grid Background="{TemplateBinding Background}">
+                        <ContentPresenter VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter Property="Foreground" Value="Gray" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--TextBox样式-->
+    <Style TargetType="{x:Type TextBox}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TextBox}">
+                    <Border  BorderThickness="1" Width="auto" Height="auto"  BorderBrush="CadetBlue">
+                        <Grid x:Name="grid" Background="Transparent">
+                            <ScrollViewer x:Name="PART_ContentHost" VerticalAlignment="Center" VerticalContentAlignment="Center" HorizontalAlignment="Center"/>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    
+    
+    <!--RadioButton样式-->
+
+</ResourceDictionary>

SlnMesnac.WPF/ViewModel/Base/BaseViewModel.cs

@@ -0,0 +1,59 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace SlnMesnac.WPF.ViewModel.Base
+{
+    public class BaseViewModel : ObservableObject
+    {
+
+        public string EscapeUnicode(string input)
+        {
+            return Regex.Replace(input, "&#x([0-9a-fA-F]+);", match =>
+            {
+                string hexValue = match.Groups[1].Value;
+                return $"\\u{hexValue}";
+            });
+        }
+
+        /// <summary>
+        /// 获取当前类中的方法
+        /// </summary>
+        /// <returns></returns>
+        public Dictionary<string, IRelayCommand> GetRelayCommandsAsDictionary()
+        {
+            var commandDict = new Dictionary<string, IRelayCommand>();
+            var properties = this.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
+            foreach (var property in properties)
+            {
+                if (property.PropertyType == typeof(IRelayCommand))
+                {
+                    var command = property.GetValue(this) as IRelayCommand;
+                    if (command != null)
+                    {
+                        commandDict[property.Name] = command;
+                    }
+                }
+            }
+            var fields = this.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance);
+            foreach (var field in fields)
+            {
+                if (field.FieldType == typeof(IRelayCommand))
+                {
+                    var command = field.GetValue(this) as IRelayCommand;
+                    if (command != null)
+                    {
+                        commandDict[field.Name] = command;
+                    }
+                }
+            }
+            return commandDict;
+        }
+    }
+}

SlnMesnac.WPF/ViewModel/Base/BaseViewModelAsPageQuery.cs

@@ -0,0 +1,75 @@
+
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TouchSocket.Core;
+
+namespace SlnMesnac.WPF.ViewModel.Base
+{
+    /// <summary>
+    /// ViewModel抽象类：分页
+    /// </summary>
+    public abstract partial class BaseViewModelAsPageQuery : ObservableObject
+    {
+        /// <summary>
+        /// 当前页码
+        /// </summary>
+        [ObservableProperty]
+        public int currentPage = 1;
+
+        /// <summary>
+        /// 每页显示的行数
+        /// </summary>
+        [ObservableProperty]
+        public int pageSize = 10;
+
+        /// <summary>
+        /// 总条数
+        /// </summary>
+        public int totalCount = 0;
+
+        /// <summary>
+        /// 总页数
+        /// </summary>
+        [ObservableProperty]
+        public int totalPages = 0;
+
+        /// <summary>
+        /// 首页
+        /// </summary>
+        [RelayCommand]
+        private void FirstPage() => ChangePage(1);
+
+        /// <summary>
+        /// 上一页
+        /// </summary>
+        [RelayCommand]
+        private void PreviousPage() => ChangePage(CurrentPage - 1);
+
+        /// <summary>
+        /// 下一页
+        /// </summary>
+        [RelayCommand]
+        private void NextPage() => ChangePage(CurrentPage + 1);
+
+        /// <summary>
+        /// 尾页
+        /// </summary>
+        [RelayCommand]
+        private void LastPage() => ChangePage(TotalPages);
+
+        private void ChangePage(int newPage)
+        {
+            if (newPage >= 1 && newPage <= TotalPages)
+            {
+                CurrentPage = newPage;
+                Query();
+            }
+        }
+        public abstract void Query();
+    }
+}

SlnMesnac.WPF/ViewModel/Generate/GenerateControlViewModel.cs

@@ -0,0 +1,155 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.WindowsAPICodePack.Dialogs;
+using SlnMesnac.Config;
+using SlnMesnac.Generate;
+using SlnMesnac.WPF.Attribute;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Data;
+using System.Linq;
+using System.Windows;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.WPF.ViewModel.Generate
+* 唯一标识：7f1ddac5-3ff3-4974-ac90-d6eb684167c8
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-04-11 09:31:46
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.WPF.ViewModel.Generate
+{
+    [RegisterAsSingleton]
+    public class GenerateControlViewModel : ObservableObject
+    {
+        private readonly AppConfig _appConfig;
+
+        private readonly GenerateCode _generateCode;
+
+        public GenerateControlViewModel(AppConfig appConfig, GenerateCode generateCode)
+        {
+            _appConfig = appConfig;
+            _generateCode = generateCode;
+
+            var configIds = _appConfig.sqlConfig.Select(x => x.configId).ToList();
+
+            // 初始化选项列表
+            Options = new ObservableCollection<string>();
+
+            foreach (var configId in configIds)
+            {
+                Options.Add(configId);
+            }
+
+            QuerySearchCommand = new RelayCommand<string>(Query);
+
+            CreateCodeCommand = new RelayCommand<string>(CreateCode);
+        }
+
+        #region 参数定义
+        private ObservableCollection<string> _options;
+        public ObservableCollection<string> Options
+        {
+            get => _options;
+            set => SetProperty(ref _options, value);
+        }
+
+        private string _selectedOption;
+        public string SelectedOption
+        {
+            get => _selectedOption;
+            set => SetProperty(ref _selectedOption, value);
+        }
+
+        private ObservableCollection<DbTableInfo> tablesDataGrid;
+
+        public ObservableCollection<DbTableInfo> TablesDataGrid
+        {
+            get => tablesDataGrid;
+            set => SetProperty(ref tablesDataGrid, value);
+
+        }
+        #endregion
+
+        #region 事件定义
+        public RelayCommand<string> QuerySearchCommand { get; set; }
+
+        public RelayCommand<string> CreateCodeCommand { get; set; }
+        #endregion
+
+        /// <summary>
+        /// 查询事件
+        /// </summary>
+        /// <param name="search"></param>
+        private void Query(string search)
+        {
+            var configId = _selectedOption;
+
+            if (!string.IsNullOrEmpty(configId))
+            {
+                var db = App.ServiceProvider.GetService<ISqlSugarClient>();
+                var scope = db.AsTenant().GetConnectionScope(configId);
+
+                List<DbTableInfo> tables = scope.DbMaintenance.GetTableInfoList(false);
+
+                if (tables != null)
+                {
+                    TablesDataGrid = new ObservableCollection<DbTableInfo>();
+                    tables.ForEach(t => { TablesDataGrid.Add(t); });
+                }
+            }
+
+
+        }
+
+        private void CreateCode(string tableName)
+        {
+            var info = tableName;
+            var configId = _selectedOption;
+
+            string nameSpace = "SlnMesnac.Repository";
+
+            try
+            {
+                using (CommonOpenFileDialog dialog = new CommonOpenFileDialog())
+                {
+                    dialog.IsFolderPicker = true; // 设置为选择文件夹
+                    if (dialog.ShowDialog() == CommonFileDialogResult.Ok)
+                    {
+                        string selectedPath = dialog.FileName;
+
+                        var res = _generateCode.CreateCode(configId, tableName, selectedPath, nameSpace);
+
+                        if (res)
+                        {
+                            MessageBox.Show($"{tableName}代码生成成功");
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"{tableName}代码生成失败：{ex.Message}");
+            }
+        }
+
+    }
+}

SlnMesnac.WPF/ViewModel/Login/LoginViewModel.cs

@@ -0,0 +1,52 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.Extensions.DependencyInjection;
+using SlnMesnac.Config;
+using SlnMesnac.WPF.Attribute;
+using System;
+using System.Windows;
+
+namespace SlnMesnac.WPF.ViewModel.Login
+{
+    [RegisterAsSingleton]
+    public partial class LoginViewModel: ObservableObject
+    {
+        private readonly AppConfig _appConfig;
+        [ObservableProperty]
+        public string systemTitle = string.Empty;
+
+        [ObservableProperty]
+        public string userName = string.Empty;
+
+        public LoginViewModel(AppConfig appConfig)
+        {
+            _appConfig = appConfig;
+            SystemTitle = "系统测试";
+        }
+
+
+        [RequirePermission("Login")]
+        public bool Login(string userName,string password)
+        {
+            bool res = true;
+            try
+            {
+                //res = _usersBusiness.Verify(userName, password);
+                if (res)
+                {
+                    App.Current.Dispatcher.Invoke(() =>
+                    {
+                        MainWindow mainWindow = App.ServiceProvider.GetService<MainWindow>();
+                        App.Current.MainWindow = mainWindow;
+                        mainWindow.Show();
+                        
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"登录失败:{ex.Message}");
+            }
+            return res;
+        }
+    }
+}

SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs

@@ -0,0 +1,132 @@
+
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Microsoft.Extensions.DependencyInjection;
+using SlnMesnac.Serilog;
+using SlnMesnac.WPF.Attribute;
+using SlnMesnac.WPF.Page.Generate;
+using SlnMesnac.WPF.ViewModel.Base;
+using System;
+using System.Windows;
+
+namespace SlnMesnac.WPF.ViewModel
+{
+    [RegisterAsSingletonAttribute]
+    public partial class MainWindowViewModel : BaseViewModel
+    {
+        public readonly SerilogHelper _logger;
+        private readonly GenerateControl _generateControl;
+
+        #region 参数定义
+        /// <summary>
+        /// PLC设备状态
+        /// </summary>
+        [ObservableProperty]
+        private int plcStatus = 0;
+
+        /// <summary>
+        /// 登录人员
+        /// </summary>
+        [ObservableProperty]
+        private string otherInfo;
+
+        /// <summary>
+        /// 系统标题
+        /// </summary>
+        [ObservableProperty]
+        private string systemTitle = string.Empty;
+
+        [ObservableProperty]
+        public System.Windows.Controls.UserControl userContent = new System.Windows.Controls.UserControl();
+
+        /// <summary>
+        /// 箱壳扫码器状态
+        /// </summary>
+        [ObservableProperty]
+        private int _shellScannerStatus = 0;
+
+        /// <summary>
+        /// 内胆扫码器状态
+        /// </summary>
+        [ObservableProperty]
+        private int _boldScannerStatus = 0;
+
+        #endregion
+
+
+        public MainWindowViewModel(SerilogHelper logger,GenerateControl generateControl)
+        {
+
+            _logger = logger;
+            _generateControl = generateControl;
+
+        }
+
+        /// <summary>
+        ///  窗体控制
+        /// </summary>
+        /// <param name="obj"></param>
+        [RelayCommand]
+        [RequirePermission("FormControl")]
+        private void FormControl(object obj)
+        {
+            try
+            {
+                string controlType = obj as string;
+                switch (controlType)
+                {
+                    // 关闭当前窗口
+                    case "Exit":
+                        //Environment.Exit(0);
+                        Application.Current.Shutdown();
+                        break;
+                    case "Generate":
+                        UserContent = _generateControl;
+                        break;
+                    // 还原 或者 最大化当前窗口
+                    case "Normal":
+                        if (Application.Current.MainWindow.WindowState == WindowState.Normal)
+                        {
+                            Application.Current.MainWindow.WindowState = WindowState.Maximized;
+                            break;
+                        }
+                        if (Application.Current.MainWindow.WindowState == WindowState.Maximized)
+                        {
+                            Application.Current.MainWindow.WindowState = WindowState.Normal;
+                            break;
+                        }
+                        break;
+
+                    // 最小化当前窗口
+                    case "Minimized":
+                        Application.Current.MainWindow.WindowState = WindowState.Minimized;
+                        break;
+                    default:
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.Error("窗体控制逻辑异常", ex);
+            }
+        }
+
+        /// <summary>
+        /// 界面跳转
+        /// </summary>
+        [RelayCommand]
+        private void ControlOnClick(object obj)
+        {
+            try
+            {
+                string info = obj as string;
+                //UserContent = inStoreInfoControl;
+            }
+            catch (Exception ex)
+            {
+                _logger.Error("界面跳转逻辑异常", ex);
+            }
+        }
+
+    }
+}

SlnMesnac.WPF/appsettings.json

@@ -0,0 +1,60 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "AppConfig": {
+    "logPath": "E:\\桌面\\SlnMesnac\\SlnMesnac.WPF\\bin\\Debug\\net6.0-windows",
+    "SqlConfig": [
+      {
+        "configId": "mes",
+        "dbType": 1,
+        "connStr": "server=.;uid=sa;pwd=123456;database=JiangYinMENS"
+      },
+      {
+        "configId": "mcs",
+        "dbType": 3,
+        "connStr": "Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma"
+      }
+    ],
+    "PlcConfig": [
+      {
+        "configId": 1,
+        "plcType": "MelsecBinaryPlc",
+        "plcIp": "127.0.0.1",
+        "plcPort": 6000,
+        "plcKey": "mcs",
+        "isFlage": true
+      },
+      {
+        "configId": 2,
+        "plcType": "MelsecBinaryPlc",
+        "plcIp": "127.0.0.1",
+        "plcPort": 6001,
+        "plcKey": "cwss",
+        "isFlage": true
+      }
+    ],
+    "RfidConfig": [
+      {
+        "configId": 1,
+        "equipIp": "127.0.0.1",
+        "equipPort": 6003,
+        "equipKey": "test1",
+        "isFlage": true
+      },
+      {
+        "configId": 2,
+        "equipIp": "127.0.0.1",
+        "equipPort": 6004,
+        "equipKey": "test2",
+        "isFlage": true
+      }
+    ],
+    "redisConfig": "175.27.215.92:6379,password=redis@2023"
+  }
+}

SlnMesnac.sln

@@ -0,0 +1,109 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33502.453
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.Common", "SlnMesnac.Common\SlnMesnac.Common.csproj", "{BB71F26A-7007-423E-83E9-7A3BAC25E934}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.Config", "SlnMesnac.Config\SlnMesnac.Config.csproj", "{6EF7F087-7149-4689-885C-E0D05E1A9AA8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.Model", "SlnMesnac.Model\SlnMesnac.Model.csproj", "{9EC081B6-971F-418C-A40C-5B8AD2E27417}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.Repository", "SlnMesnac.Repository\SlnMesnac.Repository.csproj", "{C892C06A-496B-43B6-AEC7-AF9D70778C0C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.Quartz", "SlnMesnac.Quartz\SlnMesnac.Quartz.csproj", "{12ED397C-951E-411C-9C43-CDABA79CA45B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.Serilog", "SlnMesnac.Serilog\SlnMesnac.Serilog.csproj", "{DEE2F305-733C-47C8-891C-502121ABAD00}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.Plc", "SlnMesnac.Plc\SlnMesnac.Plc.csproj", "{D17E9024-9D25-4CE4-8E98-8A6C859CE436}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.WPF", "SlnMesnac.WPF\SlnMesnac.WPF.csproj", "{B986555B-86D1-457A-95F5-B9135B9FBC55}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.Business", "SlnMesnac.Business\SlnMesnac.Business.csproj", "{90296C1E-932E-4CD3-9B11-4376746C4C87}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.TouchSocket", "SlnMesnac.TouchSocket\SlnMesnac.TouchSocket.csproj", "{3700E2BB-09C4-43C0-A9DC-C18137B76591}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.Mqtt", "SlnMesnac.Mqtt\SlnMesnac.Mqtt.csproj", "{7D908FF5-88AE-42AB-A193-F2896EF44AB1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.Rfid", "SlnMesnac.Rfid\SlnMesnac.Rfid.csproj", "{40D23A4B-8372-4145-936C-08AE63C6D1F9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.Generate", "SlnMesnac.Generate\SlnMesnac.Generate.csproj", "{00FC9358-2381-4C1B-BD45-6D31DD1DB7D3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.Extensions", "SlnMesnac.Extensions\SlnMesnac.Extensions.csproj", "{6D929802-24AA-42A7-92C5-303C3D59A990}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.Redis", "SlnMesnac.Redis\SlnMesnac.Redis.csproj", "{0E041719-E755-43CD-8A0E-DF62E0B2E463}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BB71F26A-7007-423E-83E9-7A3BAC25E934}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB71F26A-7007-423E-83E9-7A3BAC25E934}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB71F26A-7007-423E-83E9-7A3BAC25E934}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB71F26A-7007-423E-83E9-7A3BAC25E934}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6EF7F087-7149-4689-885C-E0D05E1A9AA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EF7F087-7149-4689-885C-E0D05E1A9AA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EF7F087-7149-4689-885C-E0D05E1A9AA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EF7F087-7149-4689-885C-E0D05E1A9AA8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9EC081B6-971F-418C-A40C-5B8AD2E27417}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EC081B6-971F-418C-A40C-5B8AD2E27417}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EC081B6-971F-418C-A40C-5B8AD2E27417}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9EC081B6-971F-418C-A40C-5B8AD2E27417}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C892C06A-496B-43B6-AEC7-AF9D70778C0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C892C06A-496B-43B6-AEC7-AF9D70778C0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C892C06A-496B-43B6-AEC7-AF9D70778C0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C892C06A-496B-43B6-AEC7-AF9D70778C0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12ED397C-951E-411C-9C43-CDABA79CA45B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12ED397C-951E-411C-9C43-CDABA79CA45B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12ED397C-951E-411C-9C43-CDABA79CA45B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12ED397C-951E-411C-9C43-CDABA79CA45B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DEE2F305-733C-47C8-891C-502121ABAD00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEE2F305-733C-47C8-891C-502121ABAD00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEE2F305-733C-47C8-891C-502121ABAD00}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEE2F305-733C-47C8-891C-502121ABAD00}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D17E9024-9D25-4CE4-8E98-8A6C859CE436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D17E9024-9D25-4CE4-8E98-8A6C859CE436}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D17E9024-9D25-4CE4-8E98-8A6C859CE436}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D17E9024-9D25-4CE4-8E98-8A6C859CE436}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B986555B-86D1-457A-95F5-B9135B9FBC55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B986555B-86D1-457A-95F5-B9135B9FBC55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B986555B-86D1-457A-95F5-B9135B9FBC55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B986555B-86D1-457A-95F5-B9135B9FBC55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90296C1E-932E-4CD3-9B11-4376746C4C87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90296C1E-932E-4CD3-9B11-4376746C4C87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90296C1E-932E-4CD3-9B11-4376746C4C87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90296C1E-932E-4CD3-9B11-4376746C4C87}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3700E2BB-09C4-43C0-A9DC-C18137B76591}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3700E2BB-09C4-43C0-A9DC-C18137B76591}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3700E2BB-09C4-43C0-A9DC-C18137B76591}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3700E2BB-09C4-43C0-A9DC-C18137B76591}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D908FF5-88AE-42AB-A193-F2896EF44AB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D908FF5-88AE-42AB-A193-F2896EF44AB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D908FF5-88AE-42AB-A193-F2896EF44AB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D908FF5-88AE-42AB-A193-F2896EF44AB1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40D23A4B-8372-4145-936C-08AE63C6D1F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40D23A4B-8372-4145-936C-08AE63C6D1F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40D23A4B-8372-4145-936C-08AE63C6D1F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40D23A4B-8372-4145-936C-08AE63C6D1F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00FC9358-2381-4C1B-BD45-6D31DD1DB7D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00FC9358-2381-4C1B-BD45-6D31DD1DB7D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00FC9358-2381-4C1B-BD45-6D31DD1DB7D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00FC9358-2381-4C1B-BD45-6D31DD1DB7D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D929802-24AA-42A7-92C5-303C3D59A990}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D929802-24AA-42A7-92C5-303C3D59A990}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D929802-24AA-42A7-92C5-303C3D59A990}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D929802-24AA-42A7-92C5-303C3D59A990}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E041719-E755-43CD-8A0E-DF62E0B2E463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E041719-E755-43CD-8A0E-DF62E0B2E463}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E041719-E755-43CD-8A0E-DF62E0B2E463}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E041719-E755-43CD-8A0E-DF62E0B2E463}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D414D640-C2DE-44E2-930E-DD095881CDC1}
+	EndGlobalSection
+EndGlobal