|
|
@ -12,6 +12,7 @@ import com.yvan.workbench.model.entity.Model; |
|
|
import org.apache.commons.lang3.NotImplementedException; |
|
|
import org.apache.commons.lang3.NotImplementedException; |
|
|
import org.clever.core.Conv; |
|
|
import org.clever.core.Conv; |
|
|
import org.clever.core.id.SnowFlake; |
|
|
import org.clever.core.id.SnowFlake; |
|
|
|
|
|
import org.clever.core.model.response.R; |
|
|
import org.clever.web.mvc.annotation.RequestBody; |
|
|
import org.clever.web.mvc.annotation.RequestBody; |
|
|
|
|
|
|
|
|
import java.util.Map; |
|
|
import java.util.Map; |
|
|
@ -19,6 +20,44 @@ import java.util.Map; |
|
|
public class RcsController { |
|
|
public class RcsController { |
|
|
static final SnowFlake snowFlake = new SnowFlake(); |
|
|
static final SnowFlake snowFlake = new SnowFlake(); |
|
|
|
|
|
|
|
|
|
|
|
public static Model<?> agvToCharger(@RequestBody Map<String, Object> params) { |
|
|
|
|
|
Object ret = getCommonParamAndCreateBizTask(params); |
|
|
|
|
|
if (ret instanceof Model) { |
|
|
|
|
|
// 异常
|
|
|
|
|
|
return (Model<Object>) ret; |
|
|
|
|
|
} |
|
|
|
|
|
RcsCommonParam ps = (RcsCommonParam) ret; |
|
|
|
|
|
|
|
|
|
|
|
String targetWayPointId = Conv.asString(params.get("targetWayPointId")); |
|
|
|
|
|
if (Strings.isNullOrEmpty(targetWayPointId)) { |
|
|
|
|
|
return Model.newFail("targetWayPointId Must not be empty"); |
|
|
|
|
|
} |
|
|
|
|
|
String targetDirection = Conv.asString(params.get("targetDirection")); |
|
|
|
|
|
if (Strings.isNullOrEmpty(targetDirection)) { |
|
|
|
|
|
targetDirection = ps.fromDirection.toString(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
StaticItem toItem = ps.runtime.getStaticItemById(targetWayPointId); |
|
|
|
|
|
if (toItem == null) { |
|
|
|
|
|
return Model.newFail("target wayPoint not found!"); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ps.bizTask.setTaskTo(targetWayPointId); |
|
|
|
|
|
|
|
|
|
|
|
ChargerTask chargerTask = new ChargerTask( |
|
|
|
|
|
ps.agvId, ps.bizTask.getTaskTo(), LCCDirection.fromString(targetDirection, ps.fromDirection) |
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
ps.runtime.pathPlannerMap.get(ps.agv.getT()) |
|
|
|
|
|
.planChargerTask(ps.planSequence, ps.fromItem.getId(), ps.fromDirection, chargerTask); |
|
|
|
|
|
|
|
|
|
|
|
ps.agv.logicX = ps.fromItem.logicX; |
|
|
|
|
|
ps.agv.logicY = ps.fromItem.logicY; |
|
|
|
|
|
ps.agv.dispatchTask(ps.planSequence); |
|
|
|
|
|
|
|
|
|
|
|
return Model.newSuccess(ps.planSequence.toPrettyMap()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
public static Model<Object> agvMove(@RequestBody Map<String, Object> params) { |
|
|
public static Model<Object> agvMove(@RequestBody Map<String, Object> params) { |
|
|
Object ret = getCommonParamAndCreateBizTask(params); |
|
|
Object ret = getCommonParamAndCreateBizTask(params); |
|
|
if (ret instanceof Model) { |
|
|
if (ret instanceof Model) { |
|
|
@ -222,9 +261,6 @@ public class RcsController { |
|
|
return Model.newSuccess(ps.planSequence.toPrettyMap()); |
|
|
return Model.newSuccess(ps.planSequence.toPrettyMap()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public static Model<Boolean> agvToCharger(@RequestBody Map<String, Object> params) { |
|
|
|
|
|
throw new NotImplementedException("agvToCharger not implemented yet"); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public static Object getCommonParamAndCreateBizTask(@RequestBody Map<String, Object> params) { |
|
|
public static Object getCommonParamAndCreateBizTask(@RequestBody Map<String, Object> params) { |
|
|
String projectUUID = Conv.asString(params.get("projectUUID")); |
|
|
String projectUUID = Conv.asString(params.get("projectUUID")); |
|
|
|