|
|
@@ -297,4 +297,34 @@ public class CurrTaskController extends BaseController { |
|
|
|
//点击执行按钮会判断当前任务是否为自动任务,如果是自动任务会去自动任务查一下该自动任务的上一步是否已完成(仅非一步时) |
|
|
|
return currTaskService.runTask(param.getId()); |
|
|
|
} |
|
|
|
@PostMapping(value = "testRunTask") |
|
|
|
@ApiOperation(value = "执行任务") |
|
|
|
public R<String> testRunTask(@RequestBody RGVTask rgvTask){ |
|
|
|
sendTaskToRgv(rgvTask.getTaskType(),rgvTask.getVehicleId(),rgvTask.getTaskNo(),rgvTask.getPickRow(),rgvTask.getSendRow(),rgvTask.getProcessNumber()); |
|
|
|
return null; |
|
|
|
} |
|
|
|
private Integer sendTaskToRgv(Integer taskType,Long vehicleId, Long currTaskId, Long startPoint, Long endPoint, Integer processNumber) { |
|
|
|
Map<String, Object> json = new HashMap(); |
|
|
|
// taskType 1 搬运 |
|
|
|
json.put("taskType", taskType); |
|
|
|
json.put("sendRow", endPoint); |
|
|
|
json.put("pickRow", startPoint); |
|
|
|
json.put("taskNo", currTaskId); |
|
|
|
json.put("ideNumber", currTaskId); |
|
|
|
json.put("processNumber", processNumber); |
|
|
|
String taskJson = JSON.toJSONString(json); |
|
|
|
String result = null; |
|
|
|
try { |
|
|
|
if (vehicleId == 1) { |
|
|
|
result = HttpClient.httpPost("http://192.168.6.51:8009/rgv1/sendTask", taskJson); |
|
|
|
} |
|
|
|
if (vehicleId == 2) { |
|
|
|
result = HttpClient.httpPost("http://192.168.6.51:8009/rgv2/sendTask", taskJson); |
|
|
|
} |
|
|
|
} catch (IOException e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
JSONObject jsonObject = JSON.parseObject(result); |
|
|
|
return Integer.parseInt(String.valueOf(jsonObject.get("msg"))); |
|
|
|
} |
|
|
|
} |