diff --git a/face-search-server/src/main/java/com/visual/face/search/server/domain/base/CollectVo.java b/face-search-server/src/main/java/com/visual/face/search/server/domain/base/CollectVo.java index a747fea..ccd5c15 100644 --- a/face-search-server/src/main/java/com/visual/face/search/server/domain/base/CollectVo.java +++ b/face-search-server/src/main/java/com/visual/face/search/server/domain/base/CollectVo.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.Min; +import java.util.ArrayList; import java.util.List; /*** @@ -33,10 +34,10 @@ public class CollectVo> extends BaseVo { private Integer shardsNum; /**自定义的样本字段**/ @ApiModelProperty(value="自定义的样本属性字段", position = 5,required = false) - private List sampleColumns; + private List sampleColumns = new ArrayList<>(); /**自定义的人脸字段**/ @ApiModelProperty(value="自定义的人脸属性字段", position = 6,required = false) - private List faceColumns; + private List faceColumns = new ArrayList<>(); /**启用binlog同步**/ @ApiModelProperty(value="启用binlog同步。扩展字段,暂不支持该功能。", position = 7,required = false) private Boolean syncBinLog; @@ -101,7 +102,9 @@ public class CollectVo> extends BaseVo { } public ExtendsVo setSampleColumns(List sampleColumns) { - this.sampleColumns = sampleColumns; + if(null != sampleColumns){ + this.sampleColumns = sampleColumns; + } return (ExtendsVo) this; } @@ -110,7 +113,9 @@ public class CollectVo> extends BaseVo { } public ExtendsVo setFaceColumns(List faceColumns) { - this.faceColumns = faceColumns; + if(null != faceColumns){ + this.faceColumns = faceColumns; + } return (ExtendsVo) this; } diff --git a/face-search-server/src/main/java/com/visual/face/search/server/utils/ValueUtil.java b/face-search-server/src/main/java/com/visual/face/search/server/utils/ValueUtil.java index 784c97b..07568bc 100644 --- a/face-search-server/src/main/java/com/visual/face/search/server/utils/ValueUtil.java +++ b/face-search-server/src/main/java/com/visual/face/search/server/utils/ValueUtil.java @@ -16,24 +16,27 @@ import java.util.Map; public class ValueUtil { public static List getFaceColumns(Collection collection){ - if(null != collection.getSchemaInfo() && !collection.getSchemaInfo().isEmpty()){ + if(null != collection.getSchemaInfo() && !collection.getSchemaInfo().isEmpty()) { CollectRepVo collectVo = JsonUtil.toEntity(collection.getSchemaInfo(), CollectRepVo.class); - return collectVo.getFaceColumns(); - }else{ - return new ArrayList<>(); + if (null != collectVo && null != collectVo.getFaceColumns()) { + return collectVo.getFaceColumns(); + } } + return new ArrayList<>(); } public static List getSampleColumns(Collection collection){ if(null != collection.getSchemaInfo() && !collection.getSchemaInfo().isEmpty()){ CollectRepVo collectVo = JsonUtil.toEntity(collection.getSchemaInfo(), CollectRepVo.class); - return collectVo.getSampleColumns(); - }else{ - return new ArrayList<>(); + if (null != collectVo && null != collectVo.getSampleColumns()) { + return collectVo.getSampleColumns(); + } } + return new ArrayList<>(); } public static FieldKeyValues getFieldKeyValues(Map map , List columns){ + columns = null != columns ? columns : new ArrayList<>(); Map keyMap = new HashMap<>(); for(FiledColumn column : columns){ for(String dataKey : map.keySet()){