wangsr
/
Shihong-Delta.Injection.Iot
generated from wenjy/Sln.Iot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 设备调试优化

Browse Source
CFXTest
SoulStar 4 months ago
parent 2ee0322951
commit b340b4c216
22 changed files with 929 additions and 684 deletions
Show Stats Download Patch File Download Diff File

64
Sln.Iot.Business/ErrorAnalyseBusiness.cs
Unescape Escape View File

@ -16,6 +16,7 @@ using CFX;
using CFX.Structures; using CFX.Structures;
using Sln.Iot.Serilog; using Sln.Iot.Serilog;
using Amqp; using Amqp;
using TouchSocket.Core;
namespace Sln.Iot.Business namespace Sln.Iot.Business
{ {
@ -46,50 +47,57 @@ namespace Sln.Iot.Business
/// </summary> /// </summary>
/// <param name="state"></param> /// <param name="state"></param>
public void TimerCallback(object? state) public void TimerCallback(object? state)
{
try
{ {
byte[] errorBytes1 = new byte[1]; byte[] errorBytes1 = new byte[1];
//隧道烤箱报警 //隧道烤箱报警
var result20 = _plc.ReadBytes(_plc.DeltaInstance0, "D100", 1); var result20 = _plc.ReadBytes(_plc.DeltaInstance0, "D100", 1);
//真空箱1报警 //真空箱1报警
var result21 = _plc.ReadBytes(_plc.DeltaInstance1, "D80", 10); var result21 = _plc.ReadBytes(_plc.DeltaInstance1, "D80", 11);
//真空箱2报警 //真空箱2报警
var result22 = _plc.ReadBytes(_plc.DeltaInstance2, "D80", 10); var result22 = _plc.ReadBytes(_plc.DeltaInstance2, "D80", 11);
//提升机报警 //提升机报警
var result23 = _plc.ReadBytes(_plc.DeltaInstance3, "D100", 1); var result23 = _plc.ReadBytes(_plc.DeltaInstance3, "D100", 1);
if (result20.IsSuccess) if (result20.IsSuccess && result20.Content != null)
{ {
BitArray bits20 = new BitArray(result20.Content); BitArray bits20 = new BitArray(ToolBusiness.SwapAdjacentBytes(result20.Content));
bool[] bools20 = new bool[bits20.Count]; bool[] bools20 = new bool[bits20.Count];
bits20.CopyTo(bools20, 0); bits20.CopyTo(bools20, 0);
OvenAlarmAnalyse(bools20); OvenAlarmAnalyse(bools20);
} }
if (result20.IsSuccess) if (result21.IsSuccess && result21.Content != null)
{ {
BitArray bits21 = new BitArray(result21.Content); BitArray bits21 = new BitArray(ToolBusiness.SwapAdjacentBytes(result21.Content));
bool[] bools21 = new bool[bits21.Count]; bool[] bools21 = new bool[bits21.Count];
bits21.CopyTo(bools21, 0); bits21.CopyTo(bools21, 0);
VacuumAlarm1Analyse(bools21); VacuumAlarm1Analyse(bools21);
} }
if (result20.IsSuccess) if (result22.IsSuccess && result22.Content != null)
{ {
BitArray bits22 = new BitArray(result22.Content); BitArray bits22 = new BitArray(ToolBusiness.SwapAdjacentBytes(result22.Content));
bool[] bools22 = new bool[bits22.Count]; bool[] bools22 = new bool[bits22.Count];
bits22.CopyTo(bools22, 0); bits22.CopyTo(bools22, 0);
VacuumAlarm2Analyse(bools22); VacuumAlarm2Analyse(bools22);
} }
if (result20.IsSuccess) if (result23.IsSuccess && result23.Content != null)
{ {
BitArray bits23 = new BitArray(result23.Content); BitArray bits23 = new BitArray(ToolBusiness.SwapAdjacentBytes(result23.Content));
bool[] bools23 = new bool[bits23.Count]; bool[] bools23 = new bool[bits23.Count];
bits23.CopyTo(bools23, 0); bits23.CopyTo(bools23, 0);
LiftAlarmAnalyse(bools23); LiftAlarmAnalyse(bools23);
} }
} }
catch (Exception ex)
{
_log.Error("报警信息处理发生错误", ex);
}
}
/// <summary> /// <summary>
@ -108,11 +116,11 @@ namespace Sln.Iot.Business
//如果原来没有 现在有 添加错误 //如果原来没有 现在有 添加错误
if (errorList.Where(x => x.ErrorName == errorMessage.ENAlarmMessage).Count() == 0) if (errorList.Where(x => x.ErrorName == errorMessage.ENAlarmMessage).Count() == 0)
{ {
Guid transID = Guid.Parse(trayBindingService.TidGet()); Guid.TryParse(trayBindingService.TidGet(), out Guid transID);
Guid logGuid = Guid.NewGuid(); Guid logGuid = Guid.NewGuid();
errorService.InsertVacuum1Error(logGuid.ToString(), errorMessage.ENAlarmMessage, errorMessage.CNAlarmMessage, errorMessage.ErrorCode); errorService.InsertVacuum1Error(logGuid.ToString(), errorMessage.ENAlarmMessage, errorMessage.CNAlarmMessage, errorMessage.ErrorCode);
connect1.PublishEvent(new CFXEnvelope(faultOccurredEvent.Handle(errorMessage.ErrorCode, LevelTrans(errorMessage.AlarmDegarde), logGuid, errorMessage.ENAlarmMessage + "-Vacuum1", transID))); connect1.PublishEvent(new CFXEnvelope(faultOccurredEvent.Handle(errorMessage.ErrorCode, LevelTrans(errorMessage.AlarmDegarde), logGuid, errorMessage.ENAlarmMessage + "-Vacuum1", transID)));
_log.Info($"报警发生 内容:{errorMessage.CNAlarmMessage}"); _log.Info($"真空箱1报警发生 内容:{errorMessage.CNAlarmMessage} 级别:{errorMessage.AlarmDegarde.GetDescription()}");
} }
} }
else else
@ -122,8 +130,9 @@ namespace Sln.Iot.Business
{ {
//删除错误 //删除错误
string delGuid = errorService.DeleteVacuum2Error(errorMessage.ENAlarmMessage); string delGuid = errorService.DeleteVacuum2Error(errorMessage.ENAlarmMessage);
connect1.PublishEvent(new CFXEnvelope(faultClearedEvent.Handle(Guid.Parse(delGuid)))); Guid.TryParse(delGuid, out Guid guidRes);
_log.Info($"报警消除 内容:{errorMessage.CNAlarmMessage}"); connect1.PublishEvent(new CFXEnvelope(faultClearedEvent.Handle(guidRes)));
_log.Info($"真空箱1报警消除 内容:{errorMessage.CNAlarmMessage} 级别:{errorMessage.AlarmDegarde.GetDescription()}");
} }
} }
} }
@ -145,11 +154,11 @@ namespace Sln.Iot.Business
//如果原来没有 现在有 添加错误 //如果原来没有 现在有 添加错误
if (errorList.Where(x => x.ErrorName == errorMessage.ENAlarmMessage).Count() == 0) if (errorList.Where(x => x.ErrorName == errorMessage.ENAlarmMessage).Count() == 0)
{ {
Guid transID = Guid.Parse(trayBindingService.TidGet()); Guid.TryParse(trayBindingService.TidGet(), out Guid transID);
Guid logGuid = Guid.NewGuid(); Guid logGuid = Guid.NewGuid();
errorService.InsertVacuum2Error(logGuid.ToString(), errorMessage.ENAlarmMessage, errorMessage.CNAlarmMessage, errorMessage.ErrorCode); errorService.InsertVacuum2Error(logGuid.ToString(), errorMessage.ENAlarmMessage, errorMessage.CNAlarmMessage, errorMessage.ErrorCode);
connect1.PublishEvent(new CFXEnvelope(faultOccurredEvent.Handle(errorMessage.ErrorCode, LevelTrans(errorMessage.AlarmDegarde), logGuid, errorMessage.ENAlarmMessage + "-Vacuum2", transID))); connect1.PublishEvent(new CFXEnvelope(faultOccurredEvent.Handle(errorMessage.ErrorCode, LevelTrans(errorMessage.AlarmDegarde), logGuid, errorMessage.ENAlarmMessage + "-Vacuum2", transID)));
_log.Info($"报警发生 内容:{errorMessage.CNAlarmMessage}"); _log.Info($"真空箱2报警发生 内容:{errorMessage.CNAlarmMessage} 级别:{errorMessage.AlarmDegarde.GetDescription()}");
} }
} }
else else
@ -159,8 +168,9 @@ namespace Sln.Iot.Business
{ {
//删除错误 //删除错误
string delGuid = errorService.DeleteVacuum2Error(errorMessage.ENAlarmMessage); string delGuid = errorService.DeleteVacuum2Error(errorMessage.ENAlarmMessage);
connect1.PublishEvent(new CFXEnvelope(faultClearedEvent.Handle(Guid.Parse(delGuid)))); Guid.TryParse(delGuid, out Guid guidRes);
_log.Info($"报警消除 内容:{errorMessage.CNAlarmMessage}"); connect1.PublishEvent(new CFXEnvelope(faultClearedEvent.Handle(guidRes)));
_log.Info($"真空箱2报警消除 内容:{errorMessage.CNAlarmMessage} 级别:{errorMessage.AlarmDegarde.GetDescription()}");
} }
} }
} }
@ -182,11 +192,11 @@ namespace Sln.Iot.Business
//如果原来没有 现在有 添加错误 //如果原来没有 现在有 添加错误
if (errorList.Where(x => x.ErrorName == errorMessage.ENAlarmMessage).Count() == 0) if (errorList.Where(x => x.ErrorName == errorMessage.ENAlarmMessage).Count() == 0)
{ {
Guid transID = Guid.Parse(trayBindingService.TidGet()); Guid.TryParse(trayBindingService.TidGet(), out Guid transID);
Guid logGuid = Guid.NewGuid(); Guid logGuid = Guid.NewGuid();
errorService.InsertLiftError(logGuid.ToString(), errorMessage.ENAlarmMessage, errorMessage.CNAlarmMessage, errorMessage.ErrorCode); errorService.InsertLiftError(logGuid.ToString(), errorMessage.ENAlarmMessage, errorMessage.CNAlarmMessage, errorMessage.ErrorCode);
connect2.PublishEvent(new CFXEnvelope(faultOccurredEvent.Handle(errorMessage.ErrorCode, LevelTrans(errorMessage.AlarmDegarde), logGuid, errorMessage.ENAlarmMessage, transID))); connect2.PublishEvent(new CFXEnvelope(faultOccurredEvent.Handle(errorMessage.ErrorCode, LevelTrans(errorMessage.AlarmDegarde), logGuid, errorMessage.ENAlarmMessage, transID)));
_log.Info($"报警发生 内容:{errorMessage.CNAlarmMessage}"); _log.Info($"提升机报警发生 内容:{errorMessage.CNAlarmMessage} 级别:{errorMessage.AlarmDegarde.GetDescription()}");
} }
} }
else else
@ -196,8 +206,9 @@ namespace Sln.Iot.Business
{ {
//删除错误 //删除错误
string delGuid = errorService.DeleteliftError(errorMessage.ENAlarmMessage); string delGuid = errorService.DeleteliftError(errorMessage.ENAlarmMessage);
connect2.PublishEvent(new CFXEnvelope(faultClearedEvent.Handle(Guid.Parse(delGuid)))); Guid.TryParse(delGuid, out Guid guidRes);
_log.Info($"报警消除 内容:{errorMessage.CNAlarmMessage}"); connect2.PublishEvent(new CFXEnvelope(faultClearedEvent.Handle(guidRes)));
_log.Info($"提升机报警消除 内容:{errorMessage.CNAlarmMessage} 级别:{errorMessage.AlarmDegarde.GetDescription()}");
} }
} }
} }
@ -219,11 +230,11 @@ namespace Sln.Iot.Business
//如果原来没有 现在有 添加错误 //如果原来没有 现在有 添加错误
if (errorList.Where(x => x.ErrorName == errorMessage.ENAlarmMessage).Count() == 0) if (errorList.Where(x => x.ErrorName == errorMessage.ENAlarmMessage).Count() == 0)
{ {
Guid transID = Guid.Parse(trayBindingService.TidGet()); Guid.TryParse(trayBindingService.TidGet(), out Guid transID);
Guid logGuid = Guid.NewGuid(); Guid logGuid = Guid.NewGuid();
errorService.InsertOvenError(logGuid.ToString(), errorMessage.ENAlarmMessage, errorMessage.CNAlarmMessage, errorMessage.ErrorCode); errorService.InsertOvenError(logGuid.ToString(), errorMessage.ENAlarmMessage, errorMessage.CNAlarmMessage, errorMessage.ErrorCode);
connect3.PublishEvent(new CFXEnvelope(faultOccurredEvent.Handle(errorMessage.ErrorCode, LevelTrans(errorMessage.AlarmDegarde), logGuid, errorMessage.ENAlarmMessage, transID))); connect3.PublishEvent(new CFXEnvelope(faultOccurredEvent.Handle(errorMessage.ErrorCode, LevelTrans(errorMessage.AlarmDegarde), logGuid, errorMessage.ENAlarmMessage, transID)));
_log.Info($"报警发生 内容:{errorMessage.CNAlarmMessage}"); _log.Info($"烤箱报警发生 内容:{errorMessage.CNAlarmMessage} 级别:{errorMessage.AlarmDegarde.GetDescription()}");
} }
} }
else else
@ -233,8 +244,9 @@ namespace Sln.Iot.Business
{ {
//删除错误 //删除错误
string delGuid = errorService.DeleteOvenError(errorMessage.ENAlarmMessage); string delGuid = errorService.DeleteOvenError(errorMessage.ENAlarmMessage);
connect3.PublishEvent(new CFXEnvelope(faultClearedEvent.Handle(Guid.Parse(delGuid)))); Guid.TryParse(delGuid, out Guid guidRes);
_log.Info($"报警消除 内容:{errorMessage.CNAlarmMessage}"); connect3.PublishEvent(new CFXEnvelope(faultClearedEvent.Handle(guidRes)));
_log.Info($"烤箱报警消除 内容:{errorMessage.CNAlarmMessage} 级别:{errorMessage.AlarmDegarde.GetDescription()}");
} }
} }
} }

