diff --git a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs
index 5a7bde3a..02411c68 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs
@@ -213,5 +213,12 @@ namespace ZR.Admin.WebApi.Controllers.System
var result = ExportExcelMini(list.Result, "user", "用户列表");
return ExportExcel(result.Item2, result.Item1);
}
+
+ [HttpGet("getPullDown")]
+ public ApiResult GetUserPullDown(long userId)
+ {
+ var apiResult = UserService.GetUserPullDown();
+ return apiResult;
+ }
}
}
diff --git a/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordController.cs b/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordController.cs
index 168244d4..6138f298 100644
--- a/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordController.cs
@@ -11,8 +11,8 @@ namespace ZR.Admin.WebApi.Controllers.andon
///
/// 报警记录
///
- [Verify]
[Route("mes/AndonAlarmRecord")]
+ [AllowAnonymous]
public class AndonAlarmRecordController : BaseController
{
///
@@ -102,6 +102,18 @@ namespace ZR.Admin.WebApi.Controllers.andon
return ToResponse(response);
}
+ ///
+ /// 查询报警记录列表
+ ///
+ ///
+ ///
+ [HttpGet("listToday")]
+ [ActionPermissionFilter(Permission = "business:andonalarmrecord:list")]
+ public IActionResult GetListToday([FromQuery] AndonAlarmRecordQueryDto parm)
+ {
+ var response = _AndonAlarmRecordService.GetListToday(parm);
+ return SUCCESS(response);
+ }
}
diff --git a/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordProcessController.cs b/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordProcessController.cs
index b01c5e3b..8452d248 100644
--- a/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordProcessController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordProcessController.cs
@@ -11,8 +11,8 @@ namespace ZR.Admin.WebApi.Controllers.andon
///
/// 安灯报警处理过程
///
- [Verify]
[Route("mes/AndonAlarmRecordProcess")]
+ [AllowAnonymous]
public class AndonAlarmRecordProcessController : BaseController
{
///
diff --git a/ZR.Model/System/Dto/SysUserDto.cs b/ZR.Model/System/Dto/SysUserDto.cs
index c822da7f..eb8cf6be 100644
--- a/ZR.Model/System/Dto/SysUserDto.cs
+++ b/ZR.Model/System/Dto/SysUserDto.cs
@@ -31,4 +31,10 @@
public int Status { get; set; }
public long DeptId { get; set; }
}
+
+ public class UserPullDownDto
+ {
+ public string label { get; set; }
+ public string value { get; set; }
+ }
}
diff --git a/ZR.Service/System/IService/ISysUserService.cs b/ZR.Service/System/IService/ISysUserService.cs
index 03944180..19cd71bf 100644
--- a/ZR.Service/System/IService/ISysUserService.cs
+++ b/ZR.Service/System/IService/ISysUserService.cs
@@ -1,4 +1,5 @@
-using ZR.Model;
+using Infrastructure.Model;
+using ZR.Model;
using ZR.Model.System;
using ZR.Model.System.Dto;
@@ -81,5 +82,6 @@ namespace ZR.Service.System.IService
SysUser Login(LoginBodyDto user);
void UpdateLoginInfo(LoginBodyDto user, long userId);
+ ApiResult GetUserPullDown();
}
}
diff --git a/ZR.Service/System/SysUserService.cs b/ZR.Service/System/SysUserService.cs
index 3a4e5325..4ea0bbd4 100644
--- a/ZR.Service/System/SysUserService.cs
+++ b/ZR.Service/System/SysUserService.cs
@@ -1,6 +1,7 @@
using Infrastructure;
using Infrastructure.Attribute;
using Infrastructure.Extensions;
+using Infrastructure.Model;
using SqlSugar;
using System;
using System.Collections;
@@ -334,5 +335,24 @@ namespace ZR.Service
{
Update(new SysUser() { LoginIP = user.LoginIP, LoginDate = DateTime.Now, UserId = userId }, it => new { it.LoginIP, it.LoginDate });
}
+
+ public ApiResult GetUserPullDown()
+ {
+ try
+ {
+ var queryData = Queryable()
+ .Select(it => new UserPullDownDto
+ {
+ label = it.UserName,
+ value = it.UserId.ToString(),
+ }).ToList();
+ return new ApiResult() { Code = 200, Data = queryData };
+ }
+ catch (Exception ex)
+ {
+ return new ApiResult() { Code = 500, Msg = ex.Message };
+ }
+ }
+
}
}
diff --git a/ZR.Service/mes/andon/AndonAlarmRecordService.cs b/ZR.Service/mes/andon/AndonAlarmRecordService.cs
index 7e04704a..c9d02858 100644
--- a/ZR.Service/mes/andon/AndonAlarmRecordService.cs
+++ b/ZR.Service/mes/andon/AndonAlarmRecordService.cs
@@ -41,6 +41,20 @@ namespace ZR.Service.mes.andon
return response;
}
+ public PagedInfo GetListToday(AndonAlarmRecordQueryDto parm)
+ {
+ var predicate = Expressionable.Create();
+ DateTime dtNow = DateTime.Now;
+ DateTime startTime = new DateTime(dtNow.Year, dtNow.Month, dtNow.Day, 0, 0, 0);
+ DateTime endTime = new DateTime(dtNow.Year, dtNow.Month, dtNow.Day, 23, 59, 59);
+ predicate = predicate.And(it => it.CreatedTime >= startTime);
+ predicate = predicate.And(it => it.CreatedTime <= endTime);
+ var response = Queryable()
+ .Where(predicate.ToExpression())
+ .ToPage(parm);
+ return response;
+ }
+
///
/// 获取详情
diff --git a/ZR.Service/mes/andon/IService/IAndonAlarmRecordService.cs b/ZR.Service/mes/andon/IService/IAndonAlarmRecordService.cs
index 01ed2472..6a645185 100644
--- a/ZR.Service/mes/andon/IService/IAndonAlarmRecordService.cs
+++ b/ZR.Service/mes/andon/IService/IAndonAlarmRecordService.cs
@@ -13,11 +13,11 @@ namespace ZR.Service.mes.andon.Iservice
{
PagedInfo GetList(AndonAlarmRecordQueryDto parm);
+ PagedInfo GetListToday(AndonAlarmRecordQueryDto parm);
AndonAlarmRecord GetInfo(int Id);
AndonAlarmRecord AddAndonAlarmRecord(AndonAlarmRecord parm);
int UpdateAndonAlarmRecord(AndonAlarmRecord parm);
-
}
}