|
@@ -73,9 +73,26 @@ public class MapVertexServiceImpl implements IMapVertexService {
|
|
|
return mapVertexMapper.findAllAvailable();
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 返回门岗、汽车衡和作业点
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@Override
|
|
|
public ArrayList<MapVertex> findSelections() {
|
|
|
- return mapVertexMapper.findSelections();
|
|
|
+ ArrayList<MapVertex> list=mapVertexMapper.findSelections();//查询的结果包含重复值,需要去重
|
|
|
+ ArrayList<MapVertex> selections=new ArrayList<>();
|
|
|
+ HashSet<BigDecimal> set=new HashSet<>();
|
|
|
+ for(MapVertex vertex:list){
|
|
|
+ if(!set.contains(vertex.getVertexId())){
|
|
|
+ set.add(vertex.getVertexId());
|
|
|
+ selections.add(vertex);
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ System.out.println(selections);
|
|
|
+ return selections;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -221,12 +238,27 @@ public class MapVertexServiceImpl implements IMapVertexService {
|
|
|
return obtainOptimalPath;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 取得订单路径细节
|
|
|
+ * @param orderId
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@Override
|
|
|
public Map<String, Object> findOrderDetails(String orderId) {
|
|
|
Map<String, Object> result=mapVertexMapper.findOrderDetails(orderId);
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 根据订单id和前后步骤取得目标路径
|
|
|
+ * @param orderId
|
|
|
+ * @param startStep
|
|
|
+ * @param endStep
|
|
|
+ * @param vertexList
|
|
|
+ * @param vertexEdgeList
|
|
|
+ * @return
|
|
|
+ * @throws VertexAngEdgeException
|
|
|
+ */
|
|
|
@Override
|
|
|
public ArrayList<MapVertex> getPathByOrderID(String orderId,String startStep,String endStep,Map<String, MapVertex> vertexList,Map<String, List<MapVertexEdge>> vertexEdgeList) throws VertexAngEdgeException {
|
|
|
//校验
|