添加方法

deviceHttpServer/body/RequestBody.cs

@@ -37,6 +37,9 @@ namespace RequestServer.HttpServer
 
         public string type
         { get; set; }
+
+        public ushort toolNo
+        { get; set; }
     }
     /// <summary>
     /// 设备名称
@@ -57,7 +60,10 @@ namespace RequestServer.HttpServer
     {
         Connect,
         Collect,
+        ToolNoData,
         ToolList,
+        DeleteTool,
+        SetTool,
         Upload,
         DownLoad,
         StartNcProgram, 

deviceHttpServer/mazak/MazakServer.cs

@@ -36,6 +36,9 @@ namespace HttpServer.mazak
                 MAZ_NCONTIME powerTime = default(MAZ_NCONTIME);
                 ret = MaCls.MazGetNcPowerOnTime(h, ref powerTime);
 
+                MAZ_NCTIME runTime = default(MAZ_NCTIME);
+                ret = MaCls.MazGetRunningTime(h, 0, ref runTime);
+
                 YG.Log.Instance.WriteLogAdd($"mazak-powerTime-->> " + powerTime.uint_3);
                 MAZ_PROINFO proInfo = default(MAZ_PROINFO);
                 ret = MaCls.MazGetMainPro(h, status0, ref proInfo);
@@ -52,14 +55,17 @@ namespace HttpServer.mazak
                 int spindleSpeed = 0;
                 ret = MaCls.MazGetCurrentSpindleRev(h, 0, ref spindleSpeed);
                 YG.Log.Instance.WriteLogAdd($"mazak-主轴速度-->> " + spindleSpeed);
+
                 MAZ_TOOLINFO currentToolInfo = default(MAZ_TOOLINFO);
                 MaCls.MazGetCurrentTool(h, 0, ref currentToolInfo);
                 YG.Log.Instance.WriteLogAdd($"mazak-刀具信息-->> " + JsonConvert.SerializeObject(currentToolInfo));
-                responseBody.runDatasInfo = "运行时间:" + powerTime + ",主程序:" + proInfo.string_0 + ",进给:" + maz_feed + ",主轴负载:" + spindleLoad + ",进给负载:" + feedOver
+                responseBody.runDatasInfo = "运行时间:" + runTime.uint_2 + ",主程序:" + proInfo.string_0 + ",进给:" + maz_feed.fmin + ",主轴负载:" + spindleLoad + ",进给负载:" + feedOver
                                              + "，主轴速度:" + spindleSpeed + ",刀具信息:" + JsonConvert.SerializeObject(currentToolInfo);
 
 
-            } else if (fun == ActionTypeEnum.ToolList.ToString()) {
+            }
+            else if (fun == ActionTypeEnum.ToolNoData.ToString())
+            {
                 ushort toolno = 0;
                 MAZ_TDALL toollist = default(MAZ_TDALL);
                 ret = MaCls.MazGetToolData(h, 0, toolno, ref toollist);
@@ -71,8 +77,61 @@ namespace HttpServer.mazak
                 else
                 {
                     YG.Log.Instance.WriteLogAdd($"mazak-获取刀具-->> 失败");
+                } 
+            }
+            else if (fun == ActionTypeEnum.ToolList.ToString())
+            {
+                ushort toolno = 0; 
+                MAZ_TD[] array = new MAZ_TD[toolno - 1 + 1];
+                ret = MaCls.MazGetAllToolData(h, 0, toolno, 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
+                {
+                    YG.Log.Instance.WriteLogAdd($"mazak-删除刀具-->> 失败");
+                }
+            }
+            else if (fun == ActionTypeEnum.SetTool.ToString())
+            {
+                MAZ_TDALL toolData = default(MAZ_TDALL);
+                
+                MAZ_TD td1 = default(MAZ_TD);
+                td1.td_common.ushort_0 = 1;
+                td1.td_common.name = 11; 
+                toolData.tool[0] = td1;
+                MAZ_TD td2 = default(MAZ_TD);
+                td2.td_common.ushort_0 = 2;
+                td2.td_common.name = 22;
+                toolData.tool[1] = td2;
+
+                MAZ_TD_ERRORALL errorData = default(MAZ_TD_ERRORALL);
+                ret = MaCls.MazSetToolData(h, 0, requestBody.toolNo,ref toolData, ref errorData);
+                if (ret == 0)
+                {
+                    YG.Log.Instance.WriteLogAdd($"mazak-删除刀具-->> 成功");
                 }
-            } else if (!string.IsNullOrEmpty(requestBody.path))
+                else
+                {
+                    YG.Log.Instance.WriteLogAdd($"mazak-删除刀具-->> 失败");
+                }
+            }
+            else if (!string.IsNullOrEmpty(requestBody.path))
             {
                 string fileName = Path.GetFileName(requestBody.path);
                 string filepath = Path.GetDirectoryName(requestBody.path);