Commit 0c68e781 张东亮

AGV上报

1 个父辈 dca8d73f
...@@ -232,6 +232,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -232,6 +232,7 @@ namespace OnlineStore.DeviceLibrary
return false; return false;
} }
static Dictionary<string, List<Point>> AgvPoints = new Dictionary<string, List<Point>>(); static Dictionary<string, List<Point>> AgvPoints = new Dictionary<string, List<Point>>();
static string posInfo = "";
public static void UploadAGVStatus(RobotStates robotStates) public static void UploadAGVStatus(RobotStates robotStates)
{ {
try try
...@@ -249,7 +250,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -249,7 +250,7 @@ namespace OnlineStore.DeviceLibrary
foreach (var key in AgvPoints.Keys) foreach (var key in AgvPoints.Keys)
{ {
var find = AgvPoints[key].Find(s => s.X.Equals(item.positionX) && s.Y.Equals(item.positionY)); var find = AgvPoints[key].Find(s => s.X.Equals(item.positionX) && s.Y.Equals(item.positionY));
if (find != null) if (find != null && find.X != 0 && find.Y != 0)
{ {
status.loc = key; status.loc = key;
break; break;
...@@ -262,6 +263,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -262,6 +263,14 @@ namespace OnlineStore.DeviceLibrary
agvs.Add(status); agvs.Add(status);
} }
SServerManager.UpdateAgvStatus(agvs); SServerManager.UpdateAgvStatus(agvs);
StringBuilder sb = new StringBuilder();
robotStates.robots.ForEach(s => sb.Append($"{s.robotCode} 当前位置:{s.positionX},{s.positionY}"));
string curPosInfo = sb.ToString();
if (!posInfo.Equals(curPosInfo))
{
posInfo = curPosInfo;
LogUtil.info(posInfo);
}
} }
} }
catch (Exception ex) catch (Exception ex)
......
...@@ -539,11 +539,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -539,11 +539,12 @@ namespace OnlineStore.DeviceLibrary
Dictionary<string, string> queryStr = new Dictionary<string, string>(); Dictionary<string, string> queryStr = new Dictionary<string, string>();
//queryStr.Add("rfid", rfid); //queryStr.Add("rfid", rfid);
string server = GetAddr(Addr_agvStatus, queryStr); string server = GetAddr(Addr_agvStatus, queryStr);
string json = HttpHelper.Post(server,JsonHelper.SerializeObject(agvStatuses)); string content = JsonHelper.SerializeObject(agvStatuses);
string json = HttpHelper.Post(server, content);
ServerData rtnData = JsonHelper.DeserializeJsonToObject<ServerData>(json); ServerData rtnData = JsonHelper.DeserializeJsonToObject<ServerData>(json);
if(!agvStr.Equals(json)) if(!agvStr.Equals(json))
{ {
LogUtil.info($"UpdateAgvStatus【{json}】【{JsonHelper.SerializeObject(rtnData)}】"); LogUtil.info($"UpdateAgvStatus【{content}】【{json}】");
agvStr = json; agvStr = json;
} }
if (rtnData != null && rtnData.code == 0) if (rtnData != null && rtnData.code == 0)
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!