diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/CreateCoalWashingDailyAnalysisDto.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/CreateCoalWashingDailyAnalysisDto.java index dc0d396e..53d1350b 100644 --- a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/CreateCoalWashingDailyAnalysisDto.java +++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/CreateCoalWashingDailyAnalysisDto.java @@ -2,6 +2,7 @@ package cn.lihongjie.coal.coalWashingDailyAnalysis.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisItemVo; +import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisKFItemVo; import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisParamVo; import jakarta.persistence.CollectionTable; @@ -29,6 +30,11 @@ public class CreateCoalWashingDailyAnalysisDto extends OrgCommonDto { @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) private List inputItems; + @ElementCollection + @Comment("用户手动录入的快浮记录") + @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + private List kfItems; + // @ElementCollection // @Comment("连续平均值") // @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/UpdateCoalWashingDailyAnalysisDto.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/UpdateCoalWashingDailyAnalysisDto.java index b20ff682..9e6d5347 100644 --- a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/UpdateCoalWashingDailyAnalysisDto.java +++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/UpdateCoalWashingDailyAnalysisDto.java @@ -2,6 +2,7 @@ package cn.lihongjie.coal.coalWashingDailyAnalysis.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisItemVo; +import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisKFItemVo; import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisParamVo; import jakarta.persistence.CollectionTable; @@ -29,6 +30,11 @@ public class UpdateCoalWashingDailyAnalysisDto extends OrgCommonDto { @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) private List inputItems; + @ElementCollection + @Comment("用户手动录入的快浮记录") + @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + private List kfItems; + // @ElementCollection // @Comment("连续平均值") // @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java index f43b6193..4959a1f5 100644 --- a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java +++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java @@ -29,6 +29,11 @@ public class CoalWashingDailyAnalysisEntity extends OrgCommonEntity { @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) private List inputItems; + @ElementCollection + @Comment("用户手动录入的快浮记录") + @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + private List kfItems; + // @ElementCollection // @Comment("连续平均值") // @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisKFItemVo.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisKFItemVo.java new file mode 100644 index 00000000..2a7dbccc --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisKFItemVo.java @@ -0,0 +1,45 @@ +package cn.lihongjie.coal.coalWashingDailyAnalysis.entity; + +import jakarta.persistence.Embeddable; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalTime; +import java.util.*; + +@Data +@Embeddable +@NoArgsConstructor +@AllArgsConstructor +public class CoalWashingDailyAnalysisKFItemVo { + + private LocalTime time; + + private Double param1; + private Double param2; + private Double param3; + private Double param4; + private Double param5; + private Double param6; + private Double param7; + private Double param8; + private Double param9; + private Double param10; + private Double param11; + private Double param12; + private Double param13; + private Double param14; + private Double param15; + private Double param16; + private Double param17; + private Double param18; + private Double param19; + private Double param20; + + private String remark1; + private String remark2; + private String remark3; + private String remark4; +}