huhu/dc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

大更新

Browse Source
This commit is contained in:
13118993771@163.com
2022-12-16 13:01:24 +08:00
parent b593a243a5
commit eb23e102b4
1279 changed files with 29652 additions and 1097632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Handlers/EventHandlers/AlarmClearedHandler.cs
View File

@@ -46,7 +46,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("AlarmID"):
@@ -79,9 +79,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = alarmReportBody;

6
Handlers/EventHandlers/AlarmDetectedHandler.cs
View File

@@ -46,7 +46,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("AlarmID"):
@@ -79,9 +79,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = alarmReportBody;

6
Handlers/EventHandlers/ContainerPlaceHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("Clock"):
@@ -73,9 +73,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = containerPlaceBody;

6
Handlers/EventHandlers/ContainerRemoveHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("Clock"):
@@ -73,9 +73,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = containerPlaceBody;

6
Handlers/EventHandlers/ControlStateLocalHandler.cs
View File

@@ -43,7 +43,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("Clock"):
@@ -70,9 +70,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = controlStateChangeBody;

6
Handlers/EventHandlers/ControlStateRemoteHandler .cs
View File

@@ -43,7 +43,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("Clock"):
@@ -70,9 +70,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = controlStateChangeBody;

6
Handlers/EventHandlers/EquipmentStateChangeHandler.cs
View File

@@ -43,7 +43,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("Clock"):
@@ -70,9 +70,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = equipmentStateChangeBody;

86
Handlers/EventHandlers/MESRequestHandler.cs
View File

@@ -78,7 +78,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
item.RCMD = "NEW-SUBSTRATEID";
Param p1 = new Param();
p1.ParanName = "ToolName";
p1.ParanVal = Configuration.conf.connectSetting.name;
p1.ParanVal = Configurations.conf.connectSetting.name;
item.PARAMS.Add(p1);
Param p2 = new Param();
p2.ParanName = "STATIONID";
@@ -109,7 +109,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
public static void RequestS1F3(JObject body = null)
{
Global.MF.pushBotton("S1F3Request");
Global.MF.pushBotton("S1F3");
}
public static void RequestS2F13(JObject body = null)
@@ -152,7 +152,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
item.RCMD = "EQSTATEUPDATE";
Param p1 = new Param();
p1.ParanName = "ToolName";
p1.ParanVal = Configuration.conf.connectSetting.name;
p1.ParanVal = Configurations.conf.connectSetting.name;
item.PARAMS.Add(p1);
Param p2 = new Param();
p2.ParanName = "NEWSTATE";
@@ -185,9 +185,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
public static void UploadFile(JObject body = null)
{
long fileId = long.Parse(body["fileId"].ToString());
DownLoadFileParam downLoadFileParam = new DownLoadFileParam(fileId, Configuration.conf.connectSetting.name + ".xml", "1");
DownLoadFileParam downLoadFileParam = new DownLoadFileParam(fileId, Configurations.conf.connectSetting.name + ".xml", "1");
string param = SECSUtil.ObjectToGetParam(downLoadFileParam);
HttpWebResponse response = HttpUtils.sentGET(Configuration.conf.httpConfiguration.fileDownloadUrl, param);
HttpWebResponse response = HttpUtils.sentGET(Configurations.conf.httpConfiguration.fileDownloadUrl, param);
if(response.StatusCode != HttpStatusCode.OK)
{
return;
@@ -208,5 +208,81 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
respnseStream.Close();
}
}
public static void RequestTraceDataInit(JObject body = null)
{
S2F23Item item = new S2F23Item();
if (string.IsNullOrEmpty(body["totsmp"].ToString())|| string.IsNullOrEmpty(body["dsper"].ToString())|| string.IsNullOrEmpty(body["state"].ToString()))
{
LoggerService.MQLogger.Debug("值不能为空");
return;
}
if (body["state"].ToString().Equals("Y"))
{
item.TOTSMP = ushort.Parse(body["totsmp"].ToString());
}
else
{
item.TOTSMP = 0;
}
string dsper = body["dsper"].ToString();
while(dsper.Length < 6)
{
dsper = "0" + dsper;
}
item.DSPER_hhmmss = dsper;
item.TRID = 1;
item.REPGSZ = 1;
string[] svs = body["vID"].ToString().FromJson<string[]>();
List<ushort> SVID = new List<ushort>();
foreach (string s in svs)
{
SVID.Add(ushort.Parse(s));
}
item.SVID = SVID;
foreach(WorkFlow workFlow in SimulatorInfo.Instance.Scenarios.Scenarios.FirstOrDefault(sc => sc.Name == "Init").WorkFlows)
{
if (workFlow.MessageName.Equals("S2F23"))
{
workFlow.MessageContent = item.ToJson<S2F23Item>();
break;
}
}
}
public static void RequestTraceData(JObject body = null)
{
S2F23Item item = new S2F23Item();
if (string.IsNullOrEmpty(body["totsmp"].ToString()) || string.IsNullOrEmpty(body["dsper"].ToString()) || string.IsNullOrEmpty(body["state"].ToString()))
{
LoggerService.MQLogger.Debug("值不能为空");
return;
}
if (body["state"].ToString().Equals("Y"))
{
item.TOTSMP = ushort.Parse(body["totsmp"].ToString());
}
else
{
item.TOTSMP = 0;
}
string dsper = body["dsper"].ToString();
while (dsper.Length < 6)
{
dsper = "0" + dsper;
}
item.DSPER_hhmmss = dsper;
item.TRID = 1;
item.REPGSZ = 1;
string[] svs = body["vID"].ToString().FromJson<string[]>();
List<ushort> SVID = new List<ushort>();
foreach (string s in svs)
{
SVID.Add(ushort.Parse(s));
}
item.SVID = SVID;
Command.S2F23Command(item);
}
}
}

