diff --git a/SlnMesnac.Business/SlnMesnac.Business.csproj b/SlnMesnac.Business/SlnMesnac.Business.csproj index 4e2cf5e..6f829ce 100644 --- a/SlnMesnac.Business/SlnMesnac.Business.csproj +++ b/SlnMesnac.Business/SlnMesnac.Business.csproj @@ -7,7 +7,6 @@ - diff --git a/SlnMesnac.Business/base/BaseBusiness.cs b/SlnMesnac.Business/base/BaseBusiness.cs index 644ff4d..5e4deb8 100644 --- a/SlnMesnac.Business/base/BaseBusiness.cs +++ b/SlnMesnac.Business/base/BaseBusiness.cs @@ -1,9 +1,7 @@ using SlnMesnac.Plc; -using SlnMesnac.Rfid; using System; using System.Collections.Generic; using System.Linq; -using System.Text; #region << 版 本 注 释 >> /*-------------------------------------------------------------------- @@ -33,12 +31,10 @@ namespace SlnMesnac.Business.@base { private readonly List _plcFactories; - private readonly List _rfidFactories; - public BaseBusiness(List plcFactories, List rfidFactories) + public BaseBusiness(List plcFactories) { _plcFactories = plcFactories; - _rfidFactories = rfidFactories; } /// @@ -70,37 +66,6 @@ namespace SlnMesnac.Business.@base throw new InvalidOperationException($"根据Key获取PLC连接信息异常:{ex.Message}"); } } - - - /// - /// 根据Key获取Rfid连接信息 - /// - /// - /// - /// - /// - 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}"); - } - } + } } diff --git a/SlnMesnac.Extensions/RfidFactorySetup.cs b/SlnMesnac.Extensions/RfidFactorySetup.cs deleted file mode 100644 index ac5e29f..0000000 --- a/SlnMesnac.Extensions/RfidFactorySetup.cs +++ /dev/null @@ -1,87 +0,0 @@ -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>(x => - { - AppConfig appConfig = x.GetService(); - List absractFactories = new List(); - - try - { - if (appConfig.rfidConfig != null) - { - foreach (var item in appConfig.rfidConfig) - { - if (item.isFlage) - { - RfidAbsractFactory _rfid = x.GetService(); - 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; - }); - } - } -} diff --git a/SlnMesnac.Extensions/SlnMesnac.Extensions.csproj b/SlnMesnac.Extensions/SlnMesnac.Extensions.csproj index cd6c9bd..15c2ef8 100644 --- a/SlnMesnac.Extensions/SlnMesnac.Extensions.csproj +++ b/SlnMesnac.Extensions/SlnMesnac.Extensions.csproj @@ -8,7 +8,7 @@ - + diff --git a/SlnMesnac.Ioc/DependencyConfigurator.cs b/SlnMesnac.Ioc/DependencyConfigurator.cs index 6234bb9..c7d2db9 100644 --- a/SlnMesnac.Ioc/DependencyConfigurator.cs +++ b/SlnMesnac.Ioc/DependencyConfigurator.cs @@ -45,9 +45,6 @@ namespace SlnMesnac.Ioc //注入Plc RegisterTypeTransient(builder, Assembly.LoadFrom("SlnMesnac.Plc.dll")); - //注入Rfid - RegisterTypeTransient(builder, Assembly.LoadFrom("SlnMesnac.Rfid.dll")); - //注入通用类 RegisterType(builder, Assembly.LoadFrom("SlnMesnac.Common.dll")); diff --git a/SlnMesnac.Redis/RedisHandler.cs b/SlnMesnac.Redis/RedisHandler.cs deleted file mode 100644 index 4b0331c..0000000 --- a/SlnMesnac.Redis/RedisHandler.cs +++ /dev/null @@ -1,92 +0,0 @@ -using Microsoft.Extensions.Logging; -using SlnMesnac.Config; -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 ILogger _logger; - - private readonly AppConfig _appConfig; - - private readonly ISubscriber _subscriber; - - private readonly ConnectionMultiplexer redis; - - public RedisHandler(AppConfig appConfig, ILogger logger) - { - _appConfig = appConfig; - - redis = ConnectionMultiplexer.Connect(_appConfig.redisConfig); - _subscriber = redis.GetSubscriber(); - _logger = logger; - } - - - - /// - /// 推送消息 - /// - /// - /// - public void PublishMessage(string channel, string message) - { - long res = _subscriber.Publish(channel, message); - - _logger.LogInformation($"向主题:{channel};推送消息:{message};结果:{res}"); - } - - /// - /// 订阅消息 - /// - /// - /// - public void SubscribeToChannel(string channel, Action onMessageReceived) - { - _subscriber.Subscribe(channel, (ch, message) => - { - onMessageReceived(ch, message); - _logger.LogInformation($"订阅主题:{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); - } - } -} diff --git a/SlnMesnac.Redis/SlnMesnac.Redis.csproj b/SlnMesnac.Redis/SlnMesnac.Redis.csproj deleted file mode 100644 index 96001b0..0000000 --- a/SlnMesnac.Redis/SlnMesnac.Redis.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netstandard2.1 - enable - - - - - - - - - - - diff --git a/SlnMesnac.Rfid/Dto/MessagePack.cs b/SlnMesnac.Rfid/Dto/MessagePack.cs deleted file mode 100644 index 284d42f..0000000 --- a/SlnMesnac.Rfid/Dto/MessagePack.cs +++ /dev/null @@ -1,31 +0,0 @@ -#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; //结束包 - } -} \ No newline at end of file diff --git a/SlnMesnac.Rfid/Enum/RecvState.cs b/SlnMesnac.Rfid/Enum/RecvState.cs deleted file mode 100644 index f9f1708..0000000 --- a/SlnMesnac.Rfid/Enum/RecvState.cs +++ /dev/null @@ -1,43 +0,0 @@ -#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 - } -} \ No newline at end of file diff --git a/SlnMesnac.Rfid/Factory/RflyFactory.cs b/SlnMesnac.Rfid/Factory/RflyFactory.cs deleted file mode 100644 index 27f015a..0000000 --- a/SlnMesnac.Rfid/Factory/RflyFactory.cs +++ /dev/null @@ -1,483 +0,0 @@ -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 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 ILogger _logger; - private readonly TcpClient _tcpClient = new TcpClient(); - private readonly StringChange _stringChange; - - public RflyFactory(ILogger logger,StringChange stringChange) - { - _logger = logger; - _stringChange = stringChange; - } - - /// - /// 建立连接 - /// - /// - /// - /// - /// - 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}"); - } - } - - /// - /// 按时间段盘点 - /// - /// - /// - /// - public override List 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.LogInformation($"接收原始报文：{_stringChange.bytesToHexStr(reciveBuffer,reciveBuffer.Length)}"); - - byte[] resultBuffer = PareReceiveBufferData(reciveBuffer,reciveBuffer.Length); - - List tagInfoList = Device_DealTagInfoList(resultBuffer); - - return tagInfoList; - } - catch (Exception e) - { - throw new InvalidOperationException($"按时间段盘点异常：{e.Message}"); - } - } - - #region 标签解析 - - /// - /// 状态机函数 - /// - /// - /// - /// - /// - 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(); - /// - /// 解析函数 - /// - /// - /// - /// - public List Device_DealTagInfoList(byte[] AutoDealReportData) - { - List tagInfoList = new List(); - 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.LogInformation("----函数调用:Device_DealTagInfoList 第[" + (iCommonSecondFlag + 1) + "]次数据解析为：" + tag.EPCstring + ",读取标签次数：[" + tempDataCount + "],标签信号强度：[" + tempDataRSSI + "],天线号：[" + tempDataANT + "]"); - iCommonSecondFlag++; - if (iCommonSecondFlag == iBarcodeGroupCount) - { - mutauto.ReleaseMutex(); - _logger.LogInformation("《《《返回标签数据！"); - return tagInfoList; - } - } - return tagInfoList; - } - catch (Exception ex) - { - mutauto.ReleaseMutex(); - throw new InvalidOperationException($"Device_AutoDealContent 自动处理函数异常:{ex.Message}"); - } - } - - /// - /// 根据PC获取EPC长度 - /// - /// - /// - 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 - } -} \ No newline at end of file diff --git a/SlnMesnac.Rfid/RfidAbsractFactory.cs b/SlnMesnac.Rfid/RfidAbsractFactory.cs deleted file mode 100644 index 2a2c1b7..0000000 --- a/SlnMesnac.Rfid/RfidAbsractFactory.cs +++ /dev/null @@ -1,52 +0,0 @@ -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 -{ - /// - /// RFID抽象工厂 - /// - public abstract class RfidAbsractFactory - { - - public string ConfigKey { get; set; } - - /// - /// 建立连接 - /// - /// - /// - /// - public abstract bool Connect(string ip, int port); - - /// - /// 按时间段盘点 - /// - /// - /// - public abstract List TimePeriodRead(int timeout = 5000); - } -} \ No newline at end of file diff --git a/SlnMesnac.Rfid/SlnMesnac.Rfid.csproj b/SlnMesnac.Rfid/SlnMesnac.Rfid.csproj deleted file mode 100644 index ac2b62d..0000000 --- a/SlnMesnac.Rfid/SlnMesnac.Rfid.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - netstandard2.1 - enable - - - - - - - - - diff --git a/SlnMesnac.WPF/App.xaml.cs b/SlnMesnac.WPF/App.xaml.cs index ec3de3a..429d2bb 100644 --- a/SlnMesnac.WPF/App.xaml.cs +++ b/SlnMesnac.WPF/App.xaml.cs @@ -7,9 +7,6 @@ using SlnMesnac.Config; using System; using System.Windows; using Autofac.Extensions.DependencyInjection; -using SlnMesnac.Plc; -using System.Collections.Generic; -using SlnMesnac.Rfid; namespace SlnMesnac.WPF { diff --git a/SlnMesnac.WPF/SlnMesnac.WPF.csproj b/SlnMesnac.WPF/SlnMesnac.WPF.csproj index 13b1f23..dd5a109 100644 --- a/SlnMesnac.WPF/SlnMesnac.WPF.csproj +++ b/SlnMesnac.WPF/SlnMesnac.WPF.csproj @@ -30,7 +30,6 @@ - diff --git a/SlnMesnac.WPF/Startup.cs b/SlnMesnac.WPF/Startup.cs index e4251dc..27d6fb0 100644 --- a/SlnMesnac.WPF/Startup.cs +++ b/SlnMesnac.WPF/Startup.cs @@ -3,14 +3,11 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using SlnMesnac.Config; -using SlnMesnac.Repository; using SlnMesnac.Serilog; using System; using Autofac; using Microsoft.Extensions.Configuration; -using SlnMesnac.Rfid; using SlnMesnac.Ioc; -using SlnMesnac.Plc; using SlnMesnac.Extensions; using SlnMesnac.TouchSocket; @@ -44,8 +41,6 @@ namespace SlnMesnac.WPF //注册PLC工厂 services.AddPlcFactorySetup(); - //注册RFID工厂 - services.AddRfidFactorySetup(); } /// diff --git a/SlnMesnac.sln b/SlnMesnac.sln index b713cfb..42f809c 100644 --- a/SlnMesnac.sln +++ b/SlnMesnac.sln @@ -3,8 +3,6 @@ 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", "SlnMesnac\SlnMesnac.csproj", "{19445879-B3F3-4C76-A670-EFAE9E25BAB4}" -EndProject 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}" @@ -27,15 +25,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.TouchSocket", "Sl 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.Ioc", "SlnMesnac.Ioc\SlnMesnac.Ioc.csproj", "{30A3F86B-774E-4153-9A00-FD3173C710EB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.Generate", "SlnMesnac.Generate\SlnMesnac.Generate.csproj", "{00FC9358-2381-4C1B-BD45-6D31DD1DB7D3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SlnMesnac.Extensions", "SlnMesnac.Extensions\SlnMesnac.Extensions.csproj", "{6D929802-24AA-42A7-92C5-303C3D59A990}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SlnMesnac.Redis", "SlnMesnac.Redis\SlnMesnac.Redis.csproj", "{0E041719-E755-43CD-8A0E-DF62E0B2E463}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.Extensions", "SlnMesnac.Extensions\SlnMesnac.Extensions.csproj", "{6D929802-24AA-42A7-92C5-303C3D59A990}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -43,10 +37,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {19445879-B3F3-4C76-A670-EFAE9E25BAB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19445879-B3F3-4C76-A670-EFAE9E25BAB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19445879-B3F3-4C76-A670-EFAE9E25BAB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19445879-B3F3-4C76-A670-EFAE9E25BAB4}.Release|Any CPU.Build.0 = Release|Any CPU {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 @@ -91,10 +81,6 @@ Global {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 {30A3F86B-774E-4153-9A00-FD3173C710EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {30A3F86B-774E-4153-9A00-FD3173C710EB}.Debug|Any CPU.Build.0 = Debug|Any CPU {30A3F86B-774E-4153-9A00-FD3173C710EB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,10 +93,6 @@ Global {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 diff --git a/SlnMesnac/Controllers/BaseMaterialInfoController.cs b/SlnMesnac/Controllers/BaseMaterialInfoController.cs deleted file mode 100644 index 57d541b..0000000 --- a/SlnMesnac/Controllers/BaseMaterialInfoController.cs +++ /dev/null @@ -1,90 +0,0 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using SlnMesnac.Model.domain; -using SlnMesnac.Repository.service; - -namespace SlnMesnac.Controllers -{ - /// - /// 物料信息 - /// - [Route("api/[controller]")] - [ApiController] - public class BaseMaterialInfoController - { - private ILogger _logger; - - private IBaseMaterialService _service; - - /// - /// - /// - /// - /// - public BaseMaterialInfoController(ILogger logger, IBaseMaterialService service) - { - _logger = logger; - _service = service; - } - - /// - /// 获取物料信息 - /// - /// - [HttpGet] - public IEnumerable Get() - { - IEnumerable materialInfos = null; - try - { - materialInfos = _service.GetMaterialInfos(); - } - catch (Exception ex) - { - _logger.LogError($"获取物料信息接口调用异常:{ex.Message}"); - } - return materialInfos; - } - - /// - /// 根据物料编号获取物料信息 - /// - /// 物料编号 - /// - [HttpGet("Get/{materialCode}")] - public BaseMaterialInfo GetMaterialInfoByMaterialCode(string materialCode) - { - BaseMaterialInfo materialInfo = null; - try - { - materialInfo = _service.GetMaterialInfoByMaterialCode(materialCode); - } - catch (Exception ex) - { - _logger.LogError($"根据物料编号获取物料信息接口调用异常:{ex.Message}"); - } - return materialInfo; - } - - /// - /// 通过物料类别获取物料信息 - /// - /// 物料大类 - /// 物料细类 - /// - [HttpGet("Get/{majorTypeId}/{minorTypeId}")] - public IEnumerable GetMaterialInfosByMaterialType(int majorTypeId, string minorTypeId) - { - IEnumerable materialInfos = null; - try - { - materialInfos = _service.GetMaterialInfosByMaterialType(majorTypeId, minorTypeId); - } - catch (Exception ex) - { - _logger.LogError($"通过物料类别获取物料信息接口调用异常:{ex.Message}"); - } - return materialInfos; - } - } -} diff --git a/SlnMesnac/Controllers/BaseUserController.cs b/SlnMesnac/Controllers/BaseUserController.cs deleted file mode 100644 index 3cdd7e0..0000000 --- a/SlnMesnac/Controllers/BaseUserController.cs +++ /dev/null @@ -1,81 +0,0 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using SlnMesnac.Model.domain; -using SlnMesnac.Plc; -using SlnMesnac.Repository.service; - -namespace SlnMesnac.Controllers -{ - /// - /// 人员基础信息 - /// - [Route("api/[controller]")] - [ApiController] - public class BaseUserController : ControllerBase - { - private readonly ILogger _logger; - - private readonly IBaseUserService _service; - - /// - /// - /// - /// - /// - public BaseUserController(ILogger logger, IBaseUserService service) - { - _logger = logger; - _service = service; - } - - /// - /// 获取人员基础信息 - /// - /// - [HttpGet] - public IEnumerable Get() - { - IEnumerable users = null; - try - { - users = _service.GetUsers(); - } - catch (Exception ex) - { - _logger.LogError($"获取用户信息接口调用异常:{ex.Message}"); - } - return users; - } - - /// - /// 通过用户名称获取指定用户信息 - /// - /// 用户名称 - /// - [HttpGet("Gets/{userName}")] - public IEnumerable GetUserByUserName(string userName) - { - IEnumerable users = null; - try - { - users = _service.GetUsers(); - } - catch (Exception ex) - { - _logger.LogError($"获取用户信息接口调用异常:{ex.Message}"); - } - return users; - } - - /// - /// 添加用户信息 - /// - /// 用户列表 - /// - [HttpPut] - public bool InsertUserInfo(List users) - { - return _service.InsertUsers(users); - } - } -} diff --git a/SlnMesnac/Controllers/JobController.cs b/SlnMesnac/Controllers/JobController.cs deleted file mode 100644 index e0be503..0000000 --- a/SlnMesnac/Controllers/JobController.cs +++ /dev/null @@ -1,61 +0,0 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Quartz; - -namespace SlnMesnac.Controllers -{ - /// - /// 任务调度 - /// - [ApiController] - [Route("api/[controller]")] - public class JobController - { - private readonly IScheduler _scheduler; - - /// - /// - /// - /// - public JobController(IScheduler scheduler) - { - _scheduler = scheduler; - } - - /// - /// 启动任务 - /// - /// 任务名称 - /// 任务分组 - /// - [HttpPost("start")] - public async Task StartJob(string jobName, string groupName) - { - // 检查调度器是否已经启动 - if (!_scheduler.IsStarted) - { - await _scheduler.Start(); - } - - var myJobKey = new JobKey(jobName, groupName); - await _scheduler.ResumeJob(myJobKey); - - return "Job started successfully."; - } - - /// - /// 停止任务 - /// - /// 任务名称 - /// 任务分组 - /// - [HttpPost("stop")] - public async Task StopJob(string jobName, string groupName) - { - var myJobKey = new JobKey(jobName, groupName); - await _scheduler.PauseJob(myJobKey); - - return "Job stopped successfully."; - } - } -} \ No newline at end of file diff --git a/SlnMesnac/Program.cs b/SlnMesnac/Program.cs deleted file mode 100644 index b76cbf2..0000000 --- a/SlnMesnac/Program.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Serilog; - -namespace SlnMesnac -{ - /// - /// - /// - public class Program - { - /// - /// Main - /// - /// - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } - - /// - /// CreateHostBuilder - /// - /// - /// - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .UseSerilog() - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }); - } -} \ No newline at end of file diff --git a/SlnMesnac/Properties/launchSettings.json b/SlnMesnac/Properties/launchSettings.json deleted file mode 100644 index 3f9dcb9..0000000 --- a/SlnMesnac/Properties/launchSettings.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "$schema": "http://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:32147", - "sslPort": 44302 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - //"launchUrl": "swagger", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "SlnMesnac": { - "commandName": "Project", - "launchBrowser": true, - //"launchUrl": "swagger", - "applicationUrl": "http://localhost:5000", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} diff --git a/SlnMesnac/SlnMesnac.csproj b/SlnMesnac/SlnMesnac.csproj deleted file mode 100644 index 191e4dc..0000000 --- a/SlnMesnac/SlnMesnac.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - net6.0 - enable - enable - True - - - - - - - - - - - - - - - - - diff --git a/SlnMesnac/Startup.cs b/SlnMesnac/Startup.cs deleted file mode 100644 index 14525f4..0000000 --- a/SlnMesnac/Startup.cs +++ /dev/null @@ -1,121 +0,0 @@ -using Microsoft.OpenApi.Models; -using SlnMesnac.Config; -using SlnMesnac.Quartz; -using SlnMesnac.Serilog; -using SlnMesnac.Extensions; -using System.Runtime.Serialization; - -namespace SlnMesnac -{ - /// - /// - /// - public class Startup - { - /// - /// - /// - /// - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - /// - /// - /// - public IConfiguration Configuration { get; } - - /// - /// This method gets called by the runtime. Use this method to add services to the container. - /// - /// - [Obsolete] - public void ConfigureServices(IServiceCollection services) - { - services.AddControllers(); - - //配置Swagger - services.AddSwaggerGen(swagger => - { - //自定义接口信息 - swagger.SwaggerDoc("V1.0", new OpenApiInfo - { - Title = "MES Web Api", - Version = "V1.0", - Description = $"API版本V1.0", - Contact = new OpenApiContact - { - Name = "MES Web Api", - Email = "wenjy@mesnac.com" - } - }); - - //自定义实体别名 - swagger.CustomSchemaIds(type => type.GetCustomAttributes(typeof(DataContractAttribute), true) - .Cast() - .FirstOrDefault()?.Name); - - //配置Action名称 - var path = Path.Combine(AppContext.BaseDirectory, "SlnMesnac.xml"); - swagger.IncludeXmlComments(path, true); // true : 显示控制器层注释 - swagger.OrderActionsBy(o => o.RelativePath); // 对action的名称进行排序，如果有多个，就可以看见效果了。 - }); - - //注册配置类 - services.AddSingleton(provider => - { - var configuration = provider.GetService(); - return configuration.GetSection("AppConfig").Get(); - - }); - - - //注册SqlSugar - services.AddSqlSugarSetup(); - - //注册服务 - //services.AddServices(); - - //注册任务调度 - services.AddQuartzSetUp(); - - } - - /// - /// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - /// - /// - /// - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - - //启用Swagger中间件 - app.UseSwagger(); - app.UseSwaggerUI(c => - { - c.SwaggerEndpoint("/swagger/V1.0/swagger.json", "MES Web Api V1.0"); - c.RoutePrefix = ""; - }); - - //启用Serilog中间件 - app.UseSerilogExtensions(); - - //app.UseHttpsRedirection(); - - app.UseRouting(); - - app.UseAuthorization(); - - app.UseEndpoints(endpoints => - { - endpoints.MapControllers(); - }); - - } - } -} diff --git a/SlnMesnac/appsettings.Development.json b/SlnMesnac/appsettings.Development.json deleted file mode 100644 index 0c208ae..0000000 --- a/SlnMesnac/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/SlnMesnac/appsettings.json b/SlnMesnac/appsettings.json deleted file mode 100644 index d05c71e..0000000 --- a/SlnMesnac/appsettings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "AllowedHosts": "*", - "AppConfig": { - "logPath": "E:\\桌面\\日常代码\\SlnMesnac\\SlnMesnac\\bin\\Debug\\net6.0", - "mesConnStr": "server=.;uid=sa;pwd=123456;database=JiangYinMENS", - "mcsConnStr": "Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma" - } -}