|
@@ -322,8 +322,9 @@ public class GisSurveyThirdExporter {
|
|
.flatMap(it -> it.getPropertyTemplates().stream())
|
|
.flatMap(it -> it.getPropertyTemplates().stream())
|
|
.sorted(Comparator.comparing(GisMetadataPropertyTemplate::getOrdering))
|
|
.sorted(Comparator.comparing(GisMetadataPropertyTemplate::getOrdering))
|
|
.map(it ->
|
|
.map(it ->
|
|
- StringUtils.substring(it.getName(), 0, 5) + ":"
|
|
|
|
- + (StringUtils.isBlank(it.getType()) ? "string" : it.getType())
|
|
|
|
|
|
+ String.format("%s%s"
|
|
|
|
+ , StringUtils.substring(it.getName(), 0, 5)
|
|
|
|
+ , GisSurveyExcelDefine.FILE_HANDLE.COL_SPEC)
|
|
)
|
|
)
|
|
.distinct()
|
|
.distinct()
|
|
.collect(Collectors.joining(","));
|
|
.collect(Collectors.joining(","));
|
|
@@ -332,8 +333,9 @@ public class GisSurveyThirdExporter {
|
|
.flatMap(it -> it.getPropertyTemplates().stream())
|
|
.flatMap(it -> it.getPropertyTemplates().stream())
|
|
.sorted(Comparator.comparing(GisMetadataPropertyTemplate::getOrdering))
|
|
.sorted(Comparator.comparing(GisMetadataPropertyTemplate::getOrdering))
|
|
.map(it ->
|
|
.map(it ->
|
|
- StringUtils.substring(it.getName(), 0, 5) + ":"
|
|
|
|
- + (StringUtils.isBlank(it.getType()) ? "string" : it.getType())
|
|
|
|
|
|
+ String.format("%s%s"
|
|
|
|
+ , StringUtils.substring(it.getName(), 0, 5)
|
|
|
|
+ , GisSurveyExcelDefine.FILE_HANDLE.COL_SPEC)
|
|
)
|
|
)
|
|
.distinct()
|
|
.distinct()
|
|
.collect(Collectors.joining(","));
|
|
.collect(Collectors.joining(","));
|
|
@@ -342,12 +344,12 @@ public class GisSurveyThirdExporter {
|
|
//创建点类型
|
|
//创建点类型
|
|
final SimpleFeatureType POINT_TYPE = DataUtilities.createType(
|
|
final SimpleFeatureType POINT_TYPE = DataUtilities.createType(
|
|
"point",
|
|
"point",
|
|
- GisSurveyExcelDefine.FILE_HANDLE.POINT_SPEC + pointTemplateSpec
|
|
|
|
|
|
+ String.format("%s%s", GisSurveyExcelDefine.FILE_HANDLE.POINT_SPEC, pointTemplateSpec)
|
|
);
|
|
);
|
|
//创建线类型
|
|
//创建线类型
|
|
final SimpleFeatureType LINE_TYPE = DataUtilities.createType(
|
|
final SimpleFeatureType LINE_TYPE = DataUtilities.createType(
|
|
"line",
|
|
"line",
|
|
- GisSurveyExcelDefine.FILE_HANDLE.LINE_SPEC + lineTemplateSpec
|
|
|
|
|
|
+ String.format("%s%s", GisSurveyExcelDefine.FILE_HANDLE.LINE_SPEC, lineTemplateSpec)
|
|
);
|
|
);
|
|
|
|
|
|
//shape数据
|
|
//shape数据
|