|
@@ -187,6 +187,7 @@ public class InvalidPropertiesFinder {
|
|
|
, List<GisSurveyThirdImportElement> invalidTypesResult, List<GisSurveyThirdImportElement> outConstraintResult) {
|
|
|
//项目约束映射
|
|
|
Map<String, GisSurveyCondition> projectConstraintsMapping = projectConstraints.stream()
|
|
|
+ .filter(constraint -> Objects.equals(layerTemplate.getKind(), constraint.getKind()))
|
|
|
.collect(Collectors.toMap(GisSurveyCondition::getProperty, it -> it));
|
|
|
//遍历图层属性模版
|
|
|
for (GisMetadataPropertyTemplate propertyTemplate : layerTemplate.getPropertyTemplates()) {
|
|
@@ -252,6 +253,10 @@ public class InvalidPropertiesFinder {
|
|
|
//模版约束
|
|
|
if (StringUtils.isNotBlank(propertyTemplate.getMode()) && CollectionUtils.isNotEmpty(propertyTemplate.getRanges())) {
|
|
|
constraint = BeanUtil.copy(propertyTemplate, GisSurveyCondition.class);
|
|
|
+ if (constraint != null) {
|
|
|
+ constraint.setProperty(propertyTemplate.getKey());
|
|
|
+ constraint.setKind(layerTemplate.getKind());
|
|
|
+ }
|
|
|
}
|
|
|
//项目约束
|
|
|
if (projectConstraint != null) {
|