1

DeviceLibrary/AGVService/Controllers/taskNotificationController.cs → DeviceLibrary/AGVService/Controllers/notificationController.cs

@@ -13,7 +13,7 @@ namespace DeviceLibrary.AGVService.Controllers
     /// 任务执行通知
     /// 任务执行通知
     /// </summary>
     /// </summary>
     [RoutePrefix("nepconSmf/notification")]
     [RoutePrefix("nepconSmf/notification")]
-    public class taskNotificationController : ApiController
+    public class notificationController : ApiController
     {
     {
         [HttpPost]
         [HttpPost]
         public RtnData taskStatus([FromBody] NotificationDto dto)
         public RtnData taskStatus([FromBody] NotificationDto dto)

DeviceLibrary/AGVService/Schemas/RtnData.cs

@@ -8,7 +8,7 @@ namespace DeviceLibrary.AGVService.Schemas
 {
 {
     public class RtnData
     public class RtnData
     {
     {
-        public int code { get; set; } = 0;
+        public int code { get; set; } = 200;
         public object data { get; set; }
         public object data { get; set; }
         public string msg { get; set; } = "ok";
         public string msg { get; set; } = "ok";
     }
     }

DeviceLibrary/DeviceLibrary.csproj

@@ -87,7 +87,7 @@
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Compile Include="AGVService\Controllers\deviceOperateController.cs" />
     <Compile Include="AGVService\Controllers\deviceOperateController.cs" />
-    <Compile Include="AGVService\Controllers\taskNotificationController.cs" />
+    <Compile Include="AGVService\Controllers\notificationController.cs" />
     <Compile Include="AGVService\HttpService.cs" />
     <Compile Include="AGVService\HttpService.cs" />
     <Compile Include="AGVService\Schemas\DeviceCheckDto.cs" />
     <Compile Include="AGVService\Schemas\DeviceCheckDto.cs" />
     <Compile Include="AGVService\Schemas\NotificationDto.cs" />
     <Compile Include="AGVService\Schemas\NotificationDto.cs" />

DeviceLibrary/DeviceLibrary/ServerCommunication.cs

@@ -46,23 +46,10 @@ namespace DeviceLibrary
 
 
         private void ServerConnectTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         private void ServerConnectTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
         {
-            if (Monitor.TryEnter(serverConnectTimer))
-            {
-                try
-                {
-                    if (!server.StartsWith("http"))
-                        return;
-                    SendLineStatus();
-                }
-                catch (Exception ex)
-                {
-                    LogUtil.error($"ServerConnectTimer_Elapsed:{ex}");
-                }
-                finally
-                {
-                    Monitor.Exit(serverConnectTimer);
-                }
-            }
+            if (!server.StartsWith("http"))
+                return;
+            SendLineStatus();
+
         }
         }
         public void StartConnectServer()
         public void StartConnectServer()
         {
         {
@@ -164,29 +151,36 @@ namespace DeviceLibrary
         {
         {
             if (RobotManage.IsDebug)
             if (RobotManage.IsDebug)
                 return;
                 return;
-
-            lock (serverclock)
+            try
             {
             {
-                bool printlog = false;
-                DateTime time = DateTime.Now;
-                //构建发送给服务器的对象
-                Operation lineOperation = getLineBoxStatus();
-
-                if (lineOperation.status != laststatus)
+                lock (serverclock)
                 {
                 {
-                    laststatus = lineOperation.status;
-                    printlog = true;
-                }
+                    bool printlog = false;
+                    DateTime time = DateTime.Now;
+                    //构建发送给服务器的对象
+                    Operation lineOperation = getLineBoxStatus();
 
 
-                Operation resultOperation = HttpHelper.Post(GetPostApi(), lineOperation, 700, printlog);
-                //LogUtil.info(JsonHelper.SerializeObject(resultOperation.data));
-                ResultProcess(resultOperation);
-                TimeSpan span = DateTime.Now - time;
-                if (span.TotalMilliseconds > 700)
-                {
-                    LogUtil.info(StoreName + "TimerProcess[" + span.TotalMilliseconds + "]");
+                    if (lineOperation.status != laststatus)
+                    {
+                        laststatus = lineOperation.status;
+                        printlog = true;
+                    }
+
+                    Operation resultOperation = HttpHelper.Post(GetPostApi(), lineOperation, 700, printlog);
+                    //LogUtil.info(JsonHelper.SerializeObject(resultOperation.data));
+                    ResultProcess(resultOperation);
+                    TimeSpan span = DateTime.Now - time;
+                    if (span.TotalMilliseconds > 700)
+                    {
+                        LogUtil.info(StoreName + "TimerProcess[" + span.TotalMilliseconds + "]");
+                    }
                 }
                 }
             }
             }
+            catch (Exception ex)
+            {
+                LogUtil.error("SendLineStatus",ex);
+            }
+
         }
         }
         public bool SendAgvLog(string msg)
         public bool SendAgvLog(string msg)
         {
         {
@@ -198,7 +192,7 @@ namespace DeviceLibrary
                 {
                 {
                     new AgvLogInfo(msg)
                     new AgvLogInfo(msg)
                 };
                 };
-                LogUtil.info(JsonHelper.SerializeObject(operation));
+                //LogUtil.info(JsonHelper.SerializeObject(operation));
 
 
                 Operation resultOperation = HttpHelper.Post(GetPostApi(), operation, 5000);
                 Operation resultOperation = HttpHelper.Post(GetPostApi(), operation, 5000);