From 7670fd8d4fd168edfe9d1b59c7cde2529c9c93aa Mon Sep 17 00:00:00 2001 From: "hukekuan@163.com" Date: Mon, 12 Mar 2018 08:46:09 +0800 Subject: [PATCH] Merge branch 'master' of C:\Java\workspace\gissupport\github-gissupport\GISSupport with conflicts. --- src/main/java/com/gis3c/spatial/entity/feature/Region.java | 7 +++++++ src/test/java/com/gis3c/spatial/App.java | 7 ++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/gis3c/spatial/entity/feature/Region.java diff --git a/src/main/java/com/gis3c/spatial/entity/feature/Region.java b/src/main/java/com/gis3c/spatial/entity/feature/Region.java new file mode 100644 index 0000000..b03c1fd --- /dev/null +++ b/src/main/java/com/gis3c/spatial/entity/feature/Region.java @@ -0,0 +1,7 @@ +package com.gis3c.spatial.entity.feature; + +/** + * Created by hukekuan on 2018/3/9. + */ +public class Region { +} diff --git a/src/test/java/com/gis3c/spatial/App.java b/src/test/java/com/gis3c/spatial/App.java index 1d9f0e8..0282ee8 100644 --- a/src/test/java/com/gis3c/spatial/App.java +++ b/src/test/java/com/gis3c/spatial/App.java @@ -36,12 +36,9 @@ public class App { // TestService testService = context.getBean(TestService.class); RegionService regionService = context.getBean(RegionService.class); - List regionList = regionService.findRegionsByParentCode("370300"); - - regionList.stream().forEach(region -> System.out.println(region.getRegionName() + "-->" + region.getReginCode())); - +// List regionList = regionService.findRegionsByParentCode("370000"); // String region = regionService.findRegionCentersByParentCode("370100"); -// System.out.println(regionService.findAroundRegions("370100").size()); + System.out.println(regionService.findRegionCentersByParentCode("370100").get(0).getCenter()); // // List featureList = FeatureUtilities.JavaBeans2Features(regionList); //