添加是否在围栏内

src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -239,21 +239,23 @@ public class CommonServiceImpl implements CommonService {
 
             //判断是否在当前围栏
             LocationVO location = getLocation(workOrder.getTruckId());
-            double pointLon = Double.valueOf(location.getLongitude());
-            double pointLat = Double.valueOf(location.getLatitude());
-            if (StringUtils.isNotBlank(regionData)) {
-                regionData = regionData.replace("\"", "");
-                regionData = regionData.replace("[", "");
-                regionData = regionData.replace("]", "");
-                String[] regionDataArray = regionData.split(";");
-                Double[] lon = new Double[regionDataArray.length];
-                Double[] lat = new Double[regionDataArray.length];
-                for (int i = 0; i < regionDataArray.length; i++) {
-                    lon[i] = Double.valueOf(regionDataArray[i].split(",")[0]);
-                    lat[i] = Double.valueOf(regionDataArray[i].split(",")[1]);
+            if (location != null) {
+                double pointLon = Double.valueOf(location.getLongitude());
+                double pointLat = Double.valueOf(location.getLatitude());
+                if (StringUtils.isNotBlank(regionData)) {
+                    regionData = regionData.replace("\"", "");
+                    regionData = regionData.replace("[", "");
+                    regionData = regionData.replace("]", "");
+                    String[] regionDataArray = regionData.split(";");
+                    Double[] lon = new Double[regionDataArray.length];
+                    Double[] lat = new Double[regionDataArray.length];
+                    for (int i = 0; i < regionDataArray.length; i++) {
+                        lon[i] = Double.valueOf(regionDataArray[i].split(",")[0]);
+                        lat[i] = Double.valueOf(regionDataArray[i].split(",")[1]);
+                    }
+                    boolean flag = RegionUtil.isInPolygon(pointLon, pointLat, lon, lat);
+                    vo.setIsInPolygon(flag);
                 }
-                boolean flag = RegionUtil.isInPolygon(pointLon, pointLat, lon, lat);
-                vo.setIsInPolygon(flag);
             }
         }
         return vo;