拉取

src/main/java/com/steerinfo/inPlantNavigation/service/IIPMMSVertexService.java

@@ -14,5 +14,6 @@ public interface IIPMMSVertexService {
 
     Map<String, IPMMSVertex> initIPMSVertexTest();
 
+
     ArrayList<IPMMSVertex> getObtainTheOptimalPath(String startpoint,String endPoint,Map<String, List<IPMMSVertexEdge>> vertexEdgeList, Map<String, IPMMSVertex> vertexList) throws VertexAngEdgeException;
 }

src/main/java/com/steerinfo/inPlantNavigation/service/impl/IPMMSVertexServiceImpl.java

@@ -4,6 +4,7 @@ import com.steerinfo.inPlantNavigation.exception.VertexAngEdgeException;
 import com.steerinfo.inPlantNavigation.model.IPMMSVertex;
 import com.steerinfo.inPlantNavigation.model.IPMMSVertexEdge;
 import com.steerinfo.inPlantNavigation.service.IIPMMSVertexService;
+import com.steerinfo.route.util.LngLonUtil;
 import org.apache.commons.lang.SerializationUtils;
 import org.springframework.stereotype.Service;
 
@@ -116,7 +117,7 @@ public class IPMMSVertexServiceImpl implements IIPMMSVertexService {
         }
         Set<String> keys = bestDinstance.keySet();
         String vertex="";
-        int minimumValue=100;
+        int minimumValue=10000000;
         for (String key :keys){
             int[] value = currentBestDinstance.get(key);
             if (minimumValue>value[1]){
@@ -186,7 +187,7 @@ public class IPMMSVertexServiceImpl implements IIPMMSVertexService {
     @Override
     public Map<String,IPMMSVertex> initIPMSVertexTest(){
         Map<String,IPMMSVertex> IPMMSVertexList=new HashMap<>();
-
+        //现在使用的是自己手动在地图上查询到的坐标
         IPMMSVertex ipmmsVertex0=new IPMMSVertex();
         ipmmsVertex0.setVertexID(new BigDecimal(0));
         ipmmsVertex0.setAddressName("1号汽车衡");
@@ -236,19 +237,19 @@ public class IPMMSVertexServiceImpl implements IIPMMSVertexService {
         ipmmsVertex6.setLatitude(new BigDecimal("31.188635"));
         IPMMSVertexList.put("6",ipmmsVertex6);
 
-       /* IPMMSVertex ipmmsVertex7=new IPMMSVertex();
+        IPMMSVertex ipmmsVertex7=new IPMMSVertex();
         ipmmsVertex7.setVertexID(new BigDecimal(7));
         ipmmsVertex7.setAddressName("泰昕门");
         ipmmsVertex7.setLongitude(new BigDecimal("107.450807"));
         ipmmsVertex7.setLatitude(new BigDecimal("31.183661"));
-        IPMMSVertexList.put("7",ipmmsVertex7);*/
+        IPMMSVertexList.put("7",ipmmsVertex7);
 
-       /* IPMMSVertex ipmmsVertex8=new IPMMSVertex();
+        IPMMSVertex ipmmsVertex8=new IPMMSVertex();
         ipmmsVertex8.setVertexID(new BigDecimal(8));
         ipmmsVertex8.setAddressName("9号汽车衡");
         ipmmsVertex8.setLongitude(new BigDecimal("107.453046"));
         ipmmsVertex8.setLatitude(new BigDecimal("31.185408"));
-        IPMMSVertexList.put("8",ipmmsVertex8);*/
+        IPMMSVertexList.put("8",ipmmsVertex8);
 
         IPMMSVertex ipmmsVertex9=new IPMMSVertex();
         ipmmsVertex9.setVertexID(new BigDecimal(9));
@@ -314,4 +315,6 @@ public class IPMMSVertexServiceImpl implements IIPMMSVertexService {
         IPMMSVertexList.put("17",ipmmsVertex16);
         return IPMMSVertexList;
     }
+
+
 }