diff --git a/src/main/java/com/gis3c/spatial/common/FeatureUtilities.java b/src/main/java/com/gis3c/spatial/common/FeatureUtilities.java index 0a8d459..12e1551 100644 --- a/src/main/java/com/gis3c/spatial/common/FeatureUtilities.java +++ b/src/main/java/com/gis3c/spatial/common/FeatureUtilities.java @@ -2,12 +2,10 @@ package com.gis3c.spatial.common; import com.gis3c.spatial.entity.BaseFeature; -import com.gis3c.spatial.entity.Region; import org.geotools.data.DataUtilities; import org.geotools.data.simple.SimpleFeatureCollection; import org.geotools.geojson.feature.FeatureJSON; import org.opengis.feature.simple.SimpleFeature; -import org.opengis.feature.simple.SimpleFeatureType; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -53,16 +51,13 @@ public class FeatureUtilities { * @return * @throws IllegalAccessException */ - public static List JavaBeans2Features(List beansList) - throws IllegalAccessException { - if(beansList == null || beansList.size() == 0){ - throw new NullPointerException("参数无效"); - } + public static List JavaBeans2Features(List beansList) { List simpleFeatureList = new ArrayList<>(); - for(int i = 0,len = beansList.size();i < len;i++){ - simpleFeatureList.add(beansList.get(i).javaBean2SimpleFeature(Integer.toString(i))); + if(beansList != null || beansList.size() != 0){ + for(int i = 0,len = beansList.size();i < len;i++){ + simpleFeatureList.add(beansList.get(i).javaBean2SimpleFeature(Integer.toString(i))); + } } - return simpleFeatureList; } @@ -124,6 +119,8 @@ public class FeatureUtilities { simpleFeatureCollection = Features2Collection(simpleFeatureList); fjson.writeFeatureCollection(simpleFeatureCollection, writer); result = writer.toString(); + }else { + result="{'type': 'FeatureCollection', 'features': []}"; } return result; @@ -146,6 +143,8 @@ public class FeatureUtilities { writer = new StringWriter(); fjson.writeFeatureCollection(featureCollection, writer); result = writer.toString(); + }else { + result = "{'type': 'FeatureCollection', 'features': []}"; } return result; } diff --git a/src/test/java/com/gis3c/spatial/App.java b/src/test/java/com/gis3c/spatial/App.java index 0282ee8..26c8a7d 100644 --- a/src/test/java/com/gis3c/spatial/App.java +++ b/src/test/java/com/gis3c/spatial/App.java @@ -36,9 +36,33 @@ public class App { // TestService testService = context.getBean(TestService.class); RegionService regionService = context.getBean(RegionService.class); + + System.out.println(3 & 2); + +// System.out.println(a.compareTo(b)); + + + + + + + + + + + + + + + + + + + + // List regionList = regionService.findRegionsByParentCode("370000"); // String region = regionService.findRegionCentersByParentCode("370100"); - System.out.println(regionService.findRegionCentersByParentCode("370100").get(0).getCenter()); +// System.out.println(regionService.findRegionCentersByParentCode("370100").get(0).getCenter()); // // List featureList = FeatureUtilities.JavaBeans2Features(regionList); //