From fcd49db2ee33ee2e1d33e5a41e53d9897a8a3b0f Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 05 六月 2025 19:19:10 +0800
Subject: [PATCH] 限制plc伸到位报警，和限制开始作业无限点击问题
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs | 152 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 143 insertions(+), 9 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs
index aa804ae..6c62ad4 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs
@@ -17,6 +17,7 @@
using FaceAI;
using System.Runtime.InteropServices;
using System.IO;
+using WIDESEAWCS_DTO.Telescopic;
namespace WIDESEAWCS_SystemServices
{
@@ -28,7 +29,10 @@
private readonly IRepository<Dt_FaceRecognition> _faceServer;
private readonly IRepository<Dt_Loginhsy> _LoginhsyServer;
private readonly IRepository<Dt_Maintenance> _MainServer;
- public Sys_UserService(IRepository<Dt_Loginhsy> LoginhsyServer,IRepository<Dt_FaceRecognition> faceServer, IRepository<Sys_User> repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_MenuService menuService, IRepository<Dt_Maintenance> MainServer) : base(repository)
+ private readonly IRepository<Sys_Role> _RoleServer;
+ private readonly IRepository<Dt_AuthorizationRecord> _AuthorizatRecServer;
+
+ public Sys_UserService(IRepository<Dt_AuthorizationRecord> AuthorizatRecServer,IRepository<Sys_Role> RoleServer,IRepository<Dt_Loginhsy> LoginhsyServer,IRepository<Dt_FaceRecognition> faceServer, IRepository<Sys_User> repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_MenuService menuService, IRepository<Dt_Maintenance> MainServer) : base(repository)
{
_faceServer = faceServer;
_LoginhsyServer = LoginhsyServer;
@@ -36,7 +40,8 @@
_cacheService = cacheService;
_menuService = menuService;
_MainServer = MainServer;
-
+ _RoleServer = RoleServer;
+ _AuthorizatRecServer = AuthorizatRecServer;
}
@@ -557,8 +562,9 @@
IsLeader=addUserDTO.IsLeader,
RoleName = addUserDTO.rolename,
Enable = addUserDTO.enable,
+ Unit=addUserDTO.userunit,
UserPwd = "j79rYYvCz4vdhcboB1Ausg==",
- //Userteam=addUserDTO.userteam,
+ Userteam=addUserDTO.userteam,
Dept_Id=addUserDTO.dept_Id,
//CardNumber=addUserDTO.carnuber,
CreateDate = DateTime.Now
@@ -570,7 +576,7 @@
{
UserAccount = addUserDTO.username,
Roleid = addUserDTO.roleid,
- IsLeader=addUserDTO.IsLeader,//鏄惁鏄粍闀�
+ IsLeader =addUserDTO.IsLeader,//鏄惁鏄粍闀�
};
_MainServer.AddData(Main);
@@ -597,11 +603,16 @@
// 1. 鏌ヨ鐢ㄦ埛
var userList = BaseDal.QueryData();
var sys = userList.FirstOrDefault(x => x.User_Id == addUserDTO.id);
- //鏌ユ壘Dt_MaintenanceTeam涓殑鏁版嵁
- var team = _MainServer.QueryData(x => x.UserAccount == sys.UserName).FirstOrDefault();
if (sys == null)
{
return new WebResponseContent { Status = false, Message = "娌℃壘鍒拌鐢ㄦ埛" };
+ }
+
+ //鏌ユ壘Dt_MaintenanceTeam涓殑鏁版嵁
+ var team = _MainServer.QueryData(x => x.UserAccount == sys.UserName).FirstOrDefault();
+ if (team == null)
+ {
+ return new WebResponseContent { Status = false, Message = "娌℃壘鍒拌鐢ㄦ埛鐨勭淮鎶ょ粍淇℃伅" };
}
// 2. 妫�鏌ヨ处鍙锋槸鍚︿慨鏀癸紝骞跺垽鏂槸鍚﹂噸澶�//StringComparison.OrdinalIgnoreCase锛氳〃绀哄拷鐣ュぇ灏忓啓杩涜姣旇緝锛屾瘮濡� "admin" 鍜� "ADMIN" 涔熻涓烘槸鐩哥瓑鐨�
@@ -621,9 +632,10 @@
sys.Role_Id = addUserDTO.roleid;
sys.RoleName = addUserDTO.rolename;
//sys.CardNumber = addUserDTO.carnuber;
- //sys.Userteam = addUserDTO.userteam;
+ sys.Userteam = addUserDTO.userteam;
+ sys.Unit = addUserDTO.userunit;
sys.Dept_Id = addUserDTO.dept_Id;
- sys.Enable = addUserDTO.enable;
+ //sys.Enable = addUserDTO.enable;
sys.IsLeader = addUserDTO.IsLeader;//鏇存柊鐢ㄦ埛琛ㄧ殑鏄惁鏄粍闀�
//濡傛灉浜鸿劯璇嗗埆娣诲姞浜嗚繖閲屽氨娉ㄩ噴鎺�
sys.HeadImageUrl = addUserDTO.path;
@@ -654,11 +666,39 @@
//}
// 8. 鏇存柊鏁版嵁搴�
- BaseDal.UpdateData(sys);
+
//鏇存柊Dt_Maintenance琛ㄤ腑鐨勬暟鎹拰user琛ㄤ腑淇敼鐨勪竴鏍�
team.UserAccount = addUserDTO.username;//璐﹀彿
team.Roleid = addUserDTO.roleid;//鏇存柊鏉冮檺
team.IsLeader = addUserDTO.IsLeader;
+
+ var existAuthority = userList.FirstOrDefault(a => a.UserName == addUserDTO.username);
+ // 鍏堢紦瀛樻棫鐨� enable 鍊�
+ var oldEnable = sys.Enable;
+
+ // 淇敼 enable
+ sys.Enable = addUserDTO.enable;
+
+ // 鐒跺悗姣旇緝鏃у�煎拰鏂板��
+ if (oldEnable != addUserDTO.enable)
+ {
+ var authority = new Dt_AuthorizationRecord
+ {
+ Account = addUserDTO.username,
+ UserName = addUserDTO.usertruename,
+ UerUnit = addUserDTO.userunit,
+ UserTeam = addUserDTO.userteam,
+ EnableTime = addUserDTO.enable == 1 ? DateTime.Now : (DateTime?)null, //鍚敤
+ DisableTime = addUserDTO.enable == 0 ? DateTime.Now : (DateTime?)null,//涓嶅惎鐢�
+
+ };
+
+
+ _AuthorizatRecServer.AddData(authority);
+ }
+
+
+ BaseDal.UpdateData(sys);
_MainServer.UpdateData(team);
return new WebResponseContent { Status = true, Data = sys };
@@ -882,5 +922,99 @@
return new WebResponseContent { Status = false, Message="澶辫触"};
}
}
+
+
+ /// <summary>
+ /// 琛ㄨ繛鎺ヨ鑹茶〃锛屽睍绀烘暟鎹�
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent YShowUserList(PaginationDTO pagination)
+ {
+ try
+ {
+ int totalCount = 0;
+ var Role = _RoleServer.Db.Queryable<Sys_Role>();
+ var query = Role.InnerJoin<Sys_User>((a, b) => a.RoleId == b.Role_Id);
+
+ //鎼滅储鍏抽敭瀛�
+ if (!string.IsNullOrEmpty(pagination.searchKeyword))
+ {
+ query = query.Where((a, b) =>
+ b.UserName.Contains(pagination.searchKeyword) ||
+ b.UserTrueName.Contains(pagination.searchKeyword) ||
+ b.PhoneNo.Contains(pagination.searchKeyword) ||
+ a.RoleName.Contains(pagination.searchKeyword));
+ }
+ //鏃堕棿鏌ヨ
+ if (pagination.startDate.HasValue && pagination.endDate.HasValue)
+ {
+ query = query.Where((a, b) => b.CreateDate >= pagination.startDate.Value && b.CreateDate <= pagination.endDate.Value);
+ }
+ //鎺掑簭
+ if (!string.IsNullOrEmpty(pagination.sortField))
+ {
+ var isAcs = pagination.sortOrder?.ToLower() == "asc";
+ query = pagination.sortField.ToLower() switch
+ {
+
+
+ "CreateDate" => isAcs ? query.OrderBy((a, b) => b.CreateDate) : query.OrderByDescending((a, b) => b.CreateDate),
+
+ _ => query.OrderByDescending((a, b) => b.Creater) // 榛樿鎸夊垱寤烘椂闂撮檷搴�
+ };
+
+ }
+ else
+ {
+ query = query.OrderByDescending((a, b) => b.Creater);
+ }
+ var reslut = query.Select((a, b) => new
+ {
+ b.User_Id,
+ b.UserName,
+ b.UserTrueName,
+ b.Unit,
+ b.Userteam,
+ b.Role_Id,
+ b.IsLeader,
+ //b.RoleName,
+ b.CardNumber,
+ b.PhoneNo,
+ b.UserPwd,
+ b.DeptName,
+ b.Dept_Id,
+ b.Email,
+ b.Enable,
+ b.Gender,
+ b.HeadImageUrl,
+ b.Address,
+ b.CreateDate,
+ b.Creater,
+ a.RoleName,
+
+ }).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
+
+
+ return new WebResponseContent
+ {
+ Status = true,
+ Data = new
+ {
+ totalCount = totalCount,
+ PageIndex = pagination.pageIndex,
+ PageSize = pagination.pageSize,
+ Items = reslut
+ }
+ };
+
+ }
+ catch (Exception ex)
+ {
+
+ return new WebResponseContent { Status = false, Message = ex.Message };
+ }
+ }
+
+
}
}
--
Gitblit v1.9.3