MeiXinLaiRui/ShenSuoGanKongZhi.git

			@@ -15,15 +15,7 @@
			using WIDESEAWCS_TelescopicService;
			using WIDESEAWCS_ISystemServices;
			using WIDESEAWCS_Core.Helper;
			//<<<<<<< HEAD:project / WCS / WIDESEAWCS_Server / WIDESEAWCS_Tasks / SSG / AlarmResetJob.cs
			//using WIDESEAWCS_ISystemServices;
			//=======
			//<<<<<<< Updated upstream: 项目代码 / WCS / WIDESEAWCS_Server / WIDESEAWCS_Tasks / SSG / AlarmResetJob.cs
			//=======
			//using WIDESEAWCS_ISystemServices;
			//using WIDESEAWCS_Core.Helper;
			//>>>>>>> Stashed changes: project / WCS / WIDESEAWCS_Server / WIDESEAWCS_Tasks / SSG / AlarmResetJob.cs
			//>>>>>>> qy0318:项目代码 / WCS / WIDESEAWCS_Server / WIDESEAWCS_Tasks / SSG / AlarmResetJob.cs


			namespace WIDESEAWCS_Tasks
			{
			@@ -34,14 +26,15 @@
			private readonly IAlarmResetHsyServer _alarmResetHsyServer;
			private readonly ISys_UserService _UserService;
			WebSocketServer _webSocketServer;
			private readonly Idt_ErrormsginfoService _ErrormsginfoService;



			public AlarmResetJob(WebSocketServer webSocketServer, IAlarmResetHsyServer alarmResetHsyServer, ISys_UserService UserService)
			public AlarmResetJob(Idt_ErrormsginfoService errormsginfoService, WebSocketServer webSocketServer, IAlarmResetHsyServer alarmResetHsyServer, ISys_UserService UserService)
			{
			_webSocketServer = webSocketServer;
			_alarmResetHsyServer = alarmResetHsyServer;
			_UserService = UserService;
			_ErrormsginfoService = errormsginfoService;
			}


			@@ -62,58 +55,95 @@
			{
			//首先要一直读，如果发生了故障要写到_alarmResetHsyServer中记录下来并且给到前端数据
			//左plc
			var leftPLcstuck1 = devices.Value.left.Communicator.Read<bool>("M109"); //卡住报警
			var leftPLcOher1 = devices.Value.left.Communicator.Read<bool>("M111"); //其他报警 //默认是false
			Console.WriteLine($"{devices.Value.left.DeviceName}:卡住报警{leftPLcstuck1}，其他报警{leftPLcOher1}");
			if (leftPLcstuck1 == true && leftPLcOher1 == false)
			//if (leftPLcOher == false)
			try
			{
			string text = $"轨道{deid}：伸缩卡住报警";
			//报警了在这调用添加方法，并传给前端
			var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck1);
			if (devices.Value.left.IsConnected)
			{
			var leftPLcstuck1 = devices.Value.left.Communicator.Read<bool>("M109"); //卡住报警
			var leftPLcOher1 = devices.Value.left.Communicator.Read<bool>("M111"); //其他报警 //默认是false
			var leftPLcNowAdd = devices.Value.left.Communicator.Read<float>("D80");
			Console.WriteLine($"{devices.Value.left.DeviceName}:卡住报警{leftPLcstuck1}，其他报警{leftPLcOher1}");
			if (leftPLcstuck1 == true && leftPLcOher1 == false)
			//if (leftPLcOher == false)
			{
			string text = $"轨道{deid}：伸缩卡住报警";
			//报警了在这调用添加方法，并传给前端
			var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck1);

			}
			if (leftPLcstuck1 == true && leftPLcOher1 == false)
			{
			string text = $"轨道{deid}：其他故障报警";
			var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck1);

			}
			if (leftPLcstuck1 == true && leftPLcOher1 == true)//如果报警了
			{
			string text = $"轨道{deid}：报警伸缩卡住报警和其他故障报警";
			var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck1);
			}
			}
			if (leftPLcstuck1 == false && leftPLcOher1 == true)
			{
			string text = $"轨道{deid}：其他故障报警";
			var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck1);

			//右plc
			var rightPLcSuck = devices.Value.right.Communicator.Read<bool>("M109"); //卡住报警
			var rightPLcOher = devices.Value.left.Communicator.Read<bool>("M110");//其他报警
			Console.WriteLine($"{devices.Value.right.DeviceName}:卡住报警{rightPLcSuck}，其他报警{rightPLcOher}");
			if (rightPLcSuck == true && rightPLcOher == false)
			{
			string text = $"轨道{deid}：报警伸缩卡住报警";
			//报警了在这调用添加方法，并传给前端
			var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcSuck);
			// _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver这种只能传给前端json格式
			}
			if (leftPLcstuck1 == true && leftPLcOher1 == true)//如果报警了
			{
			string text = $"轨道{deid}：报警伸缩卡住报警和其他故障报警";
			var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck1);
			}
			_webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(new
			{
			device = "左Plc",
			Liftvalue = leftPLcNowAdd
			}));//把D80给前端
			}
			}
			if (rightPLcOher == true && rightPLcSuck == false)
			catch (Exception)
			{
			string text = $"轨道{deid}：其他故障报警";
			var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);
			string text = $"轨道{deid}：左PLC未连接";
			var reslut = _alarmResetHsyServer.AddAlarmHsy(text, false);//添加数据
			}
			if (rightPLcSuck == true && rightPLcOher == true)//如果报警了

			try
			{
			string text = $"轨道{deid}：报警伸缩卡住报警和其他故障报警";
			var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);//添加数据
			if (devices.Value.right.IsConnected)//是否连接上
			{
			//右plc
			var rightPLcSuck = devices.Value.right.Communicator.Read<bool>("M109"); //卡住报警
			var rightPLcOher = devices.Value.right.Communicator.Read<bool>("M110");//其他报警
			var rightPLcNowAdd = devices.Value.right.Communicator.Read<float>("D80");
			Console.WriteLine($"{devices.Value.right.DeviceName}:卡住报警{rightPLcSuck}，其他报警{rightPLcOher}");
			if (rightPLcSuck == true && rightPLcOher == false)
			{
			string text = $"轨道{deid}：报警伸缩卡住报警";
			//报警了在这调用添加方法，并传给前端
			var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcSuck);
			// _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver这种只能传给前端json格式
			}
			if (rightPLcOher == false && rightPLcSuck == true)
			{
			string text = $"轨道{deid}：其他故障报警";
			var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);
			}
			if (rightPLcSuck == true && rightPLcOher == true)//如果报警了
			{
			string text = $"轨道{deid}：报警伸缩卡住报警和其他故障报警";
			var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);//添加数据
			}
			_webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(new {
			device="右Plc",
			Rightvalue= rightPLcNowAdd
			}));//把D80给前端

			}
			}
			catch (Exception)
			{
			string text = $"轨道{deid}：右PLC未连接";
			var reslut = _alarmResetHsyServer.AddAlarmHsy(text, false);//添加数据
			}
			var alrt = _alarmResetHsyServer.GetWebSocketInfo();
			_webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alrt));

			}

			}


			catch (Exception ex)
			{

			_ErrormsginfoService.UpdateErrorMsg(ex.Message, 1);
			Console.WriteLine("错误信息：" + ex.Message);
			Console.WriteLine(ex.StackTrace);
			}
			@@ -129,8 +159,9 @@
			var left = (OtherDevice)Storage.Devices.Find(x => x.DeviceCode == leftCode);
			var right = (OtherDevice)Storage.Devices.Find(x => x.DeviceCode == rightCode);

			if (left == null \|\| right == null)
			return null;

			//if (left == null \|\| right == null)
			// return null;

			return (left, right);
			}