|
@@ -1485,11 +1485,13 @@ namespace IMCS.CCS.Service.Impl
|
|
|
//在线设备,报警放入推送数组
|
|
|
List<Device> onlineDeviceList = await getDeviceList();
|
|
|
foreach (Device onlineDevice in onlineDeviceList)
|
|
|
- {
|
|
|
+ {
|
|
|
+
|
|
|
EquipmentMonitor alarmEquipment = equipmentMonitors.Where(x => x.IP == onlineDevice.Ip && x.Type == onlineDevice.ProtocolType).FirstOrDefault();
|
|
|
|
|
|
if (alarmEquipment != null && alarmEquipment.Type == "HEIDEHAIN")
|
|
|
- {
|
|
|
+ {
|
|
|
+ Thread.Sleep(1000);
|
|
|
RequestHeidhData hdhReq = new RequestHeidhData();
|
|
|
hdhReq.ServerUrl = onlineDevice.ServerUrl;
|
|
|
hdhReq.MachineName = onlineDevice.UserName;
|
|
@@ -1512,6 +1514,7 @@ namespace IMCS.CCS.Service.Impl
|
|
|
}
|
|
|
else if (alarmEquipment != null && alarmEquipment.Type == "FANUC")
|
|
|
{
|
|
|
+ Thread.Sleep(1000);
|
|
|
string Url = fanucUrlContext + "?ip=" + onlineDevice.Ip + "&port=" + onlineDevice.Port;
|
|
|
//调用发那科接口
|
|
|
var Result = await _apiRequestService.RequestAsync(RequsetModeEnum.Get, Url + "&fun=AlmInfo", null, null);
|