MeiXinLaiRui/ShenSuoGanNew.git

			@@ -174,14 +174,24 @@
			// return new WebResponseContent { Status = false, Data = ex.Message };
			// }
			//}
			public WebResponseContent PersonnelMonitoring(PaginationDTO pagination)
			/// <summary>
			/// äººåçæ§ï¼æ°åå¤§å±ï¼
			/// </summary>
			/// <param name="pageIndex"></param>
			/// <param name="pageSize"></param>
			/// <param name="searchKeyw
			public WebResponseContent PersonnelMonitoring(PaginationDTO pagination, string LocalIP)
			{
			try
			{
			int totalCount = 0;

			var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // å¦æ LocalIP æ¯ nullï¼ip ä¼æ¯ ""
			var cunstomip = _ipaddress.QueryData(x => x.IPaddress == ip).FirstOrDefault();


			var query = _user.Db.Queryable<Dt_Maintenance>()
			.Where(b => b.MaintenanceStatus == 1)
			.Where(b => b.MaintenanceStatus == 1&&b.StationID==cunstomip.StationID)
			.InnerJoin<Sys_User>((b, a) => b.UserAccount == a.UserName)
			.LeftJoin<Dt_CustomIPaddress>((b, a, c) => b.IPAddress == c.IPaddress);

			@@ -261,6 +271,8 @@

			// 4. æ§è¡å¼ºå¶ä¸çº¿
			maint.MaintenanceStatus = 0; // æ¹åç¶æä¸ºä¸çº¿
			maint.IPAddress = "";//å°ipå°åä¸ºnull
			maint.StationID = null;
			BaseDal.UpdateData(maint);

			var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // å¦æ LocalIP æ¯ nullï¼ip ä¼æ¯ ""
			@@ -515,7 +527,14 @@
			var user = BaseDal.QueryData();//æ£ä¿®è¡¨
			var maint = user.Where(x => x.UserAccount == account).FirstOrDefault(); //å¨æ£ä¿®è¡¨ä¸åæ¾å°è¯¥ç¨æ·
			var sysuer = _user.QueryData(x => x.UserName == account).FirstOrDefault();//å¨ç¨æ·è¡¨ä¸æ¾å°ç¨æ·

			var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // å¦æ LocalIP æ¯ nullï¼ip ä¼æ¯ ""
			//æ¾è®¾å¤ipå°åè¡¨
			var address = _ipaddress.QueryData(x => x.IPaddress == ip).FirstOrDefault();
			if (address==null)
			{
			return new WebResponseContent { Status = false, Message = "ä½ æ²¡æéç½®å¯¹åºçipå°åï¼è¯·åéç½®ï¼å¨æä½" };
			}

			if (maint == null \|\| sysuer == null)
			{
			return new WebResponseContent { Status = false, Message = "æ²¡ææ¾å°è¯¥ç¨æ·" };
			@@ -533,7 +552,8 @@
			//åè¦æ¾å°è¯¥ç¨æ·å±äºé£ä¸ªè§è²çï¼è¿ä¸ªè§è²ä¸å±äºé£ä¸ªä»ä¹ç±»åï¼ç»é¿/ç»åï¼
			if (maint.IsLeader != 1)//å¦æè¯¥ç¨æ·ä¸æ¯çé¿ï¼é£ä¹è¦ççé¿ååï¼ä»æå¯ä»¥å
			{
			bool leaderStarted = user.Any(x => x.IsLeader == 1 && x.MaintenanceStatus == 1); //å¦ææ»¡è¶³æ¡ä»¶ æ¾å°ä¸æ¡å°±è¿åtrue MaintenanceStatusï¼0æ²¡æå¼å§ï¼1å¼å§ï¼
			//æ¾è¯¥è½¨éç«ä¸çç»é¿ï¼æ¯å¦å¼å§æ£ä¿®
			bool leaderStarted = user.Any(x => x.IsLeader == 1 && x.MaintenanceStatus == 1&&x.StationID==address.StationID); //å¦ææ»¡è¶³æ¡ä»¶ æ¾å°ä¸æ¡å°±è¿åtrueï¼ MaintenanceStatusï¼0æ²¡æå¼å§ï¼1å¼å§ï¼
			if (!leaderStarted)
			{
			return new WebResponseContent { Status = false, Message = "è¯·çå¾ä¸çº§äººåå¼å§æ£ä¿®" };
			@@ -541,13 +561,15 @@

			}

			var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // å¦æ LocalIP æ¯ nullï¼ip ä¼æ¯ ""


			//å¦ææ»¡è¶³ä¸é¢çæ¡ä»¶å°±å¼å§
			maint.MaintenancStartTime = DateTime.Now;//è®°å½å¼å§æ¶é´
			maint.MaintenanceStatus = 1;//æ´æ¹ç¶æ
			maint.IPAddress = ip;//æ´æ¹ipå°å
			maint.StationID = address.StationID;//è®°å½è¯¥ç¨æ·æ¯é£ä¸ªè½¨éç«å¼å§ä½ä¸
			BaseDal.UpdateData(maint);
			var address = _ipaddress.QueryData(x=>x.IPaddress== ip).FirstOrDefault();

			var addressIp = "";
			if (address!=null) //æ¾å°äº
			{
			@@ -587,8 +609,18 @@
			try
			{
			var user = BaseDal.QueryData(); // æ£ä¿®è¡¨
			var maint = user.Where(x => x.UserAccount == account).FirstOrDefault();
			var maint = user.Where(x => x.UserAccount == account).FirstOrDefault();// æ£ä¿®è¡¨
			var sysuer = _user.QueryData(x => x.UserName == account).FirstOrDefault(); // ç¨æ·è¡¨

			var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // å¦æ LocalIP æ¯ nullï¼ip ä¼æ¯ ""
			var address = _ipaddress.QueryData(x => x.IPaddress == ip).FirstOrDefault();
			var addressIp = "";
			//å¦æç¨æ·ä¸å¨åæ¬è½¨éç«ä¸ç»æä»»å¡ï¼é£ä¹å°±æç¤ºä»è¦ä»åå»
			if (maint.IPAddress != ip)
			{
			return new WebResponseContent { Status = false, Message = "è¯·åå°åæ¥çè½¨éç«ç»æä»»å¡" };
			}


			if (maint == null \|\| sysuer == null)
			{
			@@ -630,9 +662,7 @@
			//{
			// return new WebResponseContent { Status = false, Message = "æä½è®¾å¤ä¸åï¼è¯·åå°åæ¬è®¾å¤åç¹å»ç»ææ£ä¿®" };
			//}
			var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // å¦æ LocalIP æ¯ nullï¼ip ä¼æ¯ ""
			var address = _ipaddress.QueryData(x => x.IPaddress == ip).FirstOrDefault();
			var addressIp = "";

			if (address != null) //æ¾å°äº
			{
			addressIp = address.Addressname;
			@@ -641,10 +671,13 @@
			{
			addressIp = ip;
			}


			// æ´æ°å½åç¨æ·çæ£ä¿®ç¶æ
			maint.MaintenancEendTime = DateTime.Now; // è®°å½ç»ææ¶é´
			maint.MaintenanceStatus = 0; // æ´æ¹ç¶æ
			maint.IPAddress= "";//ç»æä»»å¡åå°ipå°åæ¹ä¸ºnull
			maint.StationID = null;//å°è½¨éç«å·æ¹ä¸ºnull
			BaseDal.UpdateData(maint);

			// æå¥è®°å½è¡¨
			@@ -672,11 +705,16 @@
			/// å±ç¤ºå¼å§æ£ä¿®äººå
			/// </summary>
			/// <returns></returns>
			public WebResponseContent YShowStartTake()
			public WebResponseContent YShowStartTake(string LocalIP)
			{
			try
			{
			var reslut=BaseDal.QueryData(x => x.MaintenanceStatus == 1).ToList();
			var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // å¦æ LocalIP æ¯ nullï¼ip ä¼æ¯ ""
			//æ¾è®¾å¤ipå°åè¡¨
			var address = _ipaddress.QueryData(x => x.IPaddress == ip).FirstOrDefault();


			var reslut=BaseDal.QueryData(x => x.MaintenanceStatus == 1&&x.IPAddress==address.IPaddress).ToList();
			if (reslut.Count<=0)
			{
			return new WebResponseContent { Status = false, Message = "è¿æ²¡æäººå¼å§æ£ä¿®" };