Merge branch 'master' of http://106.14.142.95:3000/lxb/htl_httpserver

# Conflicts:
#	deviceHttpServer/opcua/OpcUaServer.cs

deviceHttpServer/body/ResponseBody.cs

@@ -8,7 +8,7 @@ namespace ResponseServer.HttpServer
     public class ResponseBody
     {
         public int code
-        { get; set; }
+        { get; set; } = 0;
 
         public bool result
         { get; set; } = true;
@@ -16,35 +16,12 @@ namespace ResponseServer.HttpServer
         public string msg
         { get; set; } = "调用成功";
 
-        public int statusCode { get; set; } = 200;
-
-        public List<ToolsInfo> toolsInfo { get; set; }
-
+        public int statusCode { get; set; } = 200; 
         public string toolsData { get; set; }
         public string errorsInfo { get; set; } = "";
 
         public string runDatasInfo { get; set; } = "";
-
-        public DeviceInfoData deviceData
-        { get; set; }
-
-        public string mainProg //主程序号
-        { get; set; }
-
-        public string actFeed  //主轴进给速度
-        { get; set; }
-
-        public string spindleMagnification   //主轴倍率
-        { get; set; }
-
-        public string feedRateOvr   //进给倍率
-        { get; set; }
-
-        public string actSpindle   //主轴转速
-        { get; set; }
-
-        public string powerOnTime  //开机时长
-        { get; set; }
+ 
         public string deviceState  //设备状态
         { get; set; } = "离线";
     }
@@ -58,32 +35,68 @@ namespace ResponseServer.HttpServer
 
         public string targetLife { get; set; }
 
-        public string warnLife { get; set; }
+        //额定寿命
+        public string rateLife { get; set; }
 
-        public string curTime { get; set; }
+        public string useLife { get; set; }
 
+        public string curTime { get; set; }
+        //0:时间 1:次数
+        public int lifeType { get; set; } = 0;
 
 
     }
 
     public class RunDatasInfo
     {
-        /// <summary>
-        /// 进给倍率
-        /// </summary>
-        public string feedRate { get; set; }
-        /// <summary>
-        /// 主轴倍率
-        /// </summary>
-        public string spindleMagnification { get; set; }
-        /// <summary>
-        /// 主轴转速
-        /// </summary>
-        public string spindleSpeed { get; set; }
-        /// <summary>
-        /// 主轴负载
-        /// </summary>
-        public string spindleLoad { get; set; }
+        public string mainProg //主程序号
+        { get; set; }
+        public int partsCount //工件数
+        { get; set; }
+        public string actFeedSpeed  //主轴进给速度
+        { get; set; }
+
+        public string spindleRateOvr  //主轴倍率
+        { get; set; }
+
+        public string feedRateOvr   //进给倍率
+        { get; set; }
+        public string spindleLoad  //主轴负载
+        { get; set; }
+        public string feedAxisLoad  //进给轴负载
+        { get; set; }
+        public string servoLoad  //伺服负载
+        { get; set; }
+        public string actSpindleSpeed   //主轴转速
+        { get; set; }
+
+        public string powerOnTime  //开机时长
+        { get; set; }
+        public string ncSysTime  //nc系统时间
+        { get; set; }
+        public string ncModel  //nc型号
+        { get; set; }
+        public string machineCoordinate  //机械坐标
+        { get; set; }
+        public string relativeCoordinate  //相对坐标
+        { get; set; }
+        public string absoluteCoordinate  //绝对坐标
+        { get; set; }
+        public string runMode  //运行模式
+        { get; set; }
+        public string ncRunTime  //NC运行时间
+        { get; set; }
+        public string currentToolNo  //当前刀号
+        { get; set; }
+
+        public string runStatus  //运行状态
+        { get; set; } = "空闲";
+
+    }
+    public class AlmInfo
+    {
+        public string no { get; set; }
+        public string msg { get; set; }
 
     }
 }

deviceHttpServer/fanuc/FanucServer.cs

@@ -29,21 +29,7 @@ namespace Fanuc_HttpServer.fanuc
             {
                 ConDevice2 CIF2 = new ConDevice2(ip, port);
 
-                if (CIF2.h > 0)
-                {
-                    responseBody.mainProg = CIF2.MainProg();
-                    responseBody.actFeed = CIF2.FeedSpeed();
-                    responseBody.actSpindle = CIF2.ActSpindle();
-                    responseBody.spindleMagnification = CIF2.spindleMagnification();
-                    responseBody.powerOnTime = CIF2.PowerOnTime();
-                    responseBody.feedRateOvr = CIF2.GetFeedrate();
-                    responseBody.deviceState = ON_LINE_STATE;
-                    CIF2.freehand();
-                }
-                else
-                {
-                    responseBody.msg = "调用失败";
-                }
+               
             }
             else if (fun == ActionTypeEnum.Upload.ToString())
             {
@@ -90,30 +76,7 @@ namespace Fanuc_HttpServer.fanuc
             }
             else if (fun == ActionTypeEnum.AlmInfo.ToString())
             {
-                try
-                {
-                    List<ConDevice.AlmInfo> allAlmList = new List<AlmInfo>();
-                    ConDevice2 con2 = new ConDevice2(ip, port);
-                    //实时报警
-                    List<ConDevice.AlmInfo> alms = con2.operationAlarm();
-                    //信息履历
-                    List<ConDevice.AlmInfo> almLL = con2.rdalmhistry5();
-                    if (alms != null && alms.Count() > 0)
-                    {
-                        allAlmList.AddRange(alms);
-                    }
-                    if (almLL != null && almLL.Count() > 0)
-                    {
-                        allAlmList.AddRange(almLL);
-                    }
-                    responseBody.deviceState = ON_LINE_STATE;
-                    con2.freehand();
-
-                }
-                catch (Exception ex)
-                {
-                    responseBody.msg = "获取报警失败：" + ex.Message;
-                }
+                 
 
             }
 

deviceHttpServer/hedidenain/HeidenhainServer.cs

