RIZO/shgx_tz_mom
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

警报领域排序

Browse Source
This commit is contained in:
quowingwang 2025-12-29 16:23:05 +08:00
parent f7a3e5c57c
commit 3568a502e4
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Service/mes/andon/AndonAlarmAreaService.cs
View File

@ -41,6 +41,8 @@ namespace ZR.Service.mes.andon
UpdatedBy = t.UpdatedBy,
UpdatedTime = t.UpdatedTime
})
.OrderByDescending(t => t.ParentId)
.OrderByDescending (t => t.Area)
.ToPage(parm);
return response;

31
ZR.Service/mes/andon/AndonAlarmRecordService.cs
View File

@ -5,6 +5,7 @@ using Infrastructure.Attribute;
using Infrastructure.Helper;
using Infrastructure.Model;
using JinianNet.JNTemplate.Parsers;
using Microsoft.AspNetCore.Server.Kestrel.Core;
using SqlSugar;
using SqlSugar.Extensions;
using System;
@ -235,6 +236,15 @@ namespace ZR.Service.mes.andon
record.Remarks = parm.Remarks;
record.UpdatedBy = parm.UserId;
record.UpdatedTime = DateTime.Now;
//获取设备停机持续时间
if (record.CreatedTime != null)
{
record.DurationTime = getDurationTime((DateTime)record.CreatedTime);
}
else
{
record.DurationTime = 0;
}
UpdateAndonAlarmRecord(record);
AndonAlarmRecordProcess andonAlarmRecordProcess = new AndonAlarmRecordProcess();
andonAlarmRecordProcess.AlarmCode = record.AlarmCode;
@ -272,6 +282,27 @@ namespace ZR.Service.mes.andon
}
}
private int getDurationTime(DateTime alarmStartTime)
{
try
{
int duration = 0;
// 假设 MinDateValue 是 DateTime.MinValue 或某个最小日期
DateTime MinDateValue = DateTime.MinValue;
if (alarmStartTime > MinDateValue && alarmStartTime < DateTime.Now)
{
// 将当前时间减去创建时间，作为报警持续时间（返回分钟数）
TimeSpan timeSpan = DateTime.Now - alarmStartTime;
duration = (int)timeSpan.TotalMinutes;
}
return duration;
}
catch (Exception ex)
{
return 0;
}
}
public ApiResult AlarmReportHand(AndonAlarmRecordDto parm)
{
try