数据页面模块处理

IMCS_CCS/Model/vo/ResponseFanucData.cs

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

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -134,9 +134,11 @@ namespace IMCS.CCS.Services
                         if (!string.IsNullOrEmpty(retData.runDatasInfo.Trim()))
                         {                            
                             ResponseDigitalTwinsData twinsData = JsonConvert.DeserializeObject<ResponseDigitalTwinsData>(retData.runDatasInfo);
-                            responseDigitalTwinsData.feedRate = twinsData.feedRate;
-                            responseDigitalTwinsData.spindleMagnification = twinsData.spindleMagnification;
-                        }                        
+                            responseDigitalTwinsData.feedRate = !string.IsNullOrEmpty(twinsData.feedRate)? twinsData.feedRate : "0";
+                            responseDigitalTwinsData.spindleMagnification = !string.IsNullOrEmpty(twinsData.spindleMagnification)? twinsData.spindleMagnification:"0";
+                            responseDigitalTwinsData.spindleSpeed = !string.IsNullOrEmpty(twinsData.spindleSpeed) ? twinsData.spindleSpeed + "00" : "0";
+                            responseDigitalTwinsData.spindleLoad = !string.IsNullOrEmpty(twinsData.spindleLoad) ? twinsData.spindleMagnification : "-";
+                        }
                     }
                 }
                 else if(null != device && equipmentMonitor.Type == "FANUC")
@@ -148,10 +150,10 @@ namespace IMCS.CCS.Services
                     if (Result.IsSuccess)
                     {
                         ResponseFanucData responseFanucData = JsonConvert.DeserializeObject<ResponseFanucData>(Result.Message);
-                        responseDigitalTwinsData.feedRate = responseFanucData.ActFeed;
-                        responseDigitalTwinsData.spindleMagnification = responseFanucData.FeedSpindle;
-                        responseDigitalTwinsData.spindleSpeed = responseFanucData.ActSpindle;
-                        responseDigitalTwinsData.spindleLoad = responseFanucData.SpindleLoad;
+                        responseDigitalTwinsData.feedRate = !string.IsNullOrEmpty(responseFanucData.ActFeed)? responseFanucData.ActFeed:"0";
+                        responseDigitalTwinsData.spindleMagnification = !string.IsNullOrEmpty(responseFanucData.SpindleMagnification)? responseFanucData.SpindleMagnification:"0";
+                        responseDigitalTwinsData.spindleSpeed = !string.IsNullOrEmpty(responseFanucData.ActSpindle)? responseFanucData.ActSpindle : "0";
+                        responseDigitalTwinsData.spindleLoad = !string.IsNullOrEmpty(responseFanucData.SpindleLoad)? responseFanucData.SpindleLoad : "-";
                     }
                 }
             }