Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix changes

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-11-11 10:07:05 +01:00
parent cefb9df5bd
commit cab2a84231
9 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active.Database/Controllers/RedisController.cs
+8 -7
View File
@@ -15,7 +15,6 @@ namespace Thermo.Active.Database.Controllers
private const string redisAlmIt = "AdpConf:Plc:Condition:It";
private const string redisAlmEn = "AdpConf:Plc:Condition:En";
private const string currentUserPath = "Machine:Hmi:User";
private const string machineMessagePath = "Machine:Messages";
private const string machineStatusPath = "Machine:Status";
private const string machinePowerPath = "Machine:Power";
private const string machineAlarmPath = "Machine:Alarm";
@@ -34,6 +33,7 @@ namespace Thermo.Active.Database.Controllers
private const string machineAxisLoad = "Machine:Axes:%NN%:Load";
private const string machineAxisName = "Machine:Axes:%NN%:Name";
private const string machineEventKpis = "Events:Kpis";
private const string machineMessagePath = "Events:Messages";
public static void WriteProductionNotification(uint ProductionProcess, string Notification)
{
@@ -103,11 +103,6 @@ namespace Thermo.Active.Database.Controllers
string redisHash = redUtil.man.redHash(currentActiveVersionPath);
return redUtil.man.setRSV(redisHash, version.ToString());
}
public static bool SendMessage(DTOMessageModel message)
{
string redisHash = redUtil.man.redHash(machineMessagePath);
return redUtil.man.setJson(redisHash, message);
}
public static bool WriteCurrentMachineStatus(string status)
{
@@ -181,7 +176,13 @@ namespace Thermo.Active.Database.Controllers
redUtil.man.ListPush(redisHash, alarms);
return true;
}
public static bool SendMessage(string msg)
{
string redisHash = redUtil.man.redHash(machineMessagePath);
redUtil.man.ListPush(redisHash, msg);
return true;
}
public static bool WriteCurrentAxisStatus(Dictionary<int, DTOAxisInfoModel> axis)
{