编译
This commit is contained in:
parent
0f78691b3b
commit
1cc7fd843d
@ -18,7 +18,7 @@ public class CommonApiImpl implements CommonApi {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private MqttUtils mqttUtils;
|
private MqttUtils mqttUtils;
|
||||||
|
|
||||||
@Override
|
/*@Override
|
||||||
public void commonMethod(Object obj, String topic) {
|
public void commonMethod(Object obj, String topic) {
|
||||||
try {
|
try {
|
||||||
String str = JSON.toJSONString(obj);
|
String str = JSON.toJSONString(obj);
|
||||||
@ -51,5 +51,5 @@ public class CommonApiImpl implements CommonApi {
|
|||||||
} catch (MqttException e) {
|
} catch (MqttException e) {
|
||||||
log.info("MQTT消息发送异常 :{}",e);
|
log.info("MQTT消息发送异常 :{}",e);
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
@ -1533,7 +1533,7 @@ public class RobotInformationServiceImpl extends ServiceImpl<RobotInformationMap
|
|||||||
}
|
}
|
||||||
|
|
||||||
pathPlanning.setReleaseGroupId("POINT_" + deviceInformationDO.getPositionMapItemId());
|
pathPlanning.setReleaseGroupId("POINT_" + deviceInformationDO.getPositionMapItemId());
|
||||||
pathPlanning.setReleasePointId(deviceInformationDO.getPositionMapItemId() + "");
|
pathPlanning.setReleasePointId(String.valueOf(deviceInformationDO.getPositionMapItemId()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -507,7 +507,7 @@ public class RobotPathPlanningServiceImpl implements RobotPathPlanningService {
|
|||||||
|
|
||||||
if (ObjectUtil.isNotEmpty(taskDetailDO.getFromLocationId())) {
|
if (ObjectUtil.isNotEmpty(taskDetailDO.getFromLocationId())) {
|
||||||
pathPlanning.setTakeLocationNumber(Math.abs(znConfigConstant.getLocationNumberReduce() - taskDetailDO.getFromLocationNumber()));
|
pathPlanning.setTakeLocationNumber(Math.abs(znConfigConstant.getLocationNumberReduce() - taskDetailDO.getFromLocationNumber()));
|
||||||
pathPlanning.setTakePointId(fromLocation.getMapItemId()+"");
|
pathPlanning.setTakePointId(String.valueOf(fromLocation.getMapItemId()));
|
||||||
|
|
||||||
pathPlanningSetTakeHeight(pathPlanning, fromLocation);
|
pathPlanningSetTakeHeight(pathPlanning, fromLocation);
|
||||||
pathPlanning.setTakeLevel(fromLocation.getLocationStorey());
|
pathPlanning.setTakeLevel(fromLocation.getLocationStorey());
|
||||||
@ -521,7 +521,7 @@ public class RobotPathPlanningServiceImpl implements RobotPathPlanningService {
|
|||||||
|
|
||||||
if (ObjectUtil.isNotEmpty(taskDetailDO.getToLocationId())) {
|
if (ObjectUtil.isNotEmpty(taskDetailDO.getToLocationId())) {
|
||||||
pathPlanning.setReleaseLocationNumber(taskDetailDO.getToLocationNumber());
|
pathPlanning.setReleaseLocationNumber(taskDetailDO.getToLocationNumber());
|
||||||
pathPlanning.setReleasePointId(toLocation.getMapItemId()+"");
|
pathPlanning.setReleasePointId(String.valueOf(toLocation.getMapItemId()));
|
||||||
|
|
||||||
pathPlanningSetReleaseHeight(pathPlanning, toLocation);
|
pathPlanningSetReleaseHeight(pathPlanning, toLocation);
|
||||||
pathPlanning.setReleaseLevel(toLocation.getLocationStorey());
|
pathPlanning.setReleaseLevel(toLocation.getLocationStorey());
|
||||||
@ -598,7 +598,7 @@ public class RobotPathPlanningServiceImpl implements RobotPathPlanningService {
|
|||||||
*/
|
*/
|
||||||
private void moveToPoint(TaskToPathPlanningDTO pathPlanning, RobotTaskDetailDO taskDetailDO) {
|
private void moveToPoint(TaskToPathPlanningDTO pathPlanning, RobotTaskDetailDO taskDetailDO) {
|
||||||
pathPlanning.setReleaseLocationNumber(1l);
|
pathPlanning.setReleaseLocationNumber(1l);
|
||||||
pathPlanning.setReleasePointId(taskDetailDO.getReleaseId()+"");
|
pathPlanning.setReleasePointId(String.valueOf(taskDetailDO.getReleaseId()));
|
||||||
pathPlanning.setReleaseGroupId("POINT_" + taskDetailDO.getReleaseId());
|
pathPlanning.setReleaseGroupId("POINT_" + taskDetailDO.getReleaseId());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user