修改与服务器通信代码

source/Common/util/HttpHelper.cs

@@ -95,7 +95,17 @@ namespace OnlineStore.Common
                     {
                     {
                         try
                         try
                         {
                         {
-                            return JsonHelper.DeserializeJsonToObject<Operation>(result);
+                            Operation resultOP = JsonHelper.DeserializeJsonToObject<Operation>(result);
+                            if (resultOP != null && (!operation.seq.Equals(resultOP.seq)))
+                            {
+                                LogUtil.error(" seq  error : send  【" + json + "】 " + ",receive 【 " + result + "】");
+                            }
+                            if (resultOP != null && (!operation.cid.Equals(resultOP.cid)))
+                            {
+                                LogUtil.error(" cid  error : send  【" + json + "】 " + ",receive 【 " + result + "】，return null");
+                                return null;
+                            }
+                            return resultOP;
                         }
                         }
                         catch (Exception ex)
                         catch (Exception ex)
                         {
                         {

source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs

@@ -499,14 +499,12 @@ namespace OnlineStore.DeviceLibrary
             lastConTime = DateTime.Now;
             lastConTime = DateTime.Now;
             try
             try
             {
             {
-                //HumitureController.QueryData();
-                humBean.HumidityProcess(this);
-                if (StoreManager.IsConnectServer)
-                {
-
-                    SendLineStatus();
-
-                }
+                ////HumitureController.QueryData();
+                //humBean.HumidityProcess(this);
+                //if (StoreManager.IsConnectServer)
+                //{ 
+                //    SendLineStatus(); 
+                //}
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {

source/DeviceLibrary/ACPackingStore/PackingStoreBean.cs

@@ -23,6 +23,7 @@ namespace OnlineStore.DeviceLibrary
         /// 灯闪烁定时器
         /// 灯闪烁定时器
         /// </summary>
         /// </summary>
         private System.Timers.Timer ledProcessTimer = null;
         private System.Timers.Timer ledProcessTimer = null;
+        private System.Timers.Timer serverConnectTimer = new System.Timers.Timer();
 
 
         public Dictionary<int, AC_BOX_Config> BoxConfigMap { get; set; }
         public Dictionary<int, AC_BOX_Config> BoxConfigMap { get; set; }
         public Dictionary<int, AC_BOX_Bean> BoxMap = new Dictionary<int, AC_BOX_Bean>();
         public Dictionary<int, AC_BOX_Bean> BoxMap = new Dictionary<int, AC_BOX_Bean>();
@@ -86,6 +87,7 @@ namespace OnlineStore.DeviceLibrary
                 mainTimer.Enabled = true;               
                 mainTimer.Enabled = true;               
                 canStart = true;
                 canStart = true;
 
 
+                serverConnectTimer.Enabled = true;
                 //连接AGV调度
                 //连接AGV调度
                 AgvClient.Init();
                 AgvClient.Init();
             });
             });
@@ -108,6 +110,12 @@ namespace OnlineStore.DeviceLibrary
             ledProcessTimer.Elapsed += LedProcess;
             ledProcessTimer.Elapsed += LedProcess;
             ledProcessTimer.AutoReset = true;
             ledProcessTimer.AutoReset = true;
             ledProcessTimer.Enabled = false;
             ledProcessTimer.Enabled = false;
+
+            serverConnectTimer = new System.Timers.Timer();
+            serverConnectTimer.Interval = 1000;
+            serverConnectTimer.AutoReset = true;
+            serverConnectTimer.Enabled = false;
+            serverConnectTimer.Elapsed += server_connect_timer_Tick;
         }
         }
 
 
         private void IoCheckTimerProcess(object sender, ElapsedEventArgs e)
         private void IoCheckTimerProcess(object sender, ElapsedEventArgs e)
@@ -155,6 +163,7 @@ namespace OnlineStore.DeviceLibrary
                     box.StartRun();
                     box.StartRun();
                 }
                 }
 
 
+                serverConnectTimer.Enabled = true;
                 ledProcessTimer.Enabled = true;
                 ledProcessTimer.Enabled = true;
                 mainTimer.Enabled = true;
                 mainTimer.Enabled = true;
                 return true;
                 return true;
@@ -449,5 +458,65 @@ namespace OnlineStore.DeviceLibrary
         }
         }
 
 
         #endregion
         #endregion
+
+
+
+
+        #region 与服务器通信
+
+        private bool isInProcess = false;
+        private DateTime lastConTime = DateTime.Now;
+        public void server_connect_timer_Tick(object sender, EventArgs e)
+        {
+            if (isInProcess)
+            {
+                TimeSpan span = DateTime.Now - lastConTime;
+                if (span.TotalSeconds < 10)
+                {
+                    return;
+                }
+                else
+                {
+                    LogUtil.error($"{Name}server_connect_timer_Tick 已耗时{span.TotalSeconds}秒，重新处理");
+                }
+            }
+            isInProcess = true;
+            lastConTime = DateTime.Now;
+            try
+            {
+                foreach (AC_BOX_Bean box in BoxMap.Values)
+                {
+                    if (box.storeRunStatus.Equals(StoreRunStatus.Wait))
+                    {
+                        continue;
+                    }
+
+                    if ((!box.IsDebug) && StoreManager.IsConnectServer)
+                    {
+                        try
+                        {
+                            box.SendLineStatus();
+                        }
+                        catch (Exception ex)
+                        {
+                            LogUtil.error(Name + "定时给服务器发送消息出错：" + ex.ToString());
+                        }
+                    }
+                    box.humBean.HumidityProcess(box);
+                }
+
+            }
+            catch (Exception ex)
+            {
+                LogUtil.error(Name + "server_connect_timer_Tick出错：" + ex.ToString());
+            }
+            finally
+            {
+                isInProcess = false;
+            }
+        }
+
+        #endregion
+
     }
     }
 }
 }
\ No newline at end of file