解析3D数据模型处理

IMCS_CCS/Model/vo/ResponseFanucData.cs

@@ -29,6 +29,10 @@ namespace IMCS_CCS.Model.vo
         { get; set; }
         public string PowerOnTime
         { get; set; }
+        public string FeedSpindle
+        { get; set; }
+        public string SpindleLoad
+        { get; set; }
 
         public string AccumulateCuttingTime
         { get; set; }

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -109,13 +109,17 @@ namespace IMCS.CCS.Services
             List<Device> devices = _deviceService.GetDeviceList();            
             List<ResponseDigitalTwinsData> list = new List<ResponseDigitalTwinsData>();
 
-            String query3dUrl = ecsRootUrlContext + "api/authority/agv/agvCallbackService/query3dResouceDataInfo";
+            String query3dUrl = ecsRootUrlContext + "/api/authority/agv/agvCallbackService/query3dResouceDataInfo";
             var result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, query3dUrl, new Object(), null);
             ResponsePageData<ResponseDigitalTwinsData> responseData = JsonConvert.DeserializeObject<ResponsePageData<ResponseDigitalTwinsData>>(result.Message);
             list = responseData.Data;
             foreach(ResponseDigitalTwinsData responseDigitalTwinsData in list)
             {
                 EquipmentMonitor equipmentMonitor = await _equipmentMonitorService.GetById(long.Parse(responseDigitalTwinsData.resourceId));
+                if (equipmentMonitor==null || equipmentMonitor.IP == null)
+                {
+                    continue;
+                }
                 Device device = devices.Where(x => x.Ip.Equals(equipmentMonitor.IP)).FirstOrDefault();
                 if (null!=device && equipmentMonitor.Type == "HEIDEHAIN")
                 {
@@ -145,9 +149,9 @@ namespace IMCS.CCS.Services
                     {
                         ResponseFanucData responseFanucData = JsonConvert.DeserializeObject<ResponseFanucData>(Result.Message);
                         responseDigitalTwinsData.feedRate = responseFanucData.ActFeed;
-                        responseDigitalTwinsData.spindleMagnification = responseFanucData.ActSpindle;
-                        //responseDigitalTwinsData.spindleSpeed = responseFanucData.
-                        //responseDigitalTwinsData.spindleLoad = responseFanucData.
+                        responseDigitalTwinsData.spindleMagnification = responseFanucData.FeedSpindle;
+                        responseDigitalTwinsData.spindleSpeed = responseFanucData.ActSpindle;
+                        responseDigitalTwinsData.spindleLoad = responseFanucData.SpindleLoad;
                     }
                 }
             }