From e262528889be01d20156131f32451ecba2cdbd1b Mon Sep 17 00:00:00 2001 From: quowingwang Date: Wed, 7 Jan 2026 09:11:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/andon/AndonAlarmRecordController.cs | 21 +------- .../wwwroot/export/任务执行01-06-192028.xlsx | Bin 0 -> 4659 bytes .../wwwroot/export/任务执行01-06-192135.xlsx | Bin 0 -> 4659 bytes .../wwwroot/export/任务执行01-06-194345.xlsx | Bin 0 -> 4661 bytes .../mes/andon/AndonAlarmRecordService.cs | 51 ++++++++++++------ 5 files changed, 35 insertions(+), 37 deletions(-) create mode 100644 ZR.Admin.WebApi/wwwroot/export/任务执行01-06-192028.xlsx create mode 100644 ZR.Admin.WebApi/wwwroot/export/任务执行01-06-192135.xlsx create mode 100644 ZR.Admin.WebApi/wwwroot/export/任务执行01-06-194345.xlsx diff --git a/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordController.cs b/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordController.cs index a5a5de74..8a5dc725 100644 --- a/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordController.cs @@ -41,6 +41,7 @@ namespace ZR.Admin.WebApi.Controllers.andon //TODO 导出excel [HttpGet("exportData")] + [ActionPermissionFilter(Permission = "business:andonalarmrecord:list")] public IActionResult Export([FromQuery] AndonAlarmRecordQueryDto parm) { parm.PageNum = 1; @@ -94,16 +95,6 @@ namespace ZR.Admin.WebApi.Controllers.andon public IActionResult UpdateAndonAlarmRecord([FromBody] AndonAlarmRecordDto parm) { var modal = parm.Adapt().ToUpdate(HttpContext); - //if (parm.Area != null && parm.Area.Length > 0) - //{ - // modal.Area1 = parm.Area.Length > 0 ? parm.Area[0] : string.Empty; - // modal.Area2 = parm.Area.Length > 1 ? parm.Area[1] : string.Empty; - //} - //else - //{ - // modal.Area1 = string.Empty; - // modal.Area2 = string.Empty; - //} var response = _AndonAlarmRecordService.UpdateAndonAlarmRecord(modal); return ToResponse(response); @@ -189,16 +180,6 @@ namespace ZR.Admin.WebApi.Controllers.andon public IActionResult CreateAndonAlarmRecord([FromBody] AndonAlarmRecordDto parm) { var modal = parm.Adapt().ToCreate(HttpContext); - //if (parm.Area != null && parm.Area.Length > 0) - //{ - // modal.Area1 = parm.Area.Length > 0 ? parm.Area[0] : string.Empty; - // modal.Area2 = parm.Area.Length > 1 ? parm.Area[1] : string.Empty; - //} - //else - //{ - // modal.Area1 = string.Empty; - // modal.Area2 = string.Empty; - //} var response = _AndonAlarmRecordService.CreateAndonAlarmRecord(modal); return SUCCESS(response); diff --git a/ZR.Admin.WebApi/wwwroot/export/任务执行01-06-192028.xlsx b/ZR.Admin.WebApi/wwwroot/export/任务执行01-06-192028.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..3f5e0066dd67968ea1da8b8879d298e2f2d0f9d4 GIT binary patch literal 4659 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 literal 0 HcmV?d00001 diff --git a/ZR.Admin.WebApi/wwwroot/export/任务执行01-06-194345.xlsx b/ZR.Admin.WebApi/wwwroot/export/任务执行01-06-194345.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..fd82e9d71451b4c90c04afc4330096f16bda6c2f GIT binary patch literal 4661 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 WatchAddressList = GetReceiverWatchAddress(model.Receiver1); + if (WatchAddressList.Any()) { - Watchup.StartPush(strMessage, _socketGateway, strWatchAddress); + foreach (string strWatchAddress in WatchAddressList) + { + Watchup.StartPush(strMessage, _socketGateway, strWatchAddress); + } } } } @@ -622,17 +633,21 @@ namespace ZR.Service.mes.andon } //根据报警联系人获取对应人的手表地址 - private string GetReceiverWatchAddress(string receiverId) + private List GetReceiverWatchAddress(string receiverIds) { - string strWatchAddress = ""; - var query = andonAlarmReceiverWatchDicService.Queryable() - .Where(a => a.Receiverid == receiverId) - .ToList().FirstOrDefault(); - if (query != null) + string[] receiverIdArr = receiverIds.Split(','); + List watchAddressList = new List(); + foreach (string receiverId in receiverIdArr) { - strWatchAddress = query.Watchip; + var query = andonAlarmReceiverWatchDicService.Queryable() + .Where(a => a.Receiverid == receiverId) + .ToList().FirstOrDefault(); + if (query != null) + { + watchAddressList.Add(query.Watchip); + } } - return strWatchAddress; + return watchAddressList; } /// @@ -728,13 +743,15 @@ namespace ZR.Service.mes.andon try { //手表发送提醒上报领导 - string strWatchAddress = ""; if (!string.IsNullOrEmpty(ReceiveId)) { - strWatchAddress = GetReceiverWatchAddress(ReceiveId); - if (!string.IsNullOrEmpty(strWatchAddress)) + List WatchAddressList = GetReceiverWatchAddress(ReceiveId); + if (WatchAddressList.Any()) { - Watchup.StartPush(strWatchMessage, _socketGateway, strWatchAddress); + foreach (string strWatchAddress in WatchAddressList) + { + Watchup.StartPush(strWatchMessage, _socketGateway, strWatchAddress); + } } } }