9
Sln.Iot.Business/RFID01Business.cs
Unescape Escape View File

@ -45,6 +45,8 @@ namespace Sln.Iot.Business
/// </summary> /// </summary>
/// <param name="state"></param> /// <param name="state"></param>
public void TimerCallback(object? state) public void TimerCallback(object? state)
{
try
{ {
// 定时任务逻辑 // 定时任务逻辑
//读取信号 //读取信号
@ -64,7 +66,7 @@ namespace Sln.Iot.Business
{ {
//转换托盘码 //转换托盘码
string traycode = Encoding.ASCII.GetString(trayBytesResult.Content); string traycode = Encoding.ASCII.GetString(trayBytesResult.Content);
_log.Info(traycode); _log.Info("RFID01" + traycode);
byte[] prodBytes = pordBytesResult.Content; byte[] prodBytes = pordBytesResult.Content;
string[] prodcode = new string[6]; string[] prodcode = new string[6];
//分割转换产品码 //分割转换产品码
@ -113,5 +115,10 @@ namespace Sln.Iot.Business
_log.Error("上料提升机PLC读取信号异常"); _log.Error("上料提升机PLC读取信号异常");
} }
} }
catch (Exception ex)
{
_log.Error("RFID01业务出现异常", ex);
}
}
} }
} }

9
Sln.Iot.Business/RFID02Business.cs
Unescape Escape View File

@ -45,6 +45,8 @@ namespace Sln.Iot.Business
/// </summary> /// </summary>
/// <param name="state"></param> /// <param name="state"></param>
public void TimerCallback(object? state) public void TimerCallback(object? state)
{
try
{ {
// 定时任务逻辑 // 定时任务逻辑
//读取信号 //读取信号
@ -63,6 +65,7 @@ namespace Sln.Iot.Business
{ {
//转换托盘码 //转换托盘码
string traycode = Encoding.ASCII.GetString(trayBytesResult.Content); string traycode = Encoding.ASCII.GetString(trayBytesResult.Content);
_log.Info("RFID02" + traycode);
//sql更新 //sql更新
@ -125,5 +128,11 @@ namespace Sln.Iot.Business
_log.Error("胶机1真空箱内PLC读取信号异常"); _log.Error("胶机1真空箱内PLC读取信号异常");
} }
} }
catch (Exception ex)
{
_log.Error("RFID02业务出现异常", ex);
}
}
} }
} }

8
Sln.Iot.Business/RFID03Business.cs
Unescape Escape View File

