diff --git a/backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java b/backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java index b78bee5..90085ef 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java +++ b/backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java @@ -1,6 +1,7 @@ package com.yfd.platform.data.domain; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,6 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @TableName("FISH_DRAFT_DATA") +@JsonIgnoreProperties(ignoreUnknown = true) public class FishDraftData implements Serializable { private static final long serialVersionUID = 1L; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/FishImportResult.java b/backend/src/main/java/com/yfd/platform/data/domain/FishImportResult.java index d466b44..b0ffa2a 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/FishImportResult.java +++ b/backend/src/main/java/com/yfd/platform/data/domain/FishImportResult.java @@ -1,5 +1,6 @@ package com.yfd.platform.data.domain; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import java.util.ArrayList; @@ -8,6 +9,7 @@ import java.util.List; import java.util.Map; @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class FishImportResult { private List successRows; @@ -34,12 +36,18 @@ public class FishImportResult { } @Data + @JsonIgnoreProperties(ignoreUnknown = true) public static class FishImportRow { private int rowIndex; private FishDraftData data; private List unrecognizedFields; private List warnings; + public FishImportRow() { + this.unrecognizedFields = new ArrayList<>(); + this.warnings = new ArrayList<>(); + } + public FishImportRow(int rowIndex) { this.rowIndex = rowIndex; this.unrecognizedFields = new ArrayList<>();