update

opentcs-common/src/main/java/org/opentcs/communication/http/service/BaseService.java

@@ -20,7 +20,7 @@ public class BaseService {
    * 生成进程内唯一的int型ID
    * 优点：简单高效
    * 限制：
-   *   - 重启后可能重复
+   *   - 重启后可能重复,但数据是内存中存在，重启即销毁
    *   - 超过21亿后会回绕（正常应用很难达到）
    */
   public static int generate() {

opentcs-common/src/main/java/org/opentcs/communication/http/service/ExecuteAction.java

@@ -11,13 +11,13 @@ public class ExecuteAction extends BaseService {
 
   /**
    * 下发动作到平台
-   * @param orderName 车辆名称
+   * @param name 名称
    * @param vehicleName 车辆名称
    * @param point 当前位置
    * @param action 动作
    * @param serialNum 序列号
    */
-  public static void sendCmd(String orderName, String vehicleName, String point, String action, Integer serialNum) {
+  public static void sendCmd(String name, String vehicleName, String point, String action, Integer serialNum) {
 
     String url = getUrl(vehicleName);
 
@@ -27,7 +27,7 @@ public class ExecuteAction extends BaseService {
     String time = now.format(formatter);
 
     RequestAction requestAction = new RequestAction();
-    requestAction.setOrder_name(orderName);
+    requestAction.setOrder_name(name);
     requestAction.setAction(action);
     requestAction.setPoint(point);
 

opentcs-common/src/main/java/org/opentcs/communication/http/service/ExecuteMove.java

@@ -169,7 +169,23 @@ public class ExecuteMove extends BaseService {
    * 获取当前订单ID
    */
   public static Integer getOrderID(String vehicleName) {
-    return orderInfoMap.get(vehicleName).getId();
+
+    if (orderInfoMap.containsKey(vehicleName)) {
+      return orderInfoMap.get(vehicleName).getId();
+    }
+    return null;
+  }
+
+  /**
+   * 清理对应订单，实现平台接管后继续执行订单
+   */
+  public static boolean resetOrder(String vehicleName) {
+
+    if (orderInfoMap.containsKey(vehicleName)) {
+      orderInfoMap.remove(vehicleName);
+    }
+
+    return true;
   }
 
   /**

opentcs-common/src/main/java/org/opentcs/manage/AdapterManage.java

@@ -154,6 +154,7 @@ public class AdapterManage {
     agvInfoParams.setAgv_model(params.getInteger("agv_model"));
     agvInfoParams.setCharge_status(params.getInteger("charge_status"));
     agvInfoParams.setAction_status(params.getInteger("action_status"));
+    agvInfoParams.setOrder_id(params.getInteger("order_id"));
 
     return agvInfoParams;
   }

opentcs-common/src/main/java/org/opentcs/manage/entity/AgvInfoParams.java

@@ -52,4 +52,8 @@ public class AgvInfoParams {
    * 执行动作状态：1=完成，2=执行中
    */
   private Integer action_status;
+  /**
+   * 控制器最后执行订单ID，id=0即为未创建任务
+   */
+  private Integer order_id;
 }