lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 23:57:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

添加快浮记录

Browse Source
This commit is contained in:
lihongjie0209
2023-10-14 22:12:09 +08:00
parent 8d4f73e0d0
commit 007faf1f41
4 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/CreateCoalWashingDailyAnalysisDto.java
View File

@@ -2,6 +2,7 @@ package cn.lihongjie.coal.coalWashingDailyAnalysis.dto;
import cn.lihongjie.coal.base.dto.OrgCommonDto; import cn.lihongjie.coal.base.dto.OrgCommonDto;
import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisItemVo; import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisItemVo;
import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisKFItemVo;
import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisParamVo; import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisParamVo;
import jakarta.persistence.CollectionTable; import jakarta.persistence.CollectionTable;
@@ -29,6 +30,11 @@ public class CreateCoalWashingDailyAnalysisDto extends OrgCommonDto {
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
private List<CoalWashingDailyAnalysisItemVo> inputItems; private List<CoalWashingDailyAnalysisItemVo> inputItems;
@ElementCollection
@Comment("用户手动录入的快浮记录")
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
private List<CoalWashingDailyAnalysisKFItemVo> kfItems;
// @ElementCollection // @ElementCollection
// @Comment("连续平均值") // @Comment("连续平均值")
// @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) // @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))

6
src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/UpdateCoalWashingDailyAnalysisDto.java
View File

@@ -2,6 +2,7 @@ package cn.lihongjie.coal.coalWashingDailyAnalysis.dto;
import cn.lihongjie.coal.base.dto.OrgCommonDto; import cn.lihongjie.coal.base.dto.OrgCommonDto;
import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisItemVo; import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisItemVo;
import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisKFItemVo;
import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisParamVo; import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisParamVo;
import jakarta.persistence.CollectionTable; import jakarta.persistence.CollectionTable;
@@ -29,6 +30,11 @@ public class UpdateCoalWashingDailyAnalysisDto extends OrgCommonDto {
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
private List<CoalWashingDailyAnalysisItemVo> inputItems; private List<CoalWashingDailyAnalysisItemVo> inputItems;
@ElementCollection
@Comment("用户手动录入的快浮记录")
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
private List<CoalWashingDailyAnalysisKFItemVo> kfItems;
// @ElementCollection // @ElementCollection
// @Comment("连续平均值") // @Comment("连续平均值")
// @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) // @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))

5
src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java
View File

@@ -29,6 +29,11 @@ public class CoalWashingDailyAnalysisEntity extends OrgCommonEntity {
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
private List<CoalWashingDailyAnalysisItemVo> inputItems; private List<CoalWashingDailyAnalysisItemVo> inputItems;
@ElementCollection
@Comment("用户手动录入的快浮记录")
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
private List<CoalWashingDailyAnalysisKFItemVo> kfItems;
// @ElementCollection // @ElementCollection
// @Comment("连续平均值") // @Comment("连续平均值")
// @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) // @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))

45
src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisKFItemVo.java Normal file
View File

@@ -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;
}