6
Handlers/EventHandlers/Machine_Data_1Handler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("Clock"):
@@ -68,9 +68,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = machineDataBody;
Task.Run(() => MainForm.mq.EAPRequest(mQMessage));

6
Handlers/EventHandlers/MaintenanceEndHandler.cs
View File

@@ -46,7 +46,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("Clock"):
@@ -58,9 +58,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = maintenanceBody;

6
Handlers/EventHandlers/MaintenanceStartHandler.cs
View File

@@ -46,7 +46,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("Clock"):
@@ -58,9 +58,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = maintenanceBody;

6
Handlers/EventHandlers/MaterialReceivedForFILOBufferHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -113,9 +113,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = materialReceivedForTransBody;

6
Handlers/EventHandlers/MaterialReceivedForIoPortHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -113,9 +113,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = materialReceivedForTransBody;

6
Handlers/EventHandlers/MaterialReceivedForLSTAHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("VirtualSubstrateID"):
@@ -78,9 +78,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = lSTAMaterialReceivedBody;

6
Handlers/EventHandlers/MaterialReceivedForTransHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -113,9 +113,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = materialReceivedForTransBody;

6
Handlers/EventHandlers/MaterialRemovedForFILOBufferHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -113,9 +113,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = materialRemovedBody;

6
Handlers/EventHandlers/MaterialRemovedForIoPortHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -113,9 +113,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = materialRemovedBody;

6
Handlers/EventHandlers/MaterialRemovedForLSTAHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -113,9 +113,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = materialRemovedBody;

6
Handlers/EventHandlers/MaterialRemovedForTransHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -113,9 +113,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = materialRemovedBody;

6
Handlers/EventHandlers/MaterialRemovedFromContainerHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -128,9 +128,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = materialStoredToContainerBody;

6
Handlers/EventHandlers/MaterialStoredToContainerHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -128,9 +128,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = materialStoredToContainerBody;

6
Handlers/EventHandlers/MaterialStoredToPalletHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("Clock"):
@@ -82,9 +82,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = materialStoredToPalletBody;

6
Handlers/EventHandlers/Material_HoldHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -118,9 +118,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = materialHoldBody;