@ -39,6 +39,8 @@ namespace Sln.Iot.Business
/// </summary> /// </summary>
/// <param name="state"></param> /// <param name="state"></param>
public void TimerCallback(object? state) public void TimerCallback(object? state)
{
try
{ {
// 定时任务逻辑 // 定时任务逻辑
//读取信号 //读取信号
@ -57,6 +59,7 @@ namespace Sln.Iot.Business
{ {
//转换托盘码 //转换托盘码
string traycode = Encoding.ASCII.GetString(trayBytesResult.Content); string traycode = Encoding.ASCII.GetString(trayBytesResult.Content);
_log.Info("RFID03" + traycode);
//sql更新 //sql更新
//取出work唯一guid(tid) //取出work唯一guid(tid)
@ -95,5 +98,10 @@ namespace Sln.Iot.Business
_log.Error("胶机1真空箱外PLC读取信号异常"); _log.Error("胶机1真空箱外PLC读取信号异常");
} }
} }
catch (Exception ex)
{
_log.Error("RFID0业务出现异常", ex);
}
}
} }
} }

16
Sln.Iot.Business/RFID04Business.cs
Unescape Escape View File

@ -10,6 +10,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using TouchSocket.Core;
using static System.Runtime.CompilerServices.RuntimeHelpers; using static System.Runtime.CompilerServices.RuntimeHelpers;
namespace Sln.Iot.Business namespace Sln.Iot.Business
@ -43,6 +44,8 @@ namespace Sln.Iot.Business
/// </summary> /// </summary>
/// <param name="state"></param> /// <param name="state"></param>
public void TimerCallback(object? state) public void TimerCallback(object? state)
{
try
{ {
// 定时任务逻辑 // 定时任务逻辑
//读取信号 //读取信号
@ -62,6 +65,7 @@ namespace Sln.Iot.Business
{ {
//转换托盘吗 //转换托盘吗
string traycode = Encoding.ASCII.GetString(trayBytesResult.Content); string traycode = Encoding.ASCII.GetString(trayBytesResult.Content);
_log.Info("RFID04" + traycode);
//sql更新 //sql更新
//取出work唯一guid(tid) //取出work唯一guid(tid)
@ -123,9 +127,14 @@ namespace Sln.Iot.Business
} }
//取之前存的时间 //取之前存的时间
string time2 = TrayBindingService.Instance.GetTime2ByTrayCode(traycode); string time2 = TrayBindingService.Instance.GetTime2ByTrayCode(traycode);
ushort spanSecond = 0;
if (!time2.IsNullOrEmpty())
{
//计算时间差 //计算时间差
TimeSpan span = Convert.ToDateTime(time2) - Convert.ToDateTime(nowTime); TimeSpan span = Convert.ToDateTime(time2) - Convert.ToDateTime(nowTime);
ushort spanSecond = (ushort)span.TotalSeconds; spanSecond = (ushort)span.TotalSeconds;
_log.Info($"预固炉时间差" + spanSecond);
}
res = _plc.PlcWrite(_plc.DeltaInstance2, "D810", spanSecond, DataTypeEnum.UInt16).IsSuccess; res = _plc.PlcWrite(_plc.DeltaInstance2, "D810", spanSecond, DataTypeEnum.UInt16).IsSuccess;
if (!res) if (!res)
{ {
@ -146,5 +155,10 @@ namespace Sln.Iot.Business
_log.Error("胶机2真空箱前开始时间读PLC取信号异常"); _log.Error("胶机2真空箱前开始时间读PLC取信号异常");
} }
} }
catch (Exception ex)
{
_log.Error("RFID0业务出现异常", ex);
}
}
} }
} }

9
Sln.Iot.Business/RFID05Business.cs
Unescape Escape View File

@ -47,6 +47,8 @@ namespace Sln.Iot.Business
/// </summary> /// </summary>
/// <param name="state"></param> /// <param name="state"></param>
public void TimerCallback(object? state) public void TimerCallback(object? state)
{
try
{ {
// 定时任务逻辑 // 定时任务逻辑
//读取信号 //读取信号
@ -65,6 +67,7 @@ namespace Sln.Iot.Business
{ {
//转换托盘吗 //转换托盘吗
string traycode = Encoding.ASCII.GetString(trayBytesResult.Content); string traycode = Encoding.ASCII.GetString(trayBytesResult.Content);
_log.Info("RFID05" + traycode);
//sql更新 //sql更新
//取出work唯一guid(tid) //取出work唯一guid(tid)
@ -139,5 +142,11 @@ namespace Sln.Iot.Business
_log.Error("胶机2真空箱后PLC读取信号异常"); _log.Error("胶机2真空箱后PLC读取信号异常");
} }
} }
catch (Exception ex)
{
_log.Error("RFID0业务出现异常", ex);
}
}
} }
} }

9
Sln.Iot.Business/RFID06Business.cs
Unescape Escape View File

@ -54,6 +54,8 @@ namespace Sln.Iot.Business
/// </summary> /// </summary>
/// <param name="state"></param> /// <param name="state"></param>
public void TimerCallback(object? state) public void TimerCallback(object? state)
{
try
{ {
// 定时任务逻辑 // 定时任务逻辑
//读取信号 //读取信号
@ -72,6 +74,7 @@ namespace Sln.Iot.Business
{ {
//转换托盘吗 //转换托盘吗
string traycode = Encoding.ASCII.GetString(trayBytesResult.Content); string traycode = Encoding.ASCII.GetString(trayBytesResult.Content);
_log.Info("RFID06" + traycode);
//sql更新 //sql更新
//取出work唯一guid(tid) //取出work唯一guid(tid)
@ -136,5 +139,11 @@ namespace Sln.Iot.Business
_log.Error("下料提升机PLC读取信号异常"); _log.Error("下料提升机PLC读取信号异常");
} }
} }
catch (Exception ex)
{
_log.Error("RFID0业务出现异常", ex);
}
}
} }
} }

82
Sln.Iot.Business/RecipeBusiness.cs
Unescape Escape View File

@ -38,62 +38,74 @@ namespace Sln.Iot.Business
/// <param name="state"></param> /// <param name="state"></param>
public void TimerCallback(object? state) public void TimerCallback(object? state)
{ {
string recipeName = "recipeName"; string recipeName1 = "recipeName";
string recipeName2 = "recipeName";
try
{
var Result1 = _plc.ReadInt16(_plc.DeltaInstance1, "D6");
var Result2 = _plc.ReadInt16(_plc.DeltaInstance2, "D6");
var changeResult1 = _plc.ReadBool(_plc.DeltaInstance1, "M281"); //_log.Info($"真空箱1配方标识{Result1.Content}");
var changeResult2 = _plc.ReadBool(_plc.DeltaInstance2, "M281"); //_log.Info($"真空箱2配方标识{Result2.Content}");
var activeResult1 = _plc.ReadBool(_plc.DeltaInstance1, "M280"); //_log.Info($"————————————————————");
var activeResult2 = _plc.ReadBool(_plc.DeltaInstance2, "M280");
if(changeResult1.Content || changeResult2.Content || activeResult1.Content || activeResult2.Content) if (Result1.Content != 0 || Result2.Content != 0)
{ {
//获取现在激活的配方 //获取现在激活的配方
var res = _plc.ReadBytes(_plc.DeltaInstance1, "D600", 10); var res1 = _plc.ReadBytes(_plc.DeltaInstance1, "D600", 10);
if (res.IsSuccess) var res2 = _plc.ReadBytes(_plc.DeltaInstance2, "D600", 10);
if (res1.IsSuccess)
{ {
recipeName = Encoding.ASCII.GetString(res.Content); recipeName1 = Encoding.ASCII.GetString(ToolBusiness.SwapAdjacentBytes(res1.Content));
}
if (res2.IsSuccess)
{
recipeName2 = Encoding.ASCII.GetString(ToolBusiness.SwapAdjacentBytes(res2.Content));
} }
} }
if (changeResult1.IsSuccess) if (Result1.IsSuccess)
{ {
if (changeResult1.Content) if (Result1.Content == 2)
{ {
//发布消息 //发布消息
connect1.PublishEvent(new CFXEnvelope(recipeModifiedEvent.Handle(recipeName))); connect1.PublishEvent(new CFXEnvelope(recipeModifiedEvent.Handle(recipeName1)));
_log.Info($"真空箱1配方修改{recipeName}"); _plc.PlcWrite(_plc.DeltaInstance1, "D6", 0, DataTypeEnum.Int16);
_log.Info($"真空箱1配方修改{recipeName1}");
}
else if (Result1.Content == 4)
{
//发布消息
connect1.PublishEvent(new CFXEnvelope(recipeActivatedEvent.Handle(recipeName1, "VacuumInjection1", 1)));
_plc.PlcWrite(_plc.DeltaInstance1, "D6", 0, DataTypeEnum.Int16);
_log.Info($"真空箱1配方激活{recipeName1}");
} }
} }
if (changeResult2.IsSuccess) if (Result2.IsSuccess)
{ {
if (changeResult2.Content) if (Result2.Content == 2)
{ {
//发布消息 //发布消息
connect1.PublishEvent(new CFXEnvelope(recipeModifiedEvent.Handle(recipeName))); connect1.PublishEvent(new CFXEnvelope(recipeModifiedEvent.Handle(recipeName2)));
_log.Info($"真空箱2配方修改{recipeName}"); _plc.PlcWrite(_plc.DeltaInstance2, "D6", 0, DataTypeEnum.Int16);
_log.Info($"真空箱2配方修改{recipeName2}");
} }
else if (Result2.Content == 4)
{
//发布消息
connect1.PublishEvent(new CFXEnvelope(recipeActivatedEvent.Handle(recipeName2, "VacuumInjection2", 2)));
_plc.PlcWrite(_plc.DeltaInstance2, "D6", 0, DataTypeEnum.Int16);
_log.Info($"真空箱2配方激活{recipeName2}");
}
}
}
catch (Exception ex)
{
_log.Error($"RecipeBusiness定时任务异常：{ex.Message}");
} }
if (activeResult1.IsSuccess)
{
if (activeResult1.Content)
{
//发布消息
connect1.PublishEvent(new CFXEnvelope(recipeActivatedEvent.Handle(recipeName, "VacuumInjection1", 1)));
_log.Info($"真空箱1配方激活{recipeName}");
}
}
if (activeResult2.IsSuccess)
{
if (activeResult2.Content)
{
//发布消息
connect1.PublishEvent(new CFXEnvelope(recipeActivatedEvent.Handle(recipeName, "VacuumInjection2", 2)));
_log.Info($"真空箱2配方激活{recipeName}");
}
}
} }
} }
} }

