diff --git a/ZR.Admin.WebApi/Program.cs b/ZR.Admin.WebApi/Program.cs index 58a590e7..455b28e1 100644 --- a/ZR.Admin.WebApi/Program.cs +++ b/ZR.Admin.WebApi/Program.cs @@ -115,7 +115,7 @@ builder.Services.Configure((o) => // 注册 SocketGatewayServer 为 Singleton(单例,整个应用生命周期一个实例) builder.Services.AddSingleton(provider => { - var server = new SocketGatewayServer("192.168.50.163", 4021); // 你可以按需修改 IP 和端口 + var server = new SocketGatewayServer("192.168.1.10", 2325); // 你可以按需修改 IP 和端口 server.Start(); // 项目启动时立即启动监听 //server.StartReceiving(); diff --git a/ZR.Service/mes/andon/AndonAlarmRecordService.cs b/ZR.Service/mes/andon/AndonAlarmRecordService.cs index d2cba87d..93f25fff 100644 --- a/ZR.Service/mes/andon/AndonAlarmRecordService.cs +++ b/ZR.Service/mes/andon/AndonAlarmRecordService.cs @@ -1,4 +1,6 @@ using Aliyun.OSS; +using DOAN.ServiceCore.MyMatchPush; +using Infrastructure; using Infrastructure.Attribute; using Infrastructure.Model; using JinianNet.JNTemplate.Parsers; @@ -23,6 +25,14 @@ namespace ZR.Service.mes.andon private AndonAlarmLevelService andonAlarmLevelService = new AndonAlarmLevelService(); private AndonAlarmRecordProcessService andonAlarmRecordProcessService = new AndonAlarmRecordProcessService(); private AndonAlarmTypeDictService andonAlarmTypeDictService = new AndonAlarmTypeDictService(); + private SocketGatewayServer _socketGateway = null; + public AndonAlarmRecordService(SocketGatewayServer socketGateway) + { + + _socketGateway= socketGateway; + } + + /// /// 查询报警记录列表 /// @@ -202,20 +212,6 @@ namespace ZR.Service.mes.andon { record.Status = "已响应"; record.Remarks = parm.Remarks; - var typeDic = andonAlarmTypeDictService.Queryable() - .Where(k => k.TypeCode == record.AlarmTypeCode) - .ToList().FirstOrDefault(); - if (typeDic != null) - { - record.Receiver1 = typeDic.Receiver1; - record.Receiver1Name = typeDic.Receiver1Name; - record.Receiver2 = typeDic.Receiver2; - record.Receiver2Name = typeDic.Receiver2Name; - record.Receiver3 = typeDic.Receiver3; - record.Receiver3Name = typeDic.Receiver3Name; - record.Receiver4 = typeDic.Receiver4; - record.Receiver4Name = typeDic.Receiver4Name; - } record.UpdatedBy = parm.UserId; record.UpdatedTime = DateTime.Now; UpdateAndonAlarmRecord(record); @@ -326,6 +322,7 @@ namespace ZR.Service.mes.andon andonAlarmRecordProcess.UpdatedTime = DateTime.Now; int iResult = andonAlarmRecordProcessService.Insert(andonAlarmRecordProcess); //报警给领导 + Watchup.StartPush("测试Socket推送功能", _socketGateway); return ApiResult.Success("成功", andonAlarmRecordProcess); } else @@ -360,6 +357,21 @@ namespace ZR.Service.mes.andon model.AlarmCode = strAlarmCode; model.Sequence = Sequence; model.Status = "待响应"; + var typeDic = andonAlarmTypeDictService.Queryable() + .Where(k => k.TypeCode == model.AlarmTypeCode) + .ToList().FirstOrDefault(); + if (typeDic != null) + { + model.Receiver1 = typeDic.Receiver1; + model.Receiver1Name = typeDic.Receiver1Name; + model.Receiver2 = typeDic.Receiver2; + model.Receiver2Name = typeDic.Receiver2Name; + model.Receiver3 = typeDic.Receiver3; + model.Receiver3Name = typeDic.Receiver3Name; + model.Receiver4 = typeDic.Receiver4; + model.Receiver4Name = typeDic.Receiver4Name; + } + Watchup.StartPush("测试Socket推送功能", _socketGateway); return Context.Insertable(model).ExecuteReturnEntity(); }