6
Handlers/EventHandlers/Material_ReceivedHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -83,9 +83,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = materialReceivedBody;

6
Handlers/EventHandlers/Material_RemovedHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -118,9 +118,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = materialRemovedBody;

6
Handlers/EventHandlers/Material_ScrapHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -118,9 +118,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = materialScrapBody;

6
Handlers/EventHandlers/PalletCompletedHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("Clock"):
@@ -89,9 +89,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = palletCompletedBody;

6
Handlers/EventHandlers/PalletRemovedHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("Clock"):
@@ -72,9 +72,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = palletRemovedBody;

6
Handlers/EventHandlers/ProcessProgramChangeBodyHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("RecipeName"):
@@ -68,9 +68,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = processProgramChangeBody;

6
Handlers/EventHandlers/ProcessRecipeSelectedHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -73,9 +73,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = processRecipeSelectedBody;

10
Handlers/EventHandlers/Process_FinishHandler.cs
View File

@@ -44,7 +44,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -93,9 +93,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = processFinishBody;
Task.Run(() =>
@@ -112,7 +112,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
public void formatCheck(uint id,SECSItem item)
{
eSECS_FORMAT standardFormat = Configuration.conf.sRDConfiguration.GetSECS_FORMAT(id);
eSECS_FORMAT standardFormat = Configurations.conf.sRDConfiguration.GetSECS_FORMAT(id);
eSECS_FORMAT format = item.Format;
if (standardFormat != format)
{
@@ -120,7 +120,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
mQMessage.header.messageName = "FormatError";
FormatErrorBody formatErrorBody = new FormatErrorBody();
formatErrorBody.eventName = "ProcessFinished";
formatErrorBody.paramName = Configuration.conf.sRDConfiguration.tryGetSVOrDV(id);
formatErrorBody.paramName = Configurations.conf.sRDConfiguration.tryGetSVOrDV(id);
formatErrorBody.paramValue = item.Value.ToString();
switch (format)
{

6
Handlers/EventHandlers/Process_StartHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("SubstrateID"):
@@ -83,9 +83,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = processStartedBody;

6
Handlers/EventHandlers/SlotlistHandler.cs
View File

@@ -45,7 +45,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("Clock"):
@@ -77,9 +77,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = slotListBody;

4
Handlers/EventHandlers/SpoolingDeactivatedHandler.cs
View File

@@ -34,9 +34,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
{
try
{
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
Scenario scenario = SimulatorInfo.Instance.Scenarios.Scenarios.FirstOrDefault(sc => sc.Name == "Init");
if (scenario.CurrentStep == 8)

6
Handlers/EventHandlers/UserLoggedOffHandler.cs
View File

@@ -46,7 +46,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("Clock"):
@@ -68,9 +68,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = userLoggedOnBody;

6
Handlers/EventHandlers/UserLoggedOnHandler.cs
View File

@@ -46,7 +46,7 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
int index = 1;
foreach (var key in even.validVariables)
{
string name = Configuration.conf.sRDConfiguration.tryGetSVOrDV(key);
string name = Configurations.conf.sRDConfiguration.tryGetSVOrDV(key);
switch (name)
{
case ("Clock"):
@@ -68,9 +68,9 @@ namespace ARI.EAP.HOST.Handlers.EventHandlers
trans.Primary.Root.Item(3).Item(2).Item(index).Name = name;
index++;
}
Global.MF.addlog(LoggerService.EtoH, $"S{trans.Primary.Stream}F{trans.Primary.Function}", LoggerService.Receive, even.name, "=" + trans.Primary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Receive, even.name, 0);
LoggerService.SECSLogger.Info(trans.Primary);
Global.MF.addlog(LoggerService.HtoE, $"S{trans.Secondary.Stream}F{trans.Secondary.Function}", LoggerService.Send, even.name, "=" + trans.Secondary.SystemBytes.ToString());
Global.MF.addlog(trans, LoggerService.Send, even.name, 1);
LoggerService.SECSLogger.Info(trans.Secondary);
mQMessage.body = userLoggedOnBody;