From 1e414dac65915133e5474b6f811fd782be36a17f Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 29 五月 2025 13:30:15 +0800
Subject: [PATCH] 修改plc读写
---
project/后台管理/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs | 67 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 21 deletions(-)
diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs"
index 974f6ca..d71c92c 100644
--- "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs"
+++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs"
@@ -25,14 +25,15 @@
private readonly ISys_MenuService _menuService;
private readonly IRepository<Dt_FaceRecognition> _faceServer;
private readonly IRepository<Dt_Loginhsy> _LoginhsyServer;
- public Sys_UserService(IRepository<Dt_Loginhsy> LoginhsyServer,IRepository<Dt_FaceRecognition> faceServer, IRepository<Sys_User> repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_MenuService menuService) : base(repository)
+ 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)
{
_faceServer = faceServer;
_LoginhsyServer = LoginhsyServer;
_unitOfWorkManage = unitOfWorkManage;
_cacheService = cacheService;
_menuService = menuService;
-
+ _MainServer = MainServer;
}
@@ -520,7 +521,9 @@
{
return new WebResponseContent { Status = false, Message = "璐﹀彿閲嶅锛岃閲嶆柊褰曞叆" };
}
- //var face = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault();
+
+ //浜鸿劯璇嗗埆鍏堟敞閲婃帀鍚庢湡寮�鍚�
+ //var face = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault();
//var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo
//{
// ImgPath = addUserDTO.path,
@@ -544,19 +547,30 @@
UserName = addUserDTO.username,
UserTrueName = addUserDTO.usertruename,
HeadImageUrl = addUserDTO.path,
- // Log_id = baiduResult.log_id,
- // Face_token = baiduResult.result.face_token,
+ //Log_id = baiduResult.log_id,
+ //Face_token = baiduResult.result.face_token,
PhoneNo = addUserDTO.phoneno,
Role_Id = addUserDTO.roleid,
+ IsLeader = addUserDTO.IsLeader,
RoleName = addUserDTO.rolename,
Enable = addUserDTO.enable,
UserPwd = "j79rYYvCz4vdhcboB1Ausg==",
- Userteam = addUserDTO.userteam,
- Dept_Id=addUserDTO.dept_Id,
- CardNumber = addUserDTO.carnuber,
+ //Userteam = addUserDTO.userteam,
+ Dept_Id = addUserDTO.dept_Id,
+ //CardNumber=addUserDTO.carnuber,
CreateDate = DateTime.Now
};
BaseDal.AddData(sys);
+
+ //鍒涘缓Dt_Maintenance琛ㄤ腑鐨勬暟鎹�
+ var Main = new Dt_Maintenance
+ {
+ UserAccount = addUserDTO.username,
+ Roleid = addUserDTO.roleid,
+ IsLeader = addUserDTO.IsLeader,//鏄惁鏄粍闀�
+ };
+ _MainServer.AddData(Main);
+
return new WebResponseContent { Status = true, Data = sys };
}
catch (Exception ex)
@@ -566,6 +580,7 @@
}
}
+
/// <summary>
@@ -580,6 +595,8 @@
// 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 = "娌℃壘鍒拌鐢ㄦ埛" };
@@ -601,17 +618,18 @@
sys.PhoneNo = addUserDTO.phoneno;
sys.Role_Id = addUserDTO.roleid;
sys.RoleName = addUserDTO.rolename;
- sys.CardNumber = addUserDTO.carnuber;
- sys.Userteam = addUserDTO.userteam;
- sys.Enable = addUserDTO.enable;
+ //sys.CardNumber = addUserDTO.carnuber;
+ //sys.Userteam = addUserDTO.userteam;
sys.Dept_Id = addUserDTO.dept_Id;
+ sys.Enable = addUserDTO.enable;
+ sys.IsLeader = addUserDTO.IsLeader;//鏇存柊鐢ㄦ埛琛ㄧ殑鏄惁鏄粍闀�
//濡傛灉浜鸿劯璇嗗埆娣诲姞浜嗚繖閲屽氨娉ㄩ噴鎺�
sys.HeadImageUrl = addUserDTO.path;
- //// 4. 鏌ヨ浜鸿劯搴撳垎缁� ID
- //var faceGroupID = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault();
+ // 4. 鏌ヨ浜鸿劯搴撳垎缁� ID
+ var faceGroupID = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault();
- //// 5. 鍒ゆ柇鏄惁闇�瑕佹洿鏂颁汉鑴镐俊鎭�
+ // 5. 鍒ゆ柇鏄惁闇�瑕佹洿鏂颁汉鑴镐俊鎭�
//if (!string.Equals(sys.HeadImageUrl,addUserDTO.path)) // 鏈夋柊鍥剧墖鎵嶅鐞嗕汉鑴告敞鍐�
//{
// var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo
@@ -635,6 +653,11 @@
// 8. 鏇存柊鏁版嵁搴�
BaseDal.UpdateData(sys);
+ //鏇存柊Dt_Maintenance琛ㄤ腑鐨勬暟鎹拰user琛ㄤ腑淇敼鐨勪竴鏍�
+ team.UserAccount = addUserDTO.username;//璐﹀彿
+ team.Roleid = addUserDTO.roleid;//鏇存柊鏉冮檺
+ team.IsLeader = addUserDTO.IsLeader;
+ _MainServer.UpdateData(team);
return new WebResponseContent { Status = true, Data = sys };
}
@@ -671,13 +694,15 @@
//dynamic resultObj = JsonConvert.DeserializeObject(apiResult);
//if (resultObj.error_code == 0)
//{
- // 鐧惧害鍒犻櫎鎴愬姛鍚庯紝鍒犻櫎鏁版嵁搴撲腑鐨勭敤鎴�
- var user = BaseDal.QueryData(x => x.UserName == account);
- if (user != null)
- {
- BaseDal.DeleteData(user);
- }
- return WebResponseContent.Instance.OK("鐢ㄦ埛鍒犻櫎鎴愬姛");
+ // 鐧惧害鍒犻櫎鎴愬姛鍚庯紝鍒犻櫎鏁版嵁搴撲腑鐨勭敤鎴�
+ var user = BaseDal.QueryData(x => x.UserName == account).FirstOrDefault();
+ var main = _MainServer.QueryData(x => x.UserAccount == account).FirstOrDefault();
+ if (user != null && main != null)
+ {
+ BaseDal.DeleteData(user);
+ _MainServer.DeleteData(main);
+ }
+ return WebResponseContent.Instance.OK("鐢ㄦ埛鍒犻櫎鎴愬姛");
//}
//else
//{
--
Gitblit v1.9.3