优化

deviceHttpServer/Form1.cs

@@ -38,6 +38,8 @@ namespace HttpServer
         AsyncCallback callback;
         HttpListenerContext context = null;
 
+        private MazakServer mazakServer = new MazakServer();
+
         public Form1()
         {
             InitializeComponent();
@@ -150,12 +152,12 @@ namespace HttpServer
                         }
                         else if (reqBody.deviceType == DeviceTypeEnum.Mitsubishi.ToString())
                         {
-                            responseBody =  MitsubishiServer.requestHttpServer(reqBody);
+                            responseBody =  new MitsubishiServer().requestHttpServer(reqBody);
                             AddList(DateTime.Now.ToString(), "POST", request.Url.ToString(), responseBody.msg);
                         }
                         else if (reqBody.deviceType == DeviceTypeEnum.Mazaka.ToString())
                         {
-                            responseBody = MazakServer.requestHttpServer(reqBody);
+                            responseBody = mazakServer.requestHttpServer(reqBody);
                             AddList(DateTime.Now.ToString(), "POST", request.Url.ToString(), responseBody.msg);
                         }
 

deviceHttpServer/mazak/MazakServer.cs

@@ -28,7 +28,7 @@ namespace HttpServer.mazak
         }
        
         static ushort h;
-        public static ResponseBody requestHttpServer(RequestBody requestBody)
+        public ResponseBody requestHttpServer(RequestBody requestBody)
         {
             string ip = requestBody.serverUrl;
             string port = requestBody.port;
@@ -61,12 +61,9 @@ namespace HttpServer.mazak
                     ret = MaCls.MazGetNcPowerOnTime(h, ref powerTime);
                     if(ret == 0)
                     {
-                        runDataInfo.powerOnTime = powerTime.uint_3.ToString();
+                        runDataInfo.powerOnTime = powerTime.year.ToString() + "/" + powerTime.uint_0.ToString() + "/" + powerTime.uint_1.ToString() + " " 
+                            + powerTime.uint_2.ToString() + ":" + powerTime.AnonymousMember1.ToString() + ":" + powerTime.uint_3.ToString();
                     }
-                    MAZ_NCTIME runTime = default(MAZ_NCTIME);
-                    ret = MaCls.MazGetRunningTime(h, 0, ref runTime);
-
-                    YG.Log.Instance.WriteLogAdd($"mazak-powerTime-->> " + powerTime.uint_3);
 
                     //获取轴名称
                     MAZ_AXISNAME axisNameInfo = default(MAZ_AXISNAME); 
@@ -128,7 +125,7 @@ namespace HttpServer.mazak
                     ret = MaCls.MazGetMainPro(h, status0, ref proInfo);
                     if (ret == 0)
                     {
-                        runDataInfo.mainProg = proInfo.comment;
+                        runDataInfo.mainProg = proInfo.string_0;
                     }
 
                     //进给速度
@@ -140,7 +137,7 @@ namespace HttpServer.mazak
                     }
 
 
-                    //进给倍率
+                    //进给倍率1000
                     ushort feedOver = 0;
                     ret = MaCls.MazGetFeedOverRide(h, 0, ref feedOver);
                     if (ret == 0)
@@ -181,8 +178,8 @@ namespace HttpServer.mazak
                     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();
+                    {   
+                        runDataInfo.ncRunTime = nc_time.uint_0.ToString() + "时" + nc_time.uint_1.ToString() + "分" + nc_time.uint_2.ToString() + "秒";
                     }
                     //工件计数
                     int partsCount = 0;

deviceHttpServer/mitsubishi/MitsubishiServer.cs

@@ -16,7 +16,7 @@ namespace HttpServer.mitsubishi
         private static string ON_LINE_STATE = "在线";
         public static Dictionary<string, MitCom> deviceList { get; set; } = new Dictionary<string, MitCom>();
        
-        public static ResponseBody requestHttpServer(RequestBody requestBody)
+        public ResponseBody requestHttpServer(RequestBody requestBody)
         {
             string ip = requestBody.serverUrl;
             string port = requestBody.port;

deviceHttpServer/opcua/OpcUaServer.cs

@@ -73,7 +73,6 @@ 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"); //进给速度
@@ -88,40 +87,37 @@ namespace Fanuc_HttpServer.opcuaserver
                         {
                             if (i == 0)
                             { 
-                                responseBody.feedRateOvr = values[i];
-                                responseBody.actFeed = values[i];
+                               // responseBody.feedRateOvr = values[i];
+                               // responseBody.actFeed = values[i];
                             }
                             else if (i == 1)
                             {
-                                responseBody.actFeed = values[i];
+                               // responseBody.actFeed = values[i];
                                 
                             }
                             else if (i == 2)
                             { 
-                                responseBody.spindleMagnification = values[i]; 
+                                //responseBody.spindleMagnification = values[i]; 
                                 
                             }
                             else if (i == 3)
                             {
-                                responseBody.actSpindle = values[i];
+                                //responseBody.actSpindle = values[i];
                                 
 
                             }
                             else if (i == 4)
                             { 
-                                responseBody.mainProg = values[i];
+                               // responseBody.mainProg = values[i];
 
                             }
                             else if (i == 5)
                             {
-                                responseBody.powerOnTime = values[i];
+                                //responseBody.powerOnTime = values[i];
 
                             }
                         }
                         // responseBody.runDatasInfo = JsonConvert.SerializeObject(runDatasInfo);
-=======
-                     
->>>>>>> 64f47d72c0fce02eb60b1d7b61c693d966499002
 
                     }
                     else if (fun == ActionTypeEnum.ToolList.ToString())