MeiXinLaiRui/ShenSuoGanKongZhi.git

			@@ -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,23 +521,25 @@
			{
			return new WebResponseContent { Status = false, Message = "è´¦å·éå¤ï¼è¯·éæ°å½å¥" };
			}
			var face = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault();
			var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo
			{
			ImgPath = addUserDTO.path,
			user_id = addUserDTO.username,
			group_id = face // è¿éåºè¯¥å¡«ç¾åº¦äººè¸åºåç»
			// group_id = baiduResult.result.log_id
			});

			//äººè¸è¯å«åæ³¨éæåæå¼å¯
			//var face = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault();
			//var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo
			//{
			// ImgPath = addUserDTO.path,
			// user_id = addUserDTO.username,
			// group_id = face // è¿éåºè¯¥å¡«ç¾åº¦äººè¸åºåç»
			// // group_id = baiduResult.result.log_id
			//});


			// å¤æç¾åº¦è¿åæ¯å¦æå
			if (baiduResult == null \|\| baiduResult.error_code != 0)
			{
			return new WebResponseContent { Status = false, Data = "äººè¸æ³¨åå¤±è´¥ï¼" + baiduResult.error_msg };
			//// å¤æç¾åº¦è¿åæ¯å¦æå
			//if (baiduResult == null \|\| baiduResult.error_code != 0)
			//{
			// return new WebResponseContent { Status = false, Data = "äººè¸æ³¨åå¤±è´¥ï¼" + baiduResult.error_msg };


			}
			//}

			// åå»ºç¨æ·æ°æ®
			var sys = new Sys_User
			@@ -544,16 +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,
			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)
			@@ -563,6 +580,7 @@
			}

			}



			/// <summary>
			@@ -577,13 +595,15 @@
			// 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 = "æ²¡æ¾å°è¯¥ç¨æ·" };
			}

			// 2. æ£æ¥è´¦å·æ¯å¦ä¿®æ¹ï¼å¹¶å¤ææ¯å¦éå¤//StringComparison.OrdinalIgnoreCaseï¼è¡¨ç¤ºå¿½ç¥å¤§å°åè¿è¡æ¯è¾ï¼æ¯å¦ "admin" å "ADMIN" ä¹è®¤ä¸ºæ¯ç¸çç
			if (!string.Equals(sys.UserName ,addUserDTO.username))
			if (!string.Equals(sys.UserName, addUserDTO.username))
			{
			var existUser = userList.FirstOrDefault(a => a.UserName == addUserDTO.username);
			if (existUser != null)
			@@ -598,35 +618,46 @@
			sys.PhoneNo = addUserDTO.phoneno;
			sys.Role_Id = addUserDTO.roleid;
			sys.RoleName = addUserDTO.rolename;
			//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();

			// 5. å¤ææ¯å¦éè¦æ´æ°äººè¸ä¿¡æ¯
			if (!string.Equals(sys.HeadImageUrl,addUserDTO.path)) // ææ°å¾çæå¤çäººè¸æ³¨å
			{
			var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo
			{
			ImgPath = addUserDTO.path,
			user_id = sys.UserName,
			group_id = faceGroupID
			});
			//if (!string.Equals(sys.HeadImageUrl,addUserDTO.path)) // ææ°å¾çæå¤çäººè¸æ³¨å
			//{
			// var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo
			// {
			// ImgPath = addUserDTO.path,
			// user_id = sys.UserName,
			// group_id = faceGroupID
			// });

			// 6. å¤æç¾åº¦ API æ¯å¦æå
			if (baiduResult == null \|\| baiduResult.error_code != 0)
			{
			return new WebResponseContent { Status = false, Message = "äººè¸æ´æ°å¤±è´¥ï¼" + baiduResult.error_msg };
			}
			// // 6. å¤æç¾åº¦ API æ¯å¦æå
			// if (baiduResult == null \|\| baiduResult.error_code != 0)
			// {
			// return new WebResponseContent { Status = false, Message = "äººè¸æ´æ°å¤±è´¥ï¼" + baiduResult.error_msg };
			// }

			// 7. æ´æ°äººè¸ç¸å³åæ®µ
			sys.Log_id = baiduResult.log_id;
			sys.HeadImageUrl = addUserDTO.path;
			sys.Face_token = baiduResult.result.face_token;
			}
			// // 7. æ´æ°äººè¸ç¸å³åæ®µ
			// sys.Log_id = baiduResult.log_id;
			// sys.HeadImageUrl = addUserDTO.path;
			// sys.Face_token = baiduResult.result.face_token;
			//}

			// 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 };
			}
			@@ -650,31 +681,33 @@
			try
			{

			// 2. æ¥è¯¢äººè¸åºåç» ID
			var faceGroupID = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault();
			//// 2. æ¥è¯¢äººè¸åºåç» ID
			//var faceGroupID = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault();

			WIDESEAWCS_Common.DeleteUserImg deleteUserImg = new WIDESEAWCS_Common.DeleteUserImg();
			deleteUserImg.group_id = faceGroupID;
			deleteUserImg.user_id = account;
			//WIDESEAWCS_Common.DeleteUserImg deleteUserImg = new WIDESEAWCS_Common.DeleteUserImg();
			//deleteUserImg.group_id = faceGroupID;
			//deleteUserImg.user_id = account;

			string apiResult = BaiDuFaceHelper.DeleteUser(deleteUserImg);//åªè¦ç»tokenålog_id
			//string apiResult = BaiDuFaceHelper.DeleteUser(deleteUserImg);//åªè¦ç»tokenålog_id

			// 2. è§£æè¿åç»æï¼å¤æå é¤æ¯å¦æå
			dynamic resultObj = JsonConvert.DeserializeObject(apiResult);
			if (resultObj.error_code == 0)
			//// 2. è§£æè¿åç»æï¼å¤æå é¤æ¯å¦æå
			//dynamic resultObj = JsonConvert.DeserializeObject(apiResult);
			//if (resultObj.error_code == 0)
			//{
			// ç¾åº¦å é¤æååï¼å é¤æ°æ®åºä¸çç¨æ·
			var user = BaseDal.QueryData(x => x.UserName == account).FirstOrDefault();
			var main = _MainServer.QueryData(x => x.UserAccount == account).FirstOrDefault();
			if (user != null && main != null)
			{
			// ç¾åº¦å é¤æååï¼å é¤æ°æ®åºä¸çç¨æ·
			var user = BaseDal.QueryData(x => x.UserName == account);
			if (user != null)
			{
			BaseDal.DeleteData(user);
			}
			return WebResponseContent.Instance.OK("ç¨æ·å é¤æå");
			BaseDal.DeleteData(user);
			_MainServer.DeleteData(main);
			}
			else
			{
			return WebResponseContent.Instance.Error("ç¾åº¦ API å é¤å¤±è´¥ï¼" + resultObj.error_msg);
			}
			return WebResponseContent.Instance.OK("ç¨æ·å é¤æå");
			//}
			//else
			//{
			// return WebResponseContent.Instance.Error("ç¾åº¦ API å é¤å¤±è´¥ï¼" + resultObj.error_msg);
			//}
			}
			catch (Exception ex)
			{