Explorar el Código

修复项目约束元素类型不一致的问题,模版约束增加key和元素类型回显

欧阳劲驰 hace 3 semanas
padre
commit
341cec9682

+ 5 - 0
src/main/java/com/shkpr/service/alambizplugin/components/checker/InvalidPropertiesFinder.java

@@ -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) {