133
Sln.Iot.Business/TestBusiness.cs
Unescape Escape View File

@ -1,12 +1,17 @@
using HslCommunication; using CFX.Structures.PressInsertion;
using CFX;
using HslCommunication;
using HslCommunication.Core; using HslCommunication.Core;
using Serilog; using Serilog;
using Sln.Iot.CFX.CFXBusiness;
using Sln.Iot.CFX.Event;
using Sln.Iot.PLC; using Sln.Iot.PLC;
using Sln.Iot.Repository.service; using Sln.Iot.Repository.service;
using Sln.Iot.Serilog; using Sln.Iot.Serilog;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Security.Cryptography;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -20,9 +25,14 @@ namespace Sln.Iot.Business
private readonly SerilogHelper _log = SerilogHelper.Instance; private readonly SerilogHelper _log = SerilogHelper.Instance;
private ErrorAnalyseBusiness _errorAnalyse;
private RecipeBusiness _recipeBusiness;
public TestBusiness() public TestBusiness()
{ {
_timer = new Timer(TimerCallback, null, 0, 1000); _errorAnalyse = new ErrorAnalyseBusiness();
_recipeBusiness = new RecipeBusiness();
//_timer = new Timer(TimerCallback, null, 0, 1000);
} }
/// <summary> /// <summary>
@ -33,42 +43,93 @@ namespace Sln.Iot.Business
{ {
try try
{ {
//var res = _plc.ReadBytes(_plc.DeltaInstance0, "D200", 9); UnitsProcessPLCDataGetBusiness unitsProcessPLCDataGetBusiness = UnitsProcessPLCDataGetBusiness.Instance;
//var bytes = res.Content.Reverse().ToArray();
//ushort[] shorts = new ushort[9]; var data1 = unitsProcessPLCDataGetBusiness.Vacuum1PlcDataGet();
//if (bytes != null && bytes.Length != 0) var data2 = unitsProcessPLCDataGetBusiness.Vacuum2PlcDataGet();
var data3 = unitsProcessPLCDataGetBusiness.PreHeatOvenPlcDataGet();
var data4 = unitsProcessPLCDataGetBusiness.PreCureOvenPlcDataGet();
var data5 = unitsProcessPLCDataGetBusiness.CureOvenPlcDataGet();
data1.GlueAmountSetValue2 = data2.GlueAmountSetValue2;
data1.GluePushSpeedSetValue2 = data2.GluePushSpeedSetValue2;
data1.BarrelA1TempActValue2 = data2.BarrelA1TempActValue2;
data1.BarrelA2TempActValue2 = data2.BarrelA2TempActValue2;
data1.BarrelB1TempActValue2 = data2.BarrelB1TempActValue2;
data1.BarrelB2TempActValue2 = data2.BarrelB2TempActValue2;
data1.PumpAPressureActValue2 = data2.PumpAPressureActValue2;
data1.PumpBPressureActValue2 = data2.PumpBPressureActValue2;
data1.VacuumDegreeActValue2 = data2.VacuumDegreeActValue2;
data1.PressureHoldTimeSetValue2 = data2.PressureHoldTimeSetValue2;
_log.Info($"真空箱温度数据上传,\n " +
$"GlueAmountSetValue1:{data1.GlueAmountSetValue1}\n " +
$"GluePushSpeedSetValue1:{data1.GluePushSpeedSetValue1}\n " +
$"BarrelA1TempActValue1:{data1.BarrelA1TempActValue1}\n " +
$"BarrelA2TempActValue1:{data1.BarrelA2TempActValue1}\n " +
$"BarrelB1TempActValue1:{data1.BarrelB1TempActValue1}\n " +
$"BarrelB2TempActValue1:{data1.BarrelB2TempActValue1}\n " +
$"PumpAPressureActValue1:{data1.PumpAPressureActValue1}\n " +
$"PumpBPressureActValue1:{data1.PumpBPressureActValue1}\n " +
$"VacuumDegreeActValue1:{data1.VacuumDegreeActValue1}\n " +
$"PressureHoldTimeSetValue1:{data1.PressureHoldTimeSetValue1}\n " +
$"GlueAmountSetValue2:{data1.GlueAmountSetValue2}\n " +
$"GluePushSpeedSetValue2:{data1.GluePushSpeedSetValue2}\n " +
$"BarrelA1TempActValue2:{data1.BarrelA1TempActValue2}\n " +
$"BarrelA2TempActValue2:{data1.BarrelA2TempActValue2}\n " +
$"BarrelB1TempActValue2:{data1.BarrelB1TempActValue2}\n " +
$"BarrelB2TempActValue2:{data1.BarrelB2TempActValue2}\n " +
$"PumpAPressureActValue2:{data1.PumpAPressureActValue2}\n " +
$"PumpBPressureActValue2:{data1.PumpBPressureActValue2}\n " +
$"VacuumDegreeActValue2:{data1.VacuumDegreeActValue2}\n " +
$"PressureHoldTimeSetValue2:{data1.PressureHoldTimeSetValue2}");
_log.Info($"隧道烤箱温度数据上传,\n " +
$"PreheatOvenTempActValue:{data3}\n " +
$"PreCureOven1TempActValue:{data4.PreCureOven1TempActValue}\n " +
$"PreCureOven2TempActValue:{data4.PreCureOven2TempActValue}\n " +
$"PreCureOven3TempActValue:{data4.PreCureOven3TempActValue}\n " +
$"PreCureOven4TempActValue:{data4.PreCureOven4TempActValue}\n " +
$"CureOven1TempActValue:{data5.CureOven1TempActValue}\n " +
$"CureOven2TempActValue:{data5.CureOven2TempActValue}\n " +
$"CureOven3TempActValue:{data5.CureOven3TempActValue}\n " +
$"CureOven4TempActValue:{data5.CureOven4TempActValue} ");
////var res = _plc.ReadBytes(_plc.DeltaInstance0, "D200", 9);
////var bytes = res.Content.Reverse().ToArray();
////ushort[] shorts = new ushort[9];
////if (bytes != null && bytes.Length != 0)
////{
//// shorts[0] = BitConverter.ToUInt16(bytes, 0);
//// shorts[1] = BitConverter.ToUInt16(bytes, 2);
//// shorts[2] = BitConverter.ToUInt16(bytes, 4);
//// shorts[3] = BitConverter.ToUInt16(bytes, 6);
//// shorts[4] = BitConverter.ToUInt16(bytes, 8);
//// shorts[5] = BitConverter.ToUInt16(bytes, 10);
//// shorts[6] = BitConverter.ToUInt16(bytes, 12);
//// shorts[7] = BitConverter.ToUInt16(bytes, 14);
//// shorts[8] = BitConverter.ToUInt16(bytes, 16);
////}
////for (int i = 0; i < 9; i++)
////{
//// _log.Info($"D20{i * 2}数值[{shorts[i].ToString()}]");
////}
////读取托盘码和产品码
//OperateResult<byte[]> trayBytesResult = _plc.ReadBytes(_plc.DeltaInstance3, "D5000", 10);
//OperateResult<byte[]> pordBytesResult = _plc.ReadBytes(_plc.DeltaInstance3, "D8000", 60);
////转换托盘码
//string traycode = Encoding.ASCII.GetString(trayBytesResult.Content);
//_log.Info("RFID读数" + traycode);
//byte[] prodBytes = pordBytesResult.Content;
//string[] prodcode = new string[6];
////分割转换产品码
//for (int i = 0; i < 6; i++)
//{ //{
// shorts[0] = BitConverter.ToUInt16(bytes, 0); // prodcode[i] = Encoding.ASCII.GetString(AscIIReverseTostring(prodBytes[(i * 20)..(i * 20 + 20)]));
// shorts[1] = BitConverter.ToUInt16(bytes, 2); // _log.Info($"扫码枪读数{i + 1}是{prodcode[i]}");
// shorts[2] = BitConverter.ToUInt16(bytes, 4);
// shorts[3] = BitConverter.ToUInt16(bytes, 6);
// shorts[4] = BitConverter.ToUInt16(bytes, 8);
// shorts[5] = BitConverter.ToUInt16(bytes, 10);
// shorts[6] = BitConverter.ToUInt16(bytes, 12);
// shorts[7] = BitConverter.ToUInt16(bytes, 14);
// shorts[8] = BitConverter.ToUInt16(bytes, 16);
//} //}
//for (int i = 0; i < 9; i++)
//{
// _log.Info($"D20{i * 2}数值[{shorts[i].ToString()}]");
//}
//读取托盘码和产品码
OperateResult<byte[]> trayBytesResult = _plc.ReadBytes(_plc.DeltaInstance3, "D5000", 10);
OperateResult<byte[]> pordBytesResult = _plc.ReadBytes(_plc.DeltaInstance3, "D8000", 60);
//转换托盘码
string traycode = Encoding.ASCII.GetString(trayBytesResult.Content);
_log.Info("RFID读数" + traycode);
byte[] prodBytes = pordBytesResult.Content;
string[] prodcode = new string[6];
//分割转换产品码
for (int i = 0; i < 6; i++)
{
prodcode[i] = Encoding.ASCII.GetString(AscIIReverseTostring(prodBytes[(i * 20)..(i * 20 + 20)]));
_log.Info($"扫码枪读数{i + 1}是{prodcode[i]}");
}
} }
catch (Exception ex) catch (Exception ex)
{ {

47
Sln.Iot.Business/ToolBusiness.cs
Unescape Escape View File

@ -0,0 +1,47 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Sln.Iot.Business
{
public class ToolBusiness
{
/// <summary>
/// 将偶数长度的byte数组中每对相邻元素（偶数下标和奇数下标）互换位置
/// </summary>
/// <param name="inputBytes">输入的byte数组（必须非空且长度为偶数）</param>
/// <returns>处理后的新byte数组</returns>
/// <exception cref="ArgumentNullException">输入数组为空时抛出</exception>
/// <exception cref="ArgumentException">输入数组长度为奇数时抛出</exception>
public static byte[] SwapAdjacentBytes(byte[] inputBytes)
{
// 校验输入：数组不能为空
if (inputBytes == null)
{
throw new ArgumentNullException(nameof(inputBytes), "输入的byte数组不能为null");
}
// 校验输入：数组长度必须为偶数
if (inputBytes.Length % 2 != 0)
{
throw new ArgumentException("输入的byte数组长度必须为偶数", nameof(inputBytes));
}
// 创建原数组的副本，避免修改原数组
byte[] resultBytes = (byte[])inputBytes.Clone();
// 遍历数组，步长为2，交换每对相邻元素
for (int i = 0; i < resultBytes.Length; i += 2)
{
// 交换偶数下标(i)和奇数下标(i+1)的元素
byte temp = resultBytes[i];
resultBytes[i] = resultBytes[i + 1];
resultBytes[i + 1] = temp;
}
return resultBytes;
}
}
}

117
Sln.Iot.Business/UnitsProcessPLCDataGetBusiness.cs
Unescape Escape View File

@ -34,23 +34,25 @@ namespace Sln.Iot.Business
{ {
try try
{ {
var res11 = _plc.ReadBytes(_plc.DeltaInstance1, "D200", 8); // 读取PLC数据
var res12 = _plc.ReadBytes(_plc.DeltaInstance1, "D610", 6); var res = _plc.ReadBytes(_plc.DeltaInstance1, "D188", 21);
var res13 = _plc.ReadBytes(_plc.DeltaInstance1, "D120", 4);
var res14 = _plc.ReadFloat(_plc.DeltaInstance1, "D58");
UnitsProcess1Entity entity = new UnitsProcess1Entity() UnitsProcess1Entity entity = new UnitsProcess1Entity()
{ {
GlueAmountSetValue1 = BitConverter.ToSingle(res12.Content, 4), // Float（单精度浮点数）占4字节，先截取4字节再反转
GluePushSpeedSetValue1 = BitConverter.ToSingle(res12.Content, 0), PumpAPressureActValue1 = BitConverter.ToSingle(SingleReverseBytesForValue(res.Content, (188 - 188) * 2, 4), 0),
BarrelA1TempActValue1 = BitConverter.ToInt16(res11.Content, 0), PumpBPressureActValue1 = BitConverter.ToSingle(SingleReverseBytesForValue(res.Content, (190 - 188) * 2, 4), 0),
BarrelA2TempActValue1 = BitConverter.ToInt16(res11.Content, 4), GluePushSpeedSetValue1 = BitConverter.ToSingle(SingleReverseBytesForValue(res.Content, (192 - 188) * 2, 4), 0),
BarrelB1TempActValue1 = BitConverter.ToInt16(res11.Content, 12), GlueAmountSetValue1 = BitConverter.ToSingle(SingleReverseBytesForValue(res.Content, (194 - 188) * 2, 4), 0),
BarrelB2TempActValue1 = BitConverter.ToInt16(res11.Content, 16), VacuumDegreeActValue1 = BitConverter.ToSingle(SingleReverseBytesForValue(res.Content, (196 - 188) * 2, 4), 0),
PumpAPressureActValue1 = BitConverter.ToSingle(res13.Content, 0),
PumpBPressureActValue1 = BitConverter.ToSingle(res13.Content, 4), // Int16（短整型）占2字节，先截取2字节再反转
VacuumDegreeActValue1 = res14.Content, PressureHoldTimeSetValue1 = BitConverter.ToInt16(Int16ReverseBytesForValue(res.Content, (198 - 188) * 2, 2), 0),
PressureHoldTimeSetValue1 = BitConverter.ToInt16(res12.Content, 12), BarrelA1TempActValue1 = BitConverter.ToInt16(Int16ReverseBytesForValue(res.Content, (200 - 188) * 2, 2), 0),
BarrelA2TempActValue1 = BitConverter.ToInt16(Int16ReverseBytesForValue(res.Content, (202 - 188) * 2, 2), 0),
BarrelB1TempActValue1 = BitConverter.ToInt16(Int16ReverseBytesForValue(res.Content, (206 - 188) * 2, 2), 0),
BarrelB2TempActValue1 = BitConverter.ToInt16(Int16ReverseBytesForValue(res.Content, (208 - 188) * 2, 2), 0),
}; };
return entity; return entity;
@ -70,23 +72,23 @@ namespace Sln.Iot.Business
{ {
try try
{ {
var res21 = _plc.ReadBytes(_plc.DeltaInstance2, "D200", 8); var res = _plc.ReadBytes(_plc.DeltaInstance2, "D188", 21);
var res22 = _plc.ReadBytes(_plc.DeltaInstance2, "D610", 6); var result = res.Content.Reverse().ToArray();
var res23 = _plc.ReadBytes(_plc.DeltaInstance2, "D120", 4);
var res24 = _plc.ReadFloat(_plc.DeltaInstance2, "D58");
UnitsProcess1Entity entity = new UnitsProcess1Entity() UnitsProcess1Entity entity = new UnitsProcess1Entity()
{ {
GlueAmountSetValue2 = BitConverter.ToSingle(res22.Content, 4), // Float（单精度浮点数）占4字节，先截取4字节再反转
GluePushSpeedSetValue2 = BitConverter.ToSingle(res22.Content, 0), PumpAPressureActValue2 = BitConverter.ToSingle(SingleReverseBytesForValue(res.Content, (188 - 188) * 2, 4), 0),
BarrelA1TempActValue2 = BitConverter.ToInt16(res21.Content, 0), PumpBPressureActValue2 = BitConverter.ToSingle(SingleReverseBytesForValue(res.Content, (190 - 188) * 2, 4), 0),
BarrelA2TempActValue2 = BitConverter.ToInt16(res21.Content, 4), GluePushSpeedSetValue2 = BitConverter.ToSingle(SingleReverseBytesForValue(res.Content, (192 - 188) * 2, 4), 0),
BarrelB1TempActValue2 = BitConverter.ToInt16(res21.Content, 12), GlueAmountSetValue2 = BitConverter.ToSingle(SingleReverseBytesForValue(res.Content, (194 - 188) * 2, 4), 0),
BarrelB2TempActValue2 = BitConverter.ToInt16(res21.Content, 16), VacuumDegreeActValue2 = BitConverter.ToSingle(SingleReverseBytesForValue(res.Content, (196 - 188) * 2, 4), 0),
PumpAPressureActValue2 = BitConverter.ToSingle(res23.Content, 0),
PumpBPressureActValue2 = BitConverter.ToSingle(res23.Content, 4), // Int16（短整型）占2字节，先截取2字节再反转
VacuumDegreeActValue2 = res24.Content, PressureHoldTimeSetValue2 = BitConverter.ToInt16(Int16ReverseBytesForValue(res.Content, (198 - 188) * 2, 2), 0),
PressureHoldTimeSetValue2 = BitConverter.ToInt16(res22.Content, 12), BarrelA1TempActValue2 = BitConverter.ToInt16(Int16ReverseBytesForValue(res.Content, (200 - 188) * 2, 2), 0),
BarrelA2TempActValue2 = BitConverter.ToInt16(Int16ReverseBytesForValue(res.Content, (202 - 188) * 2, 2), 0),
BarrelB1TempActValue2 = BitConverter.ToInt16(Int16ReverseBytesForValue(res.Content, (206 - 188) * 2, 2), 0),
BarrelB2TempActValue2 = BitConverter.ToInt16(Int16ReverseBytesForValue(res.Content, (208 - 188) * 2, 2), 0),
}; };
return entity; return entity;
@ -98,6 +100,42 @@ namespace Sln.Iot.Business
} }
} }
/// <summary>
/// 定义字节序转换的辅助方法（核心）
/// </summary>
/// <param name="source"></param>
/// <param name="startIndex"></param>
/// <param name="length"></param>
/// <returns></returns>
byte[] Int16ReverseBytesForValue(byte[] source, int startIndex, int length)
{
// 截取对应位置的字节片段（避免修改原数组）
byte[] temp = new byte[length];
Array.Copy(source, startIndex, temp, 0, length);
// 反转字节序（大端转小端）
Array.Reverse(temp);
return temp;
}
// 定义字节序转换的辅助方法（核心）
byte[] SingleReverseBytesForValue(byte[] source, int startIndex, int length)
{
// 截取对应位置的字节片段（避免修改原数组）
byte[] temp = new byte[length];
Array.Copy(source, startIndex, temp, 0, length);
var t = temp[0];
temp[0] = temp[2];
temp[2] = t;
t = temp[1];
temp[1] = temp[3];
temp[3] = t;
// 反转字节序（大端转小端）
Array.Reverse(temp);
return temp;
}
/// <summary> /// <summary>
/// 预热炉数据获取 /// 预热炉数据获取
/// </summary> /// </summary>
@ -131,15 +169,14 @@ namespace Sln.Iot.Business
try try
{ {
var res = _plc.ReadBytes(_plc.DeltaInstance0, "D201", 4); var res = _plc.ReadBytes(_plc.DeltaInstance0, "D201", 4);
var result = res.Content.Reverse().ToArray();
UnitsProcess3Entity unitsProcess3Entity = new UnitsProcess3Entity() UnitsProcess3Entity unitsProcess3Entity = new UnitsProcess3Entity()
{ {
PreCureOven1TempActValue = BitConverter.ToInt16(res.Content, 0), PreCureOven4TempActValue = BitConverter.ToInt16(result, 0),
PreCureOven2TempActValue = BitConverter.ToInt16(res.Content, 2), PreCureOven3TempActValue = BitConverter.ToInt16(result, 2),
PreCureOven3TempActValue = BitConverter.ToInt16(res.Content, 4), PreCureOven2TempActValue = BitConverter.ToInt16(result, 4),
PreCureOven4TempActValue = BitConverter.ToInt16(res.Content, 6), PreCureOven1TempActValue = BitConverter.ToInt16(result, 6),
}; };
return unitsProcess3Entity; return unitsProcess3Entity;
} }
catch (Exception ex) catch (Exception ex)
@ -158,13 +195,13 @@ namespace Sln.Iot.Business
try try
{ {
var res = _plc.ReadBytes(_plc.DeltaInstance0, "D205", 4); var res = _plc.ReadBytes(_plc.DeltaInstance0, "D205", 4);
var result = res.Content.Reverse().ToArray();
UnitsProcess3Entity unitsProcess3Entity = new UnitsProcess3Entity() UnitsProcess3Entity unitsProcess3Entity = new UnitsProcess3Entity()
{ {
CureOven1TempActValue = BitConverter.ToInt16(res.Content, 0), CureOven4TempActValue = BitConverter.ToInt16(result, 0),
CureOven2TempActValue = BitConverter.ToInt16(res.Content, 2), CureOven3TempActValue = BitConverter.ToInt16(result, 2),
CureOven3TempActValue = BitConverter.ToInt16(res.Content, 4), CureOven2TempActValue = BitConverter.ToInt16(result, 4),
CureOven4TempActValue = BitConverter.ToInt16(res.Content, 6), CureOven1TempActValue = BitConverter.ToInt16(result, 6),
}; };
return unitsProcess3Entity; return unitsProcess3Entity;

70
Sln.Iot.CFX/CFXBusiness/CFXUnitProcessedDataGet.cs
Unescape Escape View File

@ -23,29 +23,29 @@ namespace Sln.Iot.CFX.CFXBusiness
/// <returns></returns> /// <returns></returns>
public CommonProcessData ProcessDataGet1(UnitsProcess1Entity entity) public CommonProcessData ProcessDataGet1(UnitsProcess1Entity entity)
{ {
entity = new UnitsProcess1Entity() //entity = new UnitsProcess1Entity()
{ //{
GlueAmountSetValue1 = 123.4f, // GlueAmountSetValue1 = 123.4f,
GluePushSpeedSetValue1 = 10.1f, // GluePushSpeedSetValue1 = 10.1f,
BarrelA1TempActValue1 = 60, // BarrelA1TempActValue1 = 60,
BarrelA2TempActValue1 = 60, // BarrelA2TempActValue1 = 60,
BarrelB1TempActValue1 = 60, // BarrelB1TempActValue1 = 60,
BarrelB2TempActValue1 = 60, // BarrelB2TempActValue1 = 60,
PumpAPressureActValue1 = 3.5f, // PumpAPressureActValue1 = 3.5f,
PumpBPressureActValue1 = 3.2f, // PumpBPressureActValue1 = 3.2f,
VacuumDegreeActValue1 = 3000.4f, // VacuumDegreeActValue1 = 3000.4f,
PressureHoldTimeSetValue1 = 100, // PressureHoldTimeSetValue1 = 100,
GlueAmountSetValue2 = 123.4f, // GlueAmountSetValue2 = 123.4f,
GluePushSpeedSetValue2 = 10.1f, // GluePushSpeedSetValue2 = 10.1f,
BarrelA1TempActValue2 = 60, // BarrelA1TempActValue2 = 60,
BarrelA2TempActValue2 = 60, // BarrelA2TempActValue2 = 60,
BarrelB1TempActValue2 = 60, // BarrelB1TempActValue2 = 60,
BarrelB2TempActValue2 = 60, // BarrelB2TempActValue2 = 60,
PumpAPressureActValue2 = 3.5f, // PumpAPressureActValue2 = 3.5f,
PumpBPressureActValue2 = 3.2f, // PumpBPressureActValue2 = 3.2f,
VacuumDegreeActValue2 = 3000.4f, // VacuumDegreeActValue2 = 3000.4f,
PressureHoldTimeSetValue2 = 100, // PressureHoldTimeSetValue2 = 100,
}; //};
CommonProcessData processData = new CommonProcessData() CommonProcessData processData = new CommonProcessData()
{ {
@ -230,18 +230,18 @@ namespace Sln.Iot.CFX.CFXBusiness
/// <returns></returns> /// <returns></returns>
public CommonProcessData ProcessDataGet3(UnitsProcess3Entity entity) public CommonProcessData ProcessDataGet3(UnitsProcess3Entity entity)
{ {
entity = new UnitsProcess3Entity() //entity = new UnitsProcess3Entity()
{ //{
PreheatOvenTempActValue = 800, // PreheatOvenTempActValue = 800,
PreCureOven1TempActValue = 800, // PreCureOven1TempActValue = 800,
PreCureOven2TempActValue = 800, // PreCureOven2TempActValue = 800,
PreCureOven3TempActValue = 800, // PreCureOven3TempActValue = 800,
PreCureOven4TempActValue = 800, // PreCureOven4TempActValue = 800,
CureOven1TempActValue = 800, // CureOven1TempActValue = 800,
CureOven2TempActValue = 800, // CureOven2TempActValue = 800,
CureOven3TempActValue = 800, // CureOven3TempActValue = 800,
CureOven4TempActValue = 800, // CureOven4TempActValue = 800,
}; //};
CommonProcessData processData = new CommonProcessData() CommonProcessData processData = new CommonProcessData()
{ {

22
Sln.Iot.CFX/CFXRequestes/GetActiveRecipeRequestReceived1.cs
Unescape Escape View File

@ -54,18 +54,18 @@ public class GetActiveRecipeRequestReceived1 : BaseGetActiveRecipeRequestReceive
string restr1 = string.Empty; string restr1 = string.Empty;
string restr2 = string.Empty; string restr2 = string.Empty;
////获取现在激活的配方 //获取现在激活的配方
//var res1 = _plc.ReadBytes(_plc.DeltaInstance1, "D600", 10); var res1 = _plc.ReadBytes(_plc.DeltaInstance1, "D600", 10);
//var res2 = _plc.ReadBytes(_plc.DeltaInstance2, "D600", 10); var res2 = _plc.ReadBytes(_plc.DeltaInstance2, "D600", 10);
//if (res1.IsSuccess) if (res1.IsSuccess)
//{ {
// restr1 = Encoding.ASCII.GetString(res1.Content); restr1 = Encoding.ASCII.GetString(res1.Content);
//} }
//if (res2.IsSuccess) if (res2.IsSuccess)
//{ {
// restr2 = Encoding.ASCII.GetString(res2.Content); restr2 = Encoding.ASCII.GetString(res2.Content);
//} }
CFXMessage response = new GetActiveRecipeResponse() CFXMessage response = new GetActiveRecipeResponse()
{ {

1
Sln.Iot.CFX/Event/RecipeActivatedEvent.cs
Unescape Escape View File

@ -23,6 +23,7 @@ namespace Sln.Iot.CFX.Event
{ {
RecipeName = recipeName, RecipeName = recipeName,
Lane = 1, Lane = 1,
Revision = "2.0",
RecipeStagesInformation = new List<RecipeStageInformation>() RecipeStagesInformation = new List<RecipeStageInformation>()
{ {
new RecipeStageInformation() new RecipeStageInformation()

1
Sln.Iot.CFX/Event/RecipeModifiedEvent.cs
Unescape Escape View File

@ -22,6 +22,7 @@ namespace Sln.Iot.CFX.Event
eve = new RecipeModified() eve = new RecipeModified()
{ {
RecipeName = recipeName, RecipeName = recipeName,
Revision = "2.0",
ModifiedBy = new Operator() ModifiedBy = new Operator()
{ {
ActorType = ActorType.Human, ActorType = ActorType.Human,

16
Sln.Iot.Repository/SqliteHelper.cs
Unescape Escape View File

@ -15,15 +15,15 @@ namespace Sln.Iot.Repository
/// <typeparam name="T"></typeparam> /// <typeparam name="T"></typeparam>
public class SQLiteHelper<T> where T : new() public class SQLiteHelper<T> where T : new()
{ {
private static readonly Lazy<SQLiteHelper<T>> lazy = new Lazy<SQLiteHelper<T>>(() => new SQLiteHelper<T>()); //private static readonly Lazy<SQLiteHelper<T>> lazy = new Lazy<SQLiteHelper<T>>(() => new SQLiteHelper<T>());
public static SQLiteHelper<T> Instance //public static SQLiteHelper<T> Instance
{ //{
get // get
{ // {
return lazy.Value; // return lazy.Value;
} // }
} //}
private readonly string _databasePath = Path.Combine(Environment.CurrentDirectory, "DeltaDatabase.db"); private readonly string _databasePath = Path.Combine(Environment.CurrentDirectory, "DeltaDatabase.db");
private readonly SQLiteConnection _connection; // SQLite连接对象 private readonly SQLiteConnection _connection; // SQLite连接对象

14
Sln.Iot.Repository/service/ErrorService.cs
Unescape Escape View File

@ -21,10 +21,10 @@ namespace Sln.Iot.Repository.service
} }
} }
private SQLiteHelper<Vacuum1Error> _helperV1 = SQLiteHelper<Vacuum1Error>.Instance; private SQLiteHelper<Vacuum1Error> _helperV1 = new SQLiteHelper<Vacuum1Error>();
private SQLiteHelper<Vacuum2Error> _helperV2 = SQLiteHelper<Vacuum2Error>.Instance; private SQLiteHelper<Vacuum2Error> _helperV2 = new SQLiteHelper<Vacuum2Error>();
private SQLiteHelper<LiftError> _helperL = SQLiteHelper<LiftError>.Instance; private SQLiteHelper<LiftError> _helperL = new SQLiteHelper<LiftError>();
private SQLiteHelper<OvenError> _helperO = SQLiteHelper<OvenError>.Instance; private SQLiteHelper<OvenError> _helperO = new SQLiteHelper<OvenError>();
private SerilogHelper _log = SerilogHelper.Instance; private SerilogHelper _log = SerilogHelper.Instance;
@ -132,7 +132,7 @@ namespace Sln.Iot.Repository.service
try try
{ {
var restr = _helperV2.QuerySingle(x => x.ErrorName == Message).ErrorGuid; var restr = _helperV2.QuerySingle(x => x.ErrorName == Message).ErrorGuid;
var res = _helperV2.SqlExcute($"DELETE FROM Vacuum1Error WHERE ErrorName = '{Message}'"); var res = _helperV2.SqlExcute($"DELETE FROM Vacuum2Error WHERE ErrorName = '{Message}'");
if (res == 0) if (res == 0)
{ {
throw new Exception("删除数据不成功，可能没有指定ErrorMessage的错误"); throw new Exception("删除数据不成功，可能没有指定ErrorMessage的错误");
@ -201,7 +201,7 @@ namespace Sln.Iot.Repository.service
try try
{ {
var restr = _helperL.QuerySingle(x => x.ErrorName == Message).ErrorGuid; var restr = _helperL.QuerySingle(x => x.ErrorName == Message).ErrorGuid;
var res = _helperL.SqlExcute($"DELETE FROM Vacuum1Error WHERE ErrorName = '{Message}'"); var res = _helperL.SqlExcute($"DELETE FROM LiftError WHERE ErrorName = '{Message}'");
if (res == 0) if (res == 0)
{ {
throw new Exception("删除数据不成功，可能没有指定ErrorMessage的错误"); throw new Exception("删除数据不成功，可能没有指定ErrorMessage的错误");
@ -270,7 +270,7 @@ namespace Sln.Iot.Repository.service
try try
{ {
var restr = _helperO.QuerySingle(x => x.ErrorName == Message).ErrorGuid; var restr = _helperO.QuerySingle(x => x.ErrorName == Message).ErrorGuid;
var res = _helperO.SqlExcute($"DELETE FROM Vacuum1Error WHERE ErrorName = '{Message}'"); var res = _helperO.SqlExcute($"DELETE FROM OvenError WHERE ErrorName = '{Message}'");
if (res == 0) if (res == 0)
{ {
throw new Exception("删除数据不成功，可能没有指定ErrorMessage的错误"); throw new Exception("删除数据不成功，可能没有指定ErrorMessage的错误");

2
Sln.Iot.Repository/service/OvenPlcDataService.cs
Unescape Escape View File

@ -21,7 +21,7 @@ namespace Sln.Iot.Repository.service
} }
} }
private SQLiteHelper<OvenPlcData> _helper = SQLiteHelper<OvenPlcData>.Instance; private SQLiteHelper<OvenPlcData> _helper = new SQLiteHelper<OvenPlcData>();
private SerilogHelper _log = SerilogHelper.Instance; private SerilogHelper _log = SerilogHelper.Instance;

8
Sln.Iot.Repository/service/TrayBindingService.cs
Unescape Escape View File

@ -24,7 +24,7 @@ namespace Sln.Iot.Repository.service
} }
} }
private SQLiteHelper<TrayRfidBinding> _helper = SQLiteHelper<TrayRfidBinding>.Instance; private SQLiteHelper<TrayRfidBinding> _helper = new SQLiteHelper<TrayRfidBinding>();
private SerilogHelper _log = SerilogHelper.Instance; private SerilogHelper _log = SerilogHelper.Instance;
@ -140,6 +140,10 @@ namespace Sln.Iot.Repository.service
}; };
entities.Add(entity); entities.Add(entity);
} }
if(entities.Count == 0 || entities == null)
{
return false;
}
_helper.InsertRange(entities); _helper.InsertRange(entities);
return true; return true;
} }
@ -161,7 +165,7 @@ namespace Sln.Iot.Repository.service
{ {
try try
{ {
int res = _helper.SqlExcute($"update TrayRfidBinding set time{timeCount} = '{timeString}' where TrayCode = '{trayCode}'"); int res = _helper.SqlExcute($@"update TrayRfidBinding set time{timeCount} = '{timeString}' where TrayCode = '{trayCode}' ");
if (res <= 0 || res > 6) if (res <= 0 || res > 6)
{ {
return false; return false;

2
Sln.Iot.Repository/service/VacuumInjectionPlcDataService.cs
Unescape Escape View File

@ -22,7 +22,7 @@ namespace Sln.Iot.Repository.service
} }
} }
private SQLiteHelper<VacuumInjectionPlcData> _helper = SQLiteHelper<VacuumInjectionPlcData>.Instance; private SQLiteHelper<VacuumInjectionPlcData> _helper = new SQLiteHelper<VacuumInjectionPlcData>();
private SerilogHelper _log = SerilogHelper.Instance; private SerilogHelper _log = SerilogHelper.Instance;

17
Sln.Iot.Test/UnitTest1.cs
Unescape Escape View File

@ -3,6 +3,8 @@ global using Sln.Iot.Repository.dao;
using Sln.Iot.Repository; using Sln.Iot.Repository;
using Sln.Iot.Repository.service; using Sln.Iot.Repository.service;
using System.Collections; using System.Collections;
using Sln.Iot.Business;
using Sln.Iot.PLC;
namespace Sln.Iot.Test namespace Sln.Iot.Test
{ {
@ -11,12 +13,15 @@ namespace Sln.Iot.Test
[Fact] [Fact]
public void Test1() public void Test1()
{ {
byte[] bytes = new byte[] { 0, 1, 2, 4, 8, 16, 32, 64, 128, 255 }; //PLCÁ¬½Ó³õʼ»¯
PLCConnect.Instance.InitConnect();
UnitsProcessPLCDataGetBusiness unitsProcessPLCDataGetBusiness = UnitsProcessPLCDataGetBusiness.Instance;
BitArray bits = new BitArray(bytes); var data1 = unitsProcessPLCDataGetBusiness.Vacuum1PlcDataGet();
var data2 = unitsProcessPLCDataGetBusiness.Vacuum2PlcDataGet();
bool[] bools = new bool[bits.Count]; var data3 = unitsProcessPLCDataGetBusiness.PreHeatOvenPlcDataGet();
bits.CopyTo(bools, 0); var data4 = unitsProcessPLCDataGetBusiness.PreCureOvenPlcDataGet();
var data5 = unitsProcessPLCDataGetBusiness.CureOvenPlcDataGet();
} }
@ -64,7 +69,7 @@ namespace Sln.Iot.Test
}, },
}; };
var ress = SQLiteHelper<TrayRfidBinding>.Instance.InsertRange(testDatas); //var ress = SQLiteHelper<TrayRfidBinding>.Instance.InsertRange(testDatas);
//var res = SQLiteHelper<TrayRfidBinding>.Instance.DeleteRange("Tray002"); //var res = SQLiteHelper<TrayRfidBinding>.Instance.DeleteRange("Tray002");
//Assert.Equal(5, res); //Assert.Equal(5, res);

39
Sln.Iot/Program.cs
Unescape Escape View File

@ -61,15 +61,28 @@ namespace Sln.Iot
//配置文件加载 //配置文件加载
var appConfig = AppConfigSetting.Load(); var appConfig = AppConfigSetting.Load();
//PLC连接初始化 //PLC连接初始化
//PLCConnect.Instance.InitConnect(); PLCConnect.Instance.InitConnect();
//业务类启动
//BusinessStart business = new BusinessStart();
//CFX接口启动 //CFX接口启动
//真空注胶机 //真空注胶机
CFXConnect1.Instance.Init("CFX.A00.SDSH000001", CFXConnect1.Instance.Init("CFX.A00.SDSH000001",
new Uri("amqp://127.0.0.1:1235"), new Uri("amqp://127.0.0.1:1235"),
new Uri("amqp://127.0.0.1:8888")); new Uri("amqp://127.0.0.1:30031"));
//升降回流
CFXConnect2.Instance.Init("CFX.A00.SDSH000002",
new Uri("amqp://127.0.0.1:1236"),
new Uri("amqp://127.0.0.1:30031"));
//隧道烤箱
CFXConnect3.Instance.Init("CFX.A00.SDSH000003",
new Uri("amqp://127.0.0.1:1237"),
new Uri("amqp://127.0.0.1:30031"));
////CFX接口启动
////真空注胶机
//CFXConnect1.Instance.Init("CFX.A00.SDSH000001",
// new Uri("amqp://127.0.0.1:1235"),
// new Uri("amqp://127.0.0.1:8888"));
////升降回流 ////升降回流
//CFXConnect2.Instance.Init("CFX.A00.SDSH000002", //CFXConnect2.Instance.Init("CFX.A00.SDSH000002",
// new Uri("amqp://127.0.0.1:1235"), // new Uri("amqp://127.0.0.1:1235"),
@ -79,16 +92,18 @@ namespace Sln.Iot
// new Uri("amqp://127.0.0.1:1235"), // new Uri("amqp://127.0.0.1:1235"),
// new Uri("amqp://127.0.0.1:8888")); // new Uri("amqp://127.0.0.1:8888"));
//业务类启动
BusinessStart business = new BusinessStart();
log.Info($"系统启动成功,日志存放位置:{appConfig.logPath}"); log.Info($"系统启动成功,日志存放位置:{appConfig.logPath}");
CFXTest cFXTest = new CFXTest(); //CFXTest cFXTest = new CFXTest();
cFXTest.Test1(); //cFXTest.Test1();
//test(); //TestBusiness test = new TestBusiness();
await Task.Delay(-1); await Task.Delay(-1);
} }
/// <summary> /// <summary>
@ -100,11 +115,5 @@ namespace Sln.Iot
CFXConnect2.Instance.PublishEvent(new CFXEnvelope(new EndpointShuttingDownEvent().Handle(CFXConnect2.Instance.CFXHandle))); CFXConnect2.Instance.PublishEvent(new CFXEnvelope(new EndpointShuttingDownEvent().Handle(CFXConnect2.Instance.CFXHandle)));
CFXConnect3.Instance.PublishEvent(new CFXEnvelope(new EndpointShuttingDownEvent().Handle(CFXConnect3.Instance.CFXHandle))); CFXConnect3.Instance.PublishEvent(new CFXEnvelope(new EndpointShuttingDownEvent().Handle(CFXConnect3.Instance.CFXHandle)));
} }
private static void test()
{
TestBusiness test = new TestBusiness();
}
} }
} }
Write Preview
Loading…
Cancel
Save