@@ -55,218 +55,7 @@ namespace Fanuc_HttpServer.hedidenain
 
                 else
                 {
-                    //第一次连接加入数组,以支持多台设备
-                    if (machineList == null || (machineList.Where(m => m.Key == requestBody.machineName).Count() == 0))
-                    {
-                        DNC_STATE m_ControlState = connect(requestBody.machineName);
-
-                        Thread.Sleep(100);
-                    }
-                    //DNC连接正常,获取连接Machine = machineList.Where(m => m.Key == requestBody.machineName).FirstOrDefault().Value;
-                    Machine = machineList.Where(m => m.Key == requestBody.machineName).FirstOrDefault().Value;
-                    if (Machine != null)
-                    {
-                        try
-                        {
-                            if (Machine.GetState().ToString() == "DNC_STATE_MACHINE_IS_AVAILABLE")
-                            {
-                                responseBody.deviceState = ON_LINE_STATE;
-                                JHError m_Error = Machine.GetInterface(HeidenhainDNCLib.DNC_INTERFACE_OBJECT.DNC_INTERFACE_JHERROR);
-                                JHErrorEntry2List errorsList = m_Error.GetErrorList();
-                                IJHErrorEntry2 pErrorEntry = null;
-                                for (int i = 0; i < errorsList.Count; i++)
-                                {
-                                    pErrorEntry = errorsList[i];
-                                    if (pErrorEntry != null && pErrorEntry.Text != null)
-                                    {
-                                        //Console.WriteLine("===" + pErrorEntry.Text.ToString());
-                                        responseBody.errorsInfo += pErrorEntry.Text.ToString() + " ";
-                                    }
-                                }
-
-                                if (fun == ActionTypeEnum.Collect.ToString())
-                                {
-
-                                    JHAutomatic m_Automatic = Machine.GetInterface(DNC_INTERFACE_OBJECT.DNC_INTERFACE_JHAUTOMATIC);
-
-                                    JHProcessData m_ProcessData = Machine.GetInterface(HeidenhainDNCLib.DNC_INTERFACE_OBJECT.DNC_INTERFACE_JHPROCESSDATA);
-
-
-                                    object pFeed = new object();
-                                    object pSpeed = new object();
-                                    object pRapid = new object();
-                                    object proStatus = new object();
-                                    //进出倍率 主轴倍率 
-                                    m_Automatic.GetOverrideInfo(ref pFeed, ref pSpeed, ref pRapid);
-                                    //主程序
-                                    object pSelectedProgram = new object(); ;
-                                    m_Automatic.GetExecutionPoint(ref pSelectedProgram);
-                                    responseBody.mainProg = pSelectedProgram.ToString();
-
-                                    m_Automatic.GetExecutionMode();
-                                    DNC_STS_PROGRAM dncProgram = m_Automatic.GetProgramStatus();
-
-                                    RunDatasInfo runDatasInfo = new RunDatasInfo();
-                                    responseBody.feedRateOvr = pFeed.ToString();
-                                    responseBody.spindleMagnification = pSpeed.ToString();
-                                    //responseBody.actSpindle = pRapid.ToString();
-                                    //计算开机时长
-                                    object oHours = new object();
-                                    object oMinutes = new object();
-                                    // --- NC uptime --------------------------------------------------------------------------
-                                    m_ProcessData.GetNcUpTime(ref oHours, ref oMinutes);
-                                    string ncUpTime = oHours.ToString() + ":" + (Convert.ToInt32(oMinutes) > 9 ? oMinutes.ToString() : ("0" + oMinutes.ToString()));
-
-                                    // --- Machine uptime ---------------------------------------------------------------------
-                                    m_ProcessData.GetMachineUpTime(ref oHours, ref oMinutes);
-                                    string machineUpTime = oHours.ToString() + ":" + (Convert.ToInt32(oMinutes) > 9 ? oMinutes.ToString() : ("0" + oMinutes.ToString()));
-                                    // --- Machine running time ---------------------------------------------------------------
-                                    m_ProcessData.GetMachineRunningTime(ref oHours, ref oMinutes);
-                                    string runningTimes = oHours.ToString() + ":" + (Convert.ToInt32(oMinutes) > 9 ? oMinutes.ToString() : ("0" + oMinutes.ToString()));
-
-                                    responseBody.powerOnTime = (Convert.ToInt32(oHours) * 60 + Convert.ToInt32(oMinutes)).ToString();
-
-                                    JHDataAccess m_DataAccess = Machine.GetInterface(HeidenhainDNCLib.DNC_INTERFACE_OBJECT.DNC_INTERFACE_JHDATAACCESS);
-                                    HeidenhainDNCLib.DNC_ACCESS_MODE accessModeEnum = (HeidenhainDNCLib.DNC_ACCESS_MODE)Enum.Parse(typeof(HeidenhainDNCLib.DNC_ACCESS_MODE), "DNC_ACCESS_MODE_PLCDATAACCESS");
-                                    m_DataAccess.SetAccessMode(accessModeEnum, "807667");
-                                    List<string> param = jcIpDict[ip];
-                                    for (int j = 0; j < param.Count; j++)
-                                    {
-                                        IJHDataEntry m_DataEntry = m_DataAccess.GetDataEntry(param[j]);
-                                        IJHDataEntryPropertyList dataEntryPropertyList = m_DataEntry.propertyList;
-                                        for (int i = 0; i < dataEntryPropertyList.Count; i++)
-                                        {
-                                            IJHDataEntryProperty dataEntryProperty = dataEntryPropertyList[i];
-                                            if (dataEntryProperty.kind == DNC_DATAENTRY_PROPKIND.DNC_DATAENTRY_PROPKIND_DATA)
-                                            {
-                                                if (j == 0)
-                                                {
-                                                    if (ip == "192.168.10.109")
-                                                    {
-                                                        responseBody.actSpindle = (Convert.ToInt32(dataEntryProperty.varValue) / 1000).ToString();
-                                                    }
-                                                    else
-                                                    {
-                                                        responseBody.actSpindle = dataEntryProperty.varValue.ToString();
-                                                    }
-
-                                                }
-                                                else if (j == 1)
-                                                {
-                                                    responseBody.actFeed = dataEntryProperty.varValue.ToString();
-                                                }
-
-                                            }
-
-
-                                        }
-                                    }
-
-                                }
-                                else if (fun == ActionTypeEnum.Upload.ToString())
-                                {
-
-                                    JHFileSystem m_FileSystem = Machine.GetInterface(DNC_INTERFACE_OBJECT.DNC_INTERFACE_JHFILESYSTEM);
-
-                                    JHAutomatic m_Automatic = Machine.GetInterface(DNC_INTERFACE_OBJECT.DNC_INTERFACE_JHAUTOMATIC);
-
-                                    string sSelectedFile = Path.GetFileName(requestBody.path);
-
-                                    string dncPath = GenPath(RemotePath, sSelectedFile);
-                                    string tempDncPath = RemotePath + "\\2.h";
-                                    //设置临时程序为主程序
-                                    //  m_Automatic.SelectProgram(iChannel, tempDncPath);
-                                    try
-                                    { //删除上传文件，try异常防止文件不存在
-                                      //m_FileSystem.DeleteFile(dncPath);
-                                    }
-                                    catch (Exception edel)
-                                    {
-                                    }
-                                    //上传
-                                    m_FileSystem.TransmitFile(requestBody.path, dncPath);
-                                    //设当前上传程序为主程序
-                                    // m_Automatic.SelectProgram(iChannel, dncPath);
-                                }
-
-                                else if (fun == ActionTypeEnum.StartNcProgram.ToString())//启动程序备用
-                                {
-
-                                    JHAutomatic m_Automatic = Machine.GetInterface(DNC_INTERFACE_OBJECT.DNC_INTERFACE_JHAUTOMATIC);
-
-                                    //m_Automatic.SelectProgram(iChannel, GenPath(RemotePath, hdhBody.Path));
-                                    //Thread.Sleep(1000);
-                                    m_Automatic.StartProgram(GenPath(RemotePath, requestBody.path));
-                                }
-                                else if (fun == ActionTypeEnum.ToolList.ToString())
-                                {
-                                    IJHDataEntry2 ToolLine = null;
-                                    IJHDataEntry2List ToolCells = null;
-                                    //IJHDataEntry2 ToolCell = null;                                    
-                                    List<ToolsInfo> toolsList = new List<ToolsInfo>();
-                                    JHDataAccess dataAccess = Machine.GetInterface(HeidenhainDNCLib.DNC_INTERFACE_OBJECT.DNC_INTERFACE_JHDATAACCESS);
-                                    dataAccess.SetAccessMode(DNC_ACCESS_MODE.DNC_ACCESS_MODE_TABLEDATAACCESS, "");
-                                    //string ToolColumnNamesAccessor = @"\TABLE\TOOL\T\('1'-'50')";   // see Init()
-                                    string ToolColumnNamesAccessor = @"\TABLE\TOOL_P\T\('1'-'50')";
-                                    IJHDataEntry2 ToolTable = dataAccess.GetDataEntry2(ToolColumnNamesAccessor, DNC_DATA_UNIT_SELECT.DNC_DATA_UNIT_SELECT_METRIC, false);
-                                    IJHDataEntry2List ToolLines = ToolTable.GetChildList();
-                                    int ToolLinesCount = ToolLines.Count >= 50 ? 50 : ToolLines.Count;
-                                    //int ToolLinesCount = ToolLines.Count;                                    
-                                    for (int i = 0; i < ToolLinesCount; i++)
-                                    {
-                                        ToolLine = ToolLines[i];
-                                        ToolCells = ToolLine.GetChildList();
-                                        // get child list from server                                       
-                                        ToolsInfo toolsInfo = new ToolsInfo();
-
-                                        //刀位编码
-                                        int[] pCode = ToolCells[0].GetPropertyValue(DNC_DATAENTRY_PROPKIND.DNC_DATAENTRY_PROPKIND_DATA);
-                                        toolsInfo.position = string.Join(".", pCode);
-                                        toolsInfo.number = ToolCells[1].GetPropertyValue(DNC_DATAENTRY_PROPKIND.DNC_DATAENTRY_PROPKIND_DATA).ToString();
-                                        toolsInfo.name = ToolCells[2].GetPropertyValue(DNC_DATAENTRY_PROPKIND.DNC_DATAENTRY_PROPKIND_DATA).ToString();
-
-
-                                        if (!String.IsNullOrEmpty(toolsInfo.name) && !String.IsNullOrEmpty(toolsInfo.number) && pCode.Length > 0 && pCode[1] > 0)
-                                        {
-                                            string ToolNumberAccessor = @"\TABLE\TOOL\T\" + toolsInfo.number.ToString();
-                                            IJHDataEntry2List ToolList = dataAccess.GetDataEntry2(ToolNumberAccessor, DNC_DATA_UNIT_SELECT.DNC_DATA_UNIT_SELECT_METRIC, false).GetChildList();
-
-                                            //报警期限
-                                            toolsInfo.warnLife = ToolList[10].GetPropertyValue(DNC_DATAENTRY_PROPKIND.DNC_DATAENTRY_PROPKIND_DATA).ToString();
-                                            //刀具寿命目标值
-                                            toolsInfo.targetLife = ToolList[11].GetPropertyValue(DNC_DATAENTRY_PROPKIND.DNC_DATAENTRY_PROPKIND_DATA).ToString();
-                                            //Cur_Time使用时间
-                                            toolsInfo.curTime = ToolList[12].GetPropertyValue(DNC_DATAENTRY_PROPKIND.DNC_DATAENTRY_PROPKIND_DATA).ToString();
-
-                                            toolsList.Add(toolsInfo);
-                                        }
-                                    }
-                                    //获取海德汉的刀具寿命信息
-                                    responseBody.toolsInfo = toolsList;
-                                }
-                            }
-                            else if (Machine.GetState().ToString() != "DNC_STATE_MACHINE_IS_AVAILABLE") //机床状态不可用 断开连接
-                            {
-                                responseBody.msg = Machine.GetState().ToString();
-                                responseBody.result = false;
-                                Machine.Disconnect();
-                                Marshal.ReleaseComObject(Machine);
-                                Machine = null;
-                                machineList.Remove(requestBody.machineName);
-                            }
-                        }
-                        catch(Exception e)
-                        {
-                            YG.Log.Instance.WriteLogAdd($"海德汉响应结果-e-->> " + e.Message);
-                            responseBody.msg = Machine.GetState().ToString();
-                            responseBody.result = false;
-                            Machine.Disconnect();
-                            Marshal.ReleaseComObject(Machine);
-                            Machine = null;
-                            machineList.Remove(requestBody.machineName);
-                        }
-                        
-                    }
+                     
                 }
 
             }

deviceHttpServer/mazak/MazakDll.cs

@@ -1578,7 +1578,15 @@ public class MaCls
 
 	// Token: 0x060001BD RID: 445
 	[DllImport("NTIFDLL.dll", CharSet = CharSet.Ansi, ExactSpelling = true, SetLastError = true)]
-	public static extern int MazGetAxisName(ushort flibHndl, ref byte alldata);
+	public static extern int MazGetAxisName(ushort param0, ref MAZ_AXISNAME param1);
+
+	[DllImport("NTIFDLL.dll")]
+	public static extern int MazGetCurrentPos(ushort param0, ref MAZ_NCPOS param1);
+
+	[DllImport("NTIFDLL.dll")]
+	public static extern int MazGetRemain(ushort param0, ref MAZ_NCPOS param1);
+	[DllImport("NTIFDLL.dll")]
+	public static extern int MazGetMachinePos(ushort param0, ref MAZ_NCPOS param1);
 
 	// Token: 0x060001BE RID: 446
 	[DllImport("NTIFDLL.dll", CharSet = CharSet.Ansi, ExactSpelling = true, SetLastError = true)]
@@ -1821,4 +1829,6 @@ public struct MAZ_TD_ERROR
 	// Token: 0x04000477 RID: 1143
 	[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 36)]
 	public string dummy2;
-}
+}
+
+ 

deviceHttpServer/mazak/MazakServer.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.NetworkInformation;
 using System.Text;
 using System.Threading.Tasks;
 using static MaCls;
@@ -14,246 +15,437 @@ namespace HttpServer.mazak
     class MazakServer
     {
         private static string ON_LINE_STATE = "在线";
+        private static Dictionary<short, string> runModeDict = new Dictionary<short, string>();
+        public MazakServer()
+        {
+            runModeDict.Add(0, "No operation mode");
+            runModeDict.Add(1, "Automatic operation mode");
+            runModeDict.Add(2, "Tape operation mode");
+            runModeDict.Add(3, "Rapid traverse mode");
+            runModeDict.Add(4, "Home return mode");
+            runModeDict.Add(5, "Cutting feed/manual pulse mode");
+            runModeDict.Add(6, "MDI operation mode");
+        }
+       
         static ushort h;
         public static ResponseBody requestHttpServer(RequestBody requestBody)
         {
             string ip = requestBody.serverUrl;
             string port = requestBody.port;
-            string fun = requestBody.type;
+            string fun = requestBody.type; 
+
             YG.Log.Instance.WriteLogAdd($"mazak-请求参数-->> " + JsonConvert.SerializeObject(requestBody));
             ResponseBody responseBody = new ResponseBody();
             responseBody.deviceState = ON_LINE_STATE;
-            // port = 50100;
-            int ret = MaCls.MazConnect(out h, ip, 50100, 10);
-            YG.Log.Instance.WriteLogAdd($"mazak-连接结果-->> " + ret);
-            if (fun == ActionTypeEnum.Collect.ToString())
+
+            Ping pingSender = new Ping();
+            PingReply reply = pingSender.Send(ip);
+            if (reply.Status != IPStatus.Success)
             {
+                responseBody.deviceState = "离线";
+                responseBody.msg = "网络不通";
+            }
+            else
+            {
+                // port = 50100;
+                int ret = MaCls.MazConnect(out h, ip, 50100, 10);
+                YG.Log.Instance.WriteLogAdd($"mazak-连接结果-->> " + ret);
+                RunDatasInfo runDataInfo = new RunDatasInfo();
+                if (fun == ActionTypeEnum.Collect.ToString())
+                {
+                    ushort status0 = 0;
+                    short status = 1;
+                    ret = MaCls.MazGetRunningSts(h, status0, ref status);
+                    YG.Log.Instance.WriteLogAdd($"mazak-status-->> " + status);
+                    MAZ_NCONTIME powerTime = default(MAZ_NCONTIME);
+                    ret = MaCls.MazGetNcPowerOnTime(h, ref powerTime);
+                    if(ret == 0)
+                    {
+                        runDataInfo.powerOnTime = powerTime.uint_3.ToString();
+                    }
+                    MAZ_NCTIME runTime = default(MAZ_NCTIME);
+                    ret = MaCls.MazGetRunningTime(h, 0, ref runTime);
 
-                ushort status0 = 0;
-                short status = 1;
-                ret = MaCls.MazGetRunningSts(h, status0, ref status);
-                YG.Log.Instance.WriteLogAdd($"mazak-status-->> " + status);
-                MAZ_NCONTIME powerTime = default(MAZ_NCONTIME);
-                ret = MaCls.MazGetNcPowerOnTime(h, ref powerTime);
+                    YG.Log.Instance.WriteLogAdd($"mazak-powerTime-->> " + powerTime.uint_3);
 
-                MAZ_NCTIME runTime = default(MAZ_NCTIME);
-                ret = MaCls.MazGetRunningTime(h, 0, ref runTime);
+                    //获取轴名称
+                    MAZ_AXISNAME axisNameInfo = default(MAZ_AXISNAME); 
+                    ret = MaCls.MazGetAxisName(h, ref axisNameInfo);
+                    if(ret == 0)
+                    { 
+                        foreach(OneAxisName axisName in axisNameInfo.axis)
+                        {
 
-                YG.Log.Instance.WriteLogAdd($"mazak-powerTime-->> " + powerTime.uint_3);
-                MAZ_PROINFO proInfo = default(MAZ_PROINFO);
-                ret = MaCls.MazGetMainPro(h, status0, ref proInfo);
-                YG.Log.Instance.WriteLogAdd($"mazak-主程序-->> " + proInfo.comment + ",string_0=" + proInfo.string_0);
-                MAZ_FEED maz_feed = default(MAZ_FEED);
-                ret = MaCls.MazGetFeed(h, status0, ref maz_feed);
-                YG.Log.Instance.WriteLogAdd($"mazak-进给-->> " + maz_feed.frev + ",maz_feed = " + maz_feed.frev);
-                ushort spindleLoad = 0;
-                ret = MaCls.MazGetSpindleOverRide(h, 0, ref spindleLoad);
-                YG.Log.Instance.WriteLogAdd($"mazak-主轴负载-->> " + spindleLoad);
-                ushort feedOver = 0;
-                ret = MaCls.MazGetFeedOverRide(h, 0, ref feedOver);
-                YG.Log.Instance.WriteLogAdd($"mazak-进给负载-->> " + feedOver);
-                int spindleSpeed = 0;
-                ret = MaCls.MazGetCurrentSpindleRev(h, 0, ref spindleSpeed);
-                YG.Log.Instance.WriteLogAdd($"mazak-主轴速度-->> " + spindleSpeed);
+                        }
+                        YG.Log.Instance.WriteLogAdd($"mazak-轴名称-->> " + axisNameInfo);
+                        //当前位置
+                        MAZ_NCPOS currentNcPos = default(MAZ_NCPOS);
+                        ret = MaCls.MazGetCurrentPos(h, ref currentNcPos);
+                        if(ret == 0)
+                        {
+                            runDataInfo.absoluteCoordinate = string.Join(",", currentNcPos.data); 
+                        }
+                        //相对位置
+                        MAZ_NCPOS relativeNcPos = default(MAZ_NCPOS);
+                        ret = MaCls.MazGetRemain(h, ref relativeNcPos);
+                        if (ret == 0)
+                        {
+                            runDataInfo.relativeCoordinate = string.Join(",", relativeNcPos.data);
+                        }
+                        //机械位置
+                        MAZ_NCPOS machineNcPos = default(MAZ_NCPOS);
+                        ret = MaCls.MazGetCurrentPos(h, ref machineNcPos);
+                        if (ret == 0)
+                        {
+                            runDataInfo.machineCoordinate = string.Join(",", machineNcPos.data);
+                        }
 
-                MAZ_TOOLINFO currentToolInfo = default(MAZ_TOOLINFO);
-                MaCls.MazGetCurrentTool(h, 0, ref currentToolInfo);
-                YG.Log.Instance.WriteLogAdd($"mazak-刀具信息-->> " + JsonConvert.SerializeObject(currentToolInfo));
-                responseBody.runDatasInfo = "运行时间:" + powerTime.uint_2 + ",主程序:" + proInfo.string_0 + ",进给:" + maz_feed.fmin/1000 + ",主轴负载:" + spindleLoad + ",进给负载:" + feedOver
-                                             + "，主轴速度:" + spindleSpeed + ",刀具信息:" + JsonConvert.SerializeObject(currentToolInfo);
+                    }
+                    //主轴负载
+                    ushort spindleLoad = 0;
+                    ret = MaCls.MazGetSpindleLoad(h, 0, ref spindleLoad);
+                    if (ret == 0)
+                    {
+                        runDataInfo.spindleLoad = spindleLoad.ToString();
+                    }
+                    //进给轴负载
+                    ushort feedAxisLoad = 0;
+                    ret = MaCls.MazGetSpindleLoad(h, 0, ref feedAxisLoad);
+                    if (ret == 0)
+                    {
+                        runDataInfo.feedAxisLoad = feedAxisLoad.ToString();
+                    }
+                    //伺服轴负载
+                    MAZ_AXISLOAD axisLoadInfo = default(MAZ_AXISLOAD);
+                    ret = MaCls.MazGetAxisLoad(h, ref axisLoadInfo);
+                    if (ret == 0)
+                    {
+                        runDataInfo.servoLoad = axisLoadInfo.data[0].ToString();
+                        YG.Log.Instance.WriteLogAdd($"mazak-伺服轴负载-->> " + JsonConvert.SerializeObject(axisLoadInfo));
+                    }
+                    //主程序
+                    MAZ_PROINFO proInfo = default(MAZ_PROINFO);
+                    ret = MaCls.MazGetMainPro(h, status0, ref proInfo);
+                    if (ret == 0)
+                    {
+                        runDataInfo.mainProg = proInfo.comment;
+                    }
+
+                    //进给速度
+                    MAZ_FEED maz_feed = default(MAZ_FEED);
+                    ret = MaCls.MazGetFeed(h, status0, ref maz_feed);
+                    if (ret == 0)
+                    {
+                        runDataInfo.actFeedSpeed = maz_feed.fmin.ToString();
+                    }
+
+
+                    //进给倍率
+                    ushort feedOver = 0;
+                    ret = MaCls.MazGetFeedOverRide(h, 0, ref feedOver);
+                    if (ret == 0)
+                    {
+                        runDataInfo.feedRateOvr = feedOver.ToString();
+                    }
+
+                    //主轴速度
+                    int spindleSpeed = 0;
+                    ret = MaCls.MazGetCurrentSpindleRev(h, 0, ref spindleSpeed);
+                    if (ret == 0)
+                    {
+                        runDataInfo.actSpindleSpeed = spindleSpeed.ToString();
+                    }
+                    //主轴倍率
+                    ushort spindleRateOvr = 0;
+                    ret = MaCls.MazGetSpindleOverRide(h, 0, ref spindleRateOvr);
+                    if (ret == 0)
+                    {
+                        runDataInfo.spindleRateOvr = spindleRateOvr.ToString();
+                    }
+
+                    //NC版本信息
+                    MAZ_NC_VERINFO nc_version = default(MAZ_NC_VERINFO);
+                    ret = MaCls.MazGetNCVersionInfo(h, ref nc_version);
+                    if (ret == 0)
+                    {
+                        runDataInfo.ncModel = nc_version.szNCModel;
+                    }
+                    //运行模式
+                    short modeNum = 0;
+                    ret = MaCls.MazGetRunMode(h, 0, ref modeNum);
+                    if (ret == 0)
+                    {
+                        runDataInfo.runMode = runModeDict[modeNum];
+                    }
+                    //运行时间
+                    MAZ_NCTIME nc_time = default(MAZ_NCTIME);
+                    ret = MaCls.MazGetRunningTime(h, 0, ref nc_time);
+                    if (ret == 0)
+                    {
+                        runDataInfo.ncRunTime = nc_time.uint_2.ToString();
+                    }
+                    //工件计数
+                    int partsCount = 0;
+                    ret = MaCls.MazGetPartsCount(h, 0, ref partsCount);
+                    if (ret == 0)
+                    {
+                        runDataInfo.partsCount = partsCount;
+                    }
+                    //当前刀号
+                    MAZ_TOOLINFO currentToolInfo = default(MAZ_TOOLINFO);
+                    ret = MaCls.MazGetCurrentTool(h, 0, ref currentToolInfo);
+                    if (ret == 0)
+                    {
+                        runDataInfo.currentToolNo = currentToolInfo.ushort_0.ToString();
+                    }
+                    //报警
+                    MAZ_ALARMALL maz_ALARMALL = default(MAZ_ALARMALL);
+                    ret = MaCls.MazGetAlarm(h, ref maz_ALARMALL);
+                    if (ret == 0)
+                    {
+                        MAZ_ALARM[] alarms = maz_ALARMALL.alarm;
+                        if (alarms != null && alarms.Count() > 0)
+                        {
+                            List<AlmInfo> errors = new List<AlmInfo>();
+                            foreach (MAZ_ALARM alarm in alarms)
+                            {
+                                AlmInfo addAlarm = new AlmInfo();
+                                addAlarm.no = alarm.short_0.ToString();
+                                addAlarm.msg = alarm.message;
+                                errors.Add(addAlarm);
+
+                            }
+                            responseBody.errorsInfo = JsonConvert.SerializeObject(errors);
+                            YG.Log.Instance.WriteLogAdd($"mazak-报警-->> " + JsonConvert.SerializeObject(alarms));
+                        }
+
+                    }
+                    //获取刀具列表，先获取刀具数量
+                    int toolNum = 0;
+                    ret = MaCls.MazGetToolDataNum(h, 0, ref toolNum);
+
+                    MAZ_TD[] array = new MAZ_TD[toolNum - 1 + 1];
+                    ret = MaCls.MazGetAllToolData(h, 0, toolNum, array);
+                    if (ret == 0)
+                    {
+                        if (array != null && array.Count() > 0)
+                        {
+                            List<ToolsInfo> tools = new List<ToolsInfo>();
+                            foreach (MAZ_TD mazTd in array)
+                            {
+                                ToolsInfo addToolInfo = new ToolsInfo();
+                                addToolInfo.number = mazTd.td_common.byte_0.ToString();
+                                addToolInfo.position = mazTd.td_common.pkno.ToString();
+                                addToolInfo.rateLife = mazTd.td_common.lifetime.ToString();
+                                addToolInfo.useLife = mazTd.td_common.usetime.ToString();
+                                tools.Add(addToolInfo);
+                            }
+                            responseBody.toolsData = JsonConvert.SerializeObject(tools);
+                        }
+                        
+                        YG.Log.Instance.WriteLogAdd($"mazak-获取刀具列表-->> 成功" + JsonConvert.SerializeObject(array));
+                    }
+                    else
+                    {
+                        YG.Log.Instance.WriteLogAdd($"mazak-获取刀具列表-->> 失败");
+                    }
+                    responseBody.runDatasInfo = JsonConvert.SerializeObject(runDataInfo);
+                    //responseBody.runDatasInfo = "运行时间:" + powerTime.uint_2 + ",主程序:" + proInfo.string_0 + ",进给:" + maz_feed.fmin/1000 + ",主轴负载:" + spindleLoad + ",进给负载:" + feedOver
+                    //                             + "，主轴速度:" + spindleSpeed + ",刀具信息:" + JsonConvert.SerializeObject(currentToolInfo);
 
 
-            }
-            else if (fun == ActionTypeEnum.ToolNoData.ToString())
-            {
-                ushort toolno = 0;
-                MAZ_TDALL toollist = default(MAZ_TDALL);
-                ret = MaCls.MazGetToolData(h, 0, requestBody.toolNo, ref toollist);
-                if (ret == 0)
-                {
-                    responseBody.toolsData = JsonConvert.SerializeObject(toollist);
-                    YG.Log.Instance.WriteLogAdd($"mazak-获取刀具-->> 成功" + JsonConvert.SerializeObject(toollist));
                 }
-                else
-                {
-                    YG.Log.Instance.WriteLogAdd($"mazak-获取刀具-->> 失败");
-                } 
-            }
-            else if (fun == ActionTypeEnum.ToolList.ToString())
-            {
-                int num = 0;
-                ret = MaCls.MazGetToolDataNum(h, 0, ref num);
-                responseBody.runDatasInfo = "刀具编号:"+ num;
-                MAZ_TD[] array = new MAZ_TD[num - 1 + 1];
-                ret = MaCls.MazGetAllToolData(h, 0, num, array);
-                if (ret == 0)
+                else if (fun == ActionTypeEnum.ToolNoData.ToString())
                 {
-                    responseBody.toolsData = JsonConvert.SerializeObject(array);
-                    YG.Log.Instance.WriteLogAdd($"mazak-获取刀具列表-->> 成功" + JsonConvert.SerializeObject(array));
+                    ushort toolno = 0;
+                    MAZ_TDALL toollist = default(MAZ_TDALL);
+                    ret = MaCls.MazGetToolData(h, 0, requestBody.toolNo, ref toollist);
+                    if (ret == 0)
+                    {
+                        responseBody.toolsData = JsonConvert.SerializeObject(toollist);
+                        YG.Log.Instance.WriteLogAdd($"mazak-获取刀具-->> 成功" + JsonConvert.SerializeObject(toollist));
+                    }
+                    else
+                    {
+                        YG.Log.Instance.WriteLogAdd($"mazak-获取刀具-->> 失败");
+                    }
                 }
-                else
+                else if (fun == ActionTypeEnum.ToolList.ToString())
                 {
-                    YG.Log.Instance.WriteLogAdd($"mazak-获取刀具-->> 失败");
-                } 
+                    int num = 0;
+                    ret = MaCls.MazGetToolDataNum(h, 0, ref num);
+                    responseBody.runDatasInfo = "刀具编号:" + num;
+                    MAZ_TD[] array = new MAZ_TD[num - 1 + 1];
+                    ret = MaCls.MazGetAllToolData(h, 0, num, array);
+                    if (ret == 0)
+                    {
+                        responseBody.toolsData = JsonConvert.SerializeObject(array);
+                        YG.Log.Instance.WriteLogAdd($"mazak-获取刀具列表-->> 成功" + JsonConvert.SerializeObject(array));
+                    }
+                    else
+                    {
+                        YG.Log.Instance.WriteLogAdd($"mazak-获取刀具-->> 失败");
+                    }
 
-            }
-            else if (fun == ActionTypeEnum.DeleteTool.ToString())
-            { 
-                ret = MaCls.MazDeleteToolData(h, 0, requestBody.toolNo);
-                if (ret == 0)
-                { 
-                    YG.Log.Instance.WriteLogAdd($"mazak-删除刀具-->> 成功" );
                 }
-                else
+                else if (fun == ActionTypeEnum.DeleteTool.ToString())
                 {
-                    YG.Log.Instance.WriteLogAdd($"mazak-删除刀具-->> 失败");
+                    ret = MaCls.MazDeleteToolData(h, 0, requestBody.toolNo);
+                    if (ret == 0)
+                    {
+                        YG.Log.Instance.WriteLogAdd($"mazak-删除刀具-->> 成功");
+                    }
+                    else
+                    {
+                        YG.Log.Instance.WriteLogAdd($"mazak-删除刀具-->> 失败");
+                    }
                 }
-            }
-            else if (fun == ActionTypeEnum.SetTool.ToString())
-            {
-                MAZ_TDALL toollist = default(MAZ_TDALL);
-                ret = MaCls.MazGetToolData(h, 0, requestBody.toolNo, ref toollist);
-
-                MAZ_TDALL toolData = new MAZ_TDALL();
-                MAZ_TD[] tool1 = new MAZ_TD[22];
-                int count = 0;
-                foreach (MAZ_TD aZ_TDALL in toollist.tool)
+                else if (fun == ActionTypeEnum.SetTool.ToString())
                 {
-                    MAZ_TD td11 = new MAZ_TD();
-                    td11 = aZ_TDALL;
-                    if (aZ_TDALL.td_common.ushort_0 == requestBody.toolNo)
+                    MAZ_TDALL toollist = default(MAZ_TDALL);
+                    ret = MaCls.MazGetToolData(h, 0, requestBody.toolNo, ref toollist);
+
+                    MAZ_TDALL toolData = new MAZ_TDALL();
+                    MAZ_TD[] tool1 = new MAZ_TD[22];
+                    int count = 0;
+                    foreach (MAZ_TD aZ_TDALL in toollist.tool)
                     {
-                       
-                        td11.td_common.pkno = 0; //刀位号
-                        td11.td_common.byte_1 = 1; //刀具ID编号对应key
-                        td11.td_common.lengthA = 2950000; //刀具长度
-                        td11.td_common.name = 15; //刀具名称对应key
-                        td11.td_common.int_0 = 20; //公称径
-                        td11.td_common.diameter = 12300; // 刀具径刀尖角
-                        td11.td_common.string_0 = "高速钢"; //材料，机床里要有
-                        td11.td_common.lifetime = 600; //刀具寿命
-                        td11.td_common.lifenumber = 7; //刀具次数
-                        td11.td_common.usetime = 480; //刀具使用时间
-                        td11.td_common.usenumber = 6; //刀具使用次数
-                        td11.td_common.int_1 = 2; // 组号
-                        td11.td_common.compno = 1; //补偿编号
-                        td11.td_common.wearcompX = 1000;
-                        td11.td_common.wearcompY = -1000;
-                        td11.td_common.wearcompZ = 2000;
-                        td11.td_common.maxwearX = 10000;
-                        td11.td_common.maxwearY = 20000;
-                        td11.td_common.maxwearZ = 30000;
-                        td11.td_various.td_general.td_general.angle = 1600;
-                        td11.td_various.td_general.td_general.easycompX = 6541000;
-                        td11.td_various.td_general.td_general.easycompY = 2310;
-                        td11.td_various.td_general.td_general.easycompZ = 2320;
-                        td11.td_various.td_general.td_general.conscompX = 2330;
-                        td11.td_various.td_general.td_general.conscompY = 2340;
-                        td11.td_various.td_general.td_general.conscompZ = -3120;
-                        // td11.td_common.lengthB = 2;
+                        MAZ_TD td11 = new MAZ_TD();
+                        td11 = aZ_TDALL;
+                        if (aZ_TDALL.td_common.ushort_0 == requestBody.toolNo)
+                        {
 
-                        //td11.td_common.dummy5 = "1";
-                        //td11.td_common.compno = 2;
+                            td11.td_common.pkno = 0; //刀位号
+                            td11.td_common.byte_1 = 1; //刀具ID编号对应key
+                            td11.td_common.lengthA = 2950000; //刀具长度
+                            td11.td_common.name = 15; //刀具名称对应key
+                            td11.td_common.int_0 = 20; //公称径
+                            td11.td_common.diameter = 12300; // 刀具径刀尖角
+                            td11.td_common.string_0 = "高速钢"; //材料，机床里要有
+                            td11.td_common.lifetime = 600; //刀具寿命
+                            td11.td_common.lifenumber = 7; //刀具次数
+                            td11.td_common.usetime = 480; //刀具使用时间
+                            td11.td_common.usenumber = 6; //刀具使用次数
+                            td11.td_common.int_1 = 2; // 组号
+                            td11.td_common.compno = 1; //补偿编号
+                            td11.td_common.wearcompX = 1000;
+                            td11.td_common.wearcompY = -1000;
+                            td11.td_common.wearcompZ = 2000;
+                            td11.td_common.maxwearX = 10000;
+                            td11.td_common.maxwearY = 20000;
+                            td11.td_common.maxwearZ = 30000;
+                            td11.td_various.td_general.td_general.angle = 1600;
+                            td11.td_various.td_general.td_general.easycompX = 6541000;
+                            td11.td_various.td_general.td_general.easycompY = 2310;
+                            td11.td_various.td_general.td_general.easycompZ = 2320;
+                            td11.td_various.td_general.td_general.conscompX = 2330;
+                            td11.td_various.td_general.td_general.conscompY = 2340;
+                            td11.td_various.td_general.td_general.conscompZ = -3120;
+                            // td11.td_common.lengthB = 2;
+
+                            //td11.td_common.dummy5 = "1";
+                            //td11.td_common.compno = 2;
+                        }
+                        tool1[count] = td11;
+                        count++;
                     }
-                    tool1[count] = td11;
-                    count++;
-                }
-                toollist.tool = tool1;
+                    toollist.tool = tool1;
 
-                MAZ_TD td1 = new MAZ_TD();
-                
-                td1.td_common.ushort_0 = requestBody.toolNo;
-                td1.td_common.name = 33;
-                td1.td_common.pkno = 21;
-                td1.td_common.int_0 = 1;
-                // td1.td_common.lengthA = 10000+ requestBody.toolNo;
-                //td1.td_common.lengthB = 20000+ requestBody.toolNo;
-                MAZ_TD[] tool = new MAZ_TD[20];
-                tool[0] = td1;
-                //toolData.tool = tool;
-                //MAZ_TD td2 = default(MAZ_TD);
-                //td2.td_common.ushort_0 = 2;
-                //td2.td_common.name = 22;
-                //toolData.tool = td2;en  
+                    MAZ_TD td1 = new MAZ_TD();
 
-                MAZ_TD_ERRORALL errorData = default( MAZ_TD_ERRORALL);
-                ret = MaCls.MazSetToolData(h, 0, requestBody.toolNo, ref toollist, ref errorData);
-                if (ret == 0)
-                {
-                    YG.Log.Instance.WriteLogAdd($"mazak-删除刀具-->> 成功");
-                }
-                else
-                {
-                    YG.Log.Instance.WriteLogAdd($"mazak-删除刀具-->> 失败");
+                    td1.td_common.ushort_0 = requestBody.toolNo;
+                    td1.td_common.name = 33;
+                    td1.td_common.pkno = 21;
+                    td1.td_common.int_0 = 1;
+                    // td1.td_common.lengthA = 10000+ requestBody.toolNo;
+                    //td1.td_common.lengthB = 20000+ requestBody.toolNo;
+                    MAZ_TD[] tool = new MAZ_TD[20];
+                    tool[0] = td1;
+                    //toolData.tool = tool;
+                    //MAZ_TD td2 = default(MAZ_TD);
+                    //td2.td_common.ushort_0 = 2;
+                    //td2.td_common.name = 22;
+                    //toolData.tool = td2;en  
+
+                    MAZ_TD_ERRORALL errorData = default(MAZ_TD_ERRORALL);
+                    ret = MaCls.MazSetToolData(h, 0, requestBody.toolNo, ref toollist, ref errorData);
+                    if (ret == 0)
+                    {
+                        YG.Log.Instance.WriteLogAdd($"mazak-删除刀具-->> 成功");
+                    }
+                    else
+                    {
+                        YG.Log.Instance.WriteLogAdd($"mazak-删除刀具-->> 失败");
+                    }
                 }
-            }
-            else if (!string.IsNullOrEmpty(requestBody.path))
-            {
-                string fileName = Path.GetFileName(requestBody.path);
-                string filepath = Path.GetDirectoryName(requestBody.path);
-                YG.Log.Instance.WriteLogAdd($"mazak-fileName-->> " + fileName + ",filepath=" + filepath);
-                try
+                else if (!string.IsNullOrEmpty(requestBody.path))
                 {
-                    if (fun == ActionTypeEnum.Upload.ToString())
+                    string fileName = Path.GetFileName(requestBody.path);
+                    string filepath = Path.GetDirectoryName(requestBody.path);
+                    YG.Log.Instance.WriteLogAdd($"mazak-fileName-->> " + fileName + ",filepath=" + filepath);
+                    try
                     {
-                        ret = MaCls.MazSendProgram(h, fileName, filepath, 1);
-                        YG.Log.Instance.WriteLogAdd($"mazak-上传响应结果-->> " + ret);
-                        if (ret == 0)
-                        {
-                            YG.Log.Instance.WriteLogAdd($"mazak-上传-->> " + requestBody.path + "成功");
-                        }
-                        else
-                        {
-                            YG.Log.Instance.WriteLogAdd($"mazak-上传-->> " + requestBody.path + "失败");
-                        }
-                    }
-                    else if (fun == ActionTypeEnum.DownLoad.ToString())
-                    {  
-                        ret = MaCls.MazReceiveProgram(h, fileName, filepath, 1);
-                        if (ret == 0)
+                        if (fun == ActionTypeEnum.Upload.ToString())
                         {
-                            YG.Log.Instance.WriteLogAdd($"mazak-下载-->> " + requestBody.path + "成功");
+                            ret = MaCls.MazSendProgram(h, fileName, filepath, 1);
+                            YG.Log.Instance.WriteLogAdd($"mazak-上传响应结果-->> " + ret);
+                            if (ret == 0)
+                            {
+                                YG.Log.Instance.WriteLogAdd($"mazak-上传-->> " + requestBody.path + "成功");
+                            }
+                            else
+                            {
+                                YG.Log.Instance.WriteLogAdd($"mazak-上传-->> " + requestBody.path + "失败");
+                            }
                         }
-                        else
+                        else if (fun == ActionTypeEnum.DownLoad.ToString())
                         {
-                            YG.Log.Instance.WriteLogAdd($"mazak-下载-->> " + requestBody.path + "失败");
+                            ret = MaCls.MazReceiveProgram(h, fileName, filepath, 1);
+                            if (ret == 0)
+                            {
+                                YG.Log.Instance.WriteLogAdd($"mazak-下载-->> " + requestBody.path + "成功");
+                            }
+                            else
+                            {
+                                YG.Log.Instance.WriteLogAdd($"mazak-下载-->> " + requestBody.path + "失败");
+                            }
                         }
-                    }
-                    else if (fun == ActionTypeEnum.DeleteNc.ToString())
-                    {
-                        ret = MaCls.MazDeleteProgram(h, fileName);
-                        if (ret == 0)
+                        else if (fun == ActionTypeEnum.DeleteNc.ToString())
                         {
-                            YG.Log.Instance.WriteLogAdd($"mazak-删除-->> " + requestBody.path + "成功");
+                            ret = MaCls.MazDeleteProgram(h, fileName);
+                            if (ret == 0)
+                            {
+                                YG.Log.Instance.WriteLogAdd($"mazak-删除-->> " + requestBody.path + "成功");
+                            }
+                            else
+                            {
+                                YG.Log.Instance.WriteLogAdd($"mazak-删除-->> " + requestBody.path + "失败");
+                            }
                         }
-                        else
+                        else if (fun == ActionTypeEnum.SelectNcProgram.ToString())
                         {
-                            YG.Log.Instance.WriteLogAdd($"mazak-删除-->> " + requestBody.path + "失败");
+                            ret = MaCls.MazSetMainPro(h, 0, fileName);
+                            if (ret == 0)
+                            {
+                                YG.Log.Instance.WriteLogAdd($"mazak-选择-->> " + requestBody.path + "成功");
+                            }
+                            else
+                            {
+                                YG.Log.Instance.WriteLogAdd($"mazak-选择-->> " + requestBody.path + "失败");
+                            }
                         }
+
                     }
-                    else if (fun == ActionTypeEnum.SelectNcProgram.ToString())
+                    catch (Exception e)
                     {
-                        ret = MaCls.MazSetMainPro(h, 0, fileName);
-                        if (ret == 0)
-                        {
-                            YG.Log.Instance.WriteLogAdd($"mazak-选择-->> " + requestBody.path + "成功");
-                        }
-                        else
-                        {
-                            YG.Log.Instance.WriteLogAdd($"mazak-选择-->> " + requestBody.path + "失败");
-                        }
+                        YG.Log.Instance.WriteLogAdd($"mazak-异常-->> " + e.Message);
+
+                        ret = MaCls.MazDisconnect(h);
                     }
+                    ret = MaCls.MazDisconnect(h);
 
                 }
-                catch (Exception e)
-                {
-                    YG.Log.Instance.WriteLogAdd($"mazak-异常-->> " + e.Message);
-                }
-
-
             }
-
-            ret = MaCls.MazDisconnect(h);
             return responseBody;
         }
     }

deviceHttpServer/mitsubishi/MitsubishiServer.cs

@@ -40,32 +40,7 @@ namespace HttpServer.mitsubishi
                         responseBody.deviceState = ON_LINE_STATE;
                         if (fun == ActionTypeEnum.Collect.ToString())
                         {
-                            int pdata;
-                            string loadstr;
-                            double pdspeed, pdspeedFM, pdspeedFS, pdspeedFE, pdspeedFE1;
-                            
-                            mitCom.GetSpindleInfo(2, 1, out pdata, out loadstr);//主轴转速 
-                            responseBody.actSpindle = pdata.ToString();
-                            mitCom.GetSpindleInfo(3, 1, out pdata, out loadstr);//主轴负载
-                            //mitCom.GetSpindleInfo(4, 1, out pdata, out loadstr);//转速 
-                            responseBody.spindleMagnification = (Convert.ToInt32(pdata) * 100).ToString();
-
-                            mitCom.GetFeedSpeed(0, out pdspeed, "GetFeedSpeedFA"); //获取指令进给速度 
-                            mitCom.GetFeedSpeed(3, out pdspeedFE, "GetFeedSpeedFE");//攻丝（FE）;
-                            mitCom.GetFeedSpeed(4, out pdspeedFE1, "GetFeedSpeedFE1");//攻丝（FE）;
-                            responseBody.actFeed = pdspeedFE.ToString();
-
-                            responseBody.feedRateOvr= ((Convert.ToInt32(pdspeedFE) / pdspeed ) * 100).ToString();
-                            string programNumber;
-                            mitCom.GetProgramNumber(out programNumber);
-                            responseBody.mainProg = programNumber;
-
-                            //string pvValue;
-                            //mitCom.GetParaValue(30, 8002, 1, 1, out pvValue);
-                            int runTime;
-                            mitCom.GetRunTime(out runTime);
-                            mitCom.SimClose();
-                            responseBody.powerOnTime = (runTime/60).ToString();
+                           
                         }
                     }
                     catch (Exception e)

deviceHttpServer/opcua/OpcUaServer.cs

@@ -73,6 +73,7 @@ namespace Fanuc_HttpServer.opcuaserver
                     else if (fun == ActionTypeEnum.Collect.ToString()) //采集
                     {
                         
+<<<<<<< HEAD
                         List<string> addresses = new List<string>();
                         addresses.Add("ns=2;s=/Channel/GeometricAxis/feedRateOvr"); //进给倍率
                         addresses.Add("ns=2;s=/Channel/State/actFeedRateIpo"); //进给速度
@@ -118,6 +119,9 @@ namespace Fanuc_HttpServer.opcuaserver
                             }
                         }
                         // responseBody.runDatasInfo = JsonConvert.SerializeObject(runDatasInfo);
+=======
+                     
+>>>>>>> 64f47d72c0fce02eb60b1d7b61c693d966499002
 
                     }
                     else if (fun == ActionTypeEnum.ToolList.ToString())