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-20 14:30:04 +08:00
parent b87ee906c7
commit 0a24cca79b
13 changed files with 160 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmAreaController.cs
View File

@ -103,7 +103,13 @@ namespace ZR.Admin.WebApi.Controllers.andon
}
[HttpGet("getPullDown")]
[ActionPermissionFilter(Permission = "business:andonalarmarea:list")]
public ApiResult GetPullDown()
{
var response = _AndonAlarmAreaService.GetPullDown();
return response;
}
}
}

11
ZR.Model/MES/andon/AndonAlarmLevel.cs
View File

@ -20,16 +20,11 @@ namespace ZR.Model.MES.andon
public string LevelName { get; set; }
/// <summary>
/// 三色灯颜色（红色/黄色）
/// 报警时间
/// </summary>
[SugarColumn(ColumnName = "light_color")]
public string LightColor { get; set; }
[SugarColumn(ColumnName = "level_time")]
public string LevelTime { get; set; }
/// <summary>
/// 适用场景
/// </summary>
[SugarColumn(ColumnName = "apply_scenario")]
public string ApplyScenario { get; set; }
/// <summary>
/// 创建人

55
ZR.Model/MES/andon/AndonAlarmRecord.cs
View File

@ -32,11 +32,6 @@ namespace ZR.Model.MES.andon
[SugarColumn(ColumnName = "alarm_type")]
public string AlarmType { get; set; }
/// <summary>
/// 报警级别
/// </summary>
[SugarColumn(ColumnName = "alarm_level")]
public string AlarmLevel { get; set; }
/// <summary>
/// 报警信息
@ -47,23 +42,50 @@ namespace ZR.Model.MES.andon
/// <summary>
/// 接收方
/// </summary>
[SugarColumn(ColumnName = "receiver")]
public int Receiver { get; set; }
[SugarColumn(ColumnName = "receiver1")]
public string Receiver1 { get; set; }
/// <summary>
/// 接收方名称
/// </summary>
[SugarColumn(ColumnName = "receiver_name")]
public string ReceiverName { get; set; }
[SugarColumn(ColumnName = "receiver1_name")]
public string Receiver1Name { get; set; }
/// <summary>
/// 管理方
/// 接收方
/// </summary>
[SugarColumn(ColumnName = "manager")]
public int Manager { get; set; }
[SugarColumn(ColumnName = "receiver2")]
public string Receiver2 { get; set; }
[SugarColumn(ColumnName = "manager_name")]
public string ManagerName { get; set; }
/// <summary>
/// 接收方名称
/// </summary>
[SugarColumn(ColumnName = "receiver2_name")]
public string Receiver2Name { get; set; }
/// <summary>
/// 接收方
/// </summary>
[SugarColumn(ColumnName = "receiver3")]
public string Receiver3 { get; set; }
/// <summary>
/// 接收方名称
/// </summary>
[SugarColumn(ColumnName = "receiver3_name")]
public string Receiver3Name { get; set; }
/// <summary>
/// 接收方
/// </summary>
[SugarColumn(ColumnName = "receiver4")]
public string Receiver4 { get; set; }
/// <summary>
/// 接收方名称
/// </summary>
[SugarColumn(ColumnName = "receiver4_name")]
public string Receiver4Name { get; set; }
/// <summary>
/// 序号
@ -118,10 +140,5 @@ namespace ZR.Model.MES.andon
[SugarColumn(ColumnName = "updated_time")]
public DateTime? UpdatedTime { get; set; }
/// <summary>
/// 响应时间（分）
/// </summary>
[SugarColumn(ColumnName = "response_time")]
public int ResponseTime { get; set; }
}
}

50
ZR.Model/MES/andon/AndonAlarmTypeDict.cs
View File

@ -49,31 +49,53 @@ namespace ZR.Model.MES.andon
[SugarColumn(ColumnName = "updated_time")]
public DateTime? UpdatedTime { get; set; }
/// <summary>
/// 响应时间（分）
/// </summary>
[SugarColumn(ColumnName = "response_time")]
public int ResponseTime { get; set; }
/// <summary>
/// 接收方
/// </summary>
[SugarColumn(ColumnName = "receiver")]
public int Receiver { get; set; }
[SugarColumn(ColumnName = "receiver1")]
public string Receiver1 { get; set; }
/// <summary>
/// 接收方名称
/// </summary>
[SugarColumn(ColumnName = "receiver_name")]
public string ReceiverName { get; set; }
[SugarColumn(ColumnName = "receiver1_name")]
public string Receiver1Name { get; set; }
/// <summary>
/// 管理方
/// 接收方
/// </summary>
[SugarColumn(ColumnName = "manager")]
public int Manager { get; set; }
[SugarColumn(ColumnName = "receiver2")]
public string Receiver2 { get; set; }
[SugarColumn(ColumnName = "manager_name")]
public string ManagerName { get; set; }
/// <summary>
/// 接收方名称
/// </summary>
[SugarColumn(ColumnName = "receiver2_name")]
public string Receiver2Name { get; set; }
/// <summary>
/// 接收方
/// </summary>
[SugarColumn(ColumnName = "receiver3")]
public string Receiver3 { get; set; }
/// <summary>
/// 接收方名称
/// </summary>
[SugarColumn(ColumnName = "receiver3_name")]
public string Receiver3Name { get; set; }
/// <summary>
/// 接收方
/// </summary>
[SugarColumn(ColumnName = "receiver4")]
public string Receiver4 { get; set; }
/// <summary>
/// 接收方名称
/// </summary>
[SugarColumn(ColumnName = "receiver4_name")]
public string Receiver4Name { get; set; }
}
}

11
ZR.Model/MES/andon/Dto/AndonAlarmAreaDto.cs
View File

@ -28,8 +28,19 @@ namespace ZR.Model.MES.andon.Dto
public string UpdatedBy { get; set; }
public DateTime? UpdatedTime { get; set; }
}
public class AlarmAreaPullDownDto
{
public string label { get; set; }
public int value { get; set; }
public List<AlarmAreaPullDown2Dto> children { get; set; }
}
public class AlarmAreaPullDown2Dto
{
public string label { get; set; }
public int value { get; set; }
}
}

4
ZR.Model/MES/andon/Dto/AndonAlarmLevelDto.cs
View File

@ -20,9 +20,7 @@ namespace ZR.Model.MES.andon.Dto
public string LevelName { get; set; }
public string LightColor { get; set; }
public string ApplyScenario { get; set; }
public string LevelTime { get; set; }
public string CreatedBy { get; set; }

18
ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs
View File

@ -28,18 +28,22 @@ namespace ZR.Model.MES.andon.Dto
public string AlarmType { get; set; }
public string AlarmLevel { get; set; }
public string AlarmInfo { get; set; }
public int Receiver { get; set; }
public string Receiver1 { get; set; }
public string ReceiverName { get; set; }
public string Receiver1Name { get; set; }
public string Receiver2 { get; set; }
public int Manager { get; set; }
public string Receiver2Name { get; set; }
public string ManagerName { get; set; }
public string Receiver3 { get; set; }
public string Receiver3Name { get; set; }
public string Receiver4 { get; set; }
public string Receiver4Name { get; set; }
public int? Sequence { get; set; }
public int? DurationTime { get; set; }
@ -61,7 +65,5 @@ namespace ZR.Model.MES.andon.Dto
public string UserId { get; set; }
public string UserName { get; set; }
public int ResponseTime { get; set; }
}
}

16
ZR.Model/MES/andon/Dto/AndonAlarmTypeDictDto.cs
View File

@ -29,15 +29,20 @@ namespace ZR.Model.MES.andon.Dto
public DateTime? UpdatedTime { get; set; }
public int ResponseTime { get; set; }
public string Receiver1 { get; set; }
public int Receiver { get; set; }
public string Receiver1Name { get; set; }
public string ReceiverName { get; set; }
public string Receiver2 { get; set; }
public string Receiver2Name { get; set; }
public string Receiver3 { get; set; }
public int Manager { get; set; }
public string Receiver3Name { get; set; }
public string Receiver4 { get; set; }
public string Receiver4Name { get; set; }
public string ManagerName { get; set; }
}
@ -45,6 +50,5 @@ namespace ZR.Model.MES.andon.Dto
{
public string label { get; set; }
public string value { get; set; }
public int ResponseTime { get; set; }
}
}

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

@ -1,4 +1,5 @@
using Infrastructure.Attribute;
using Infrastructure.Model;
using SqlSugar;
using ZR.Model;
using ZR.Model.MES.andon;
@ -75,5 +76,31 @@ namespace ZR.Service.mes.andon
return Update(model, true);
}
public ApiResult GetPullDown()
{
var response = Queryable()
.Where(a => a.ParentId == null || a.ParentId == 0)
.Select(a => new AlarmAreaPullDownDto
{
label = a.Area,
value = a.Id,
children = new List<AlarmAreaPullDown2Dto>()
})
.ToList();
foreach (var item in response)
{
item.children = Queryable()
.Where(a => a.ParentId == item.value)
.Select(a => new AlarmAreaPullDown2Dto
{
label = a.Area,
value = a.Id,
})
.ToList();
}
return ApiResult.Success("成功", response);
}
}
}

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

@ -89,7 +89,7 @@ namespace ZR.Service.mes.andon
.Select(it => new AlarmLevelPullDownDto
{
label = it.LevelName,
value = it.LightColor
value = it.LevelName,
}).ToList();
return ApiResult.Success("成功", response);
}

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

@ -22,6 +22,7 @@ namespace ZR.Service.mes.andon
{
private AndonAlarmLevelService andonAlarmLevelService = new AndonAlarmLevelService();
private AndonAlarmRecordProcessService andonAlarmRecordProcessService = new AndonAlarmRecordProcessService();
private AndonAlarmTypeDictService andonAlarmTypeDictService = new AndonAlarmTypeDictService();
/// <summary>
/// 查询报警记录列表
/// </summary>
@ -201,6 +202,20 @@ 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);

3
ZR.Service/mes/andon/AndonAlarmTypeDictService.cs
View File

@ -86,8 +86,7 @@ namespace ZR.Service.mes.andon
.Select(it => new AlarmTypePullDownDto
{
label = it.TypeCode,
value = it.TypeName,
ResponseTime = it.ResponseTime
value = it.TypeName
}).ToList();
return ApiResult.Success("成功", response);
}

3
ZR.Service/mes/andon/IService/IAndonAlarmAreaService.cs
View File

@ -3,6 +3,7 @@ using ZR.Model;
using System.Collections.Generic;
using ZR.Model.MES.andon;
using ZR.Model.MES.andon.Dto;
using Infrastructure.Model;
namespace ZR.Service.mes.andon.Iservice {
@ -18,6 +19,6 @@ namespace ZR.Service.mes.andon.Iservice {
AndonAlarmArea AddAndonAlarmArea(AndonAlarmArea parm);
int UpdateAndonAlarmArea(AndonAlarmArea parm);
ApiResult GetPullDown();
}
}