diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/SampNucl.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/SampNucl.java new file mode 100644 index 00000000..afb06760 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/SampNucl.java @@ -0,0 +1,11 @@ +package org.jeecg.modules.base.dto; + +import lombok.Data; + +@Data +public class SampNucl { + + private String sampleId; + + private String nuclideName; +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/StationDetailType.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/StationDetailType.java new file mode 100644 index 00000000..f7115e98 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/StationDetailType.java @@ -0,0 +1,13 @@ +package org.jeecg.modules.base.enums; + +public enum StationDetailType { + SAUNA, + SAUNA2, + SPALAX, + SPALAX_PLC, + Car, + LAB, + CINDER, + RASA, + ARIX_2 +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCFlagParmData/ParamConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCFlagParmData/ParamConfig.java new file mode 100644 index 00000000..280889fe --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCFlagParmData/ParamConfig.java @@ -0,0 +1,23 @@ +package org.jeecg.modules.entity.vo.QCFlagParmData; + +import lombok.Data; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; + +@Data +@XmlAccessorType(XmlAccessType.FIELD) +public class ParamConfig { + @XmlElement(name = "collectionTime") + private RuleGroup collectionTime; + + @XmlElement(name = "acquisitionTime") + private RuleGroup acquisitionTime; + + @XmlElement(name = "xeVolume") + private RuleGroup xeVolume; + + @XmlElement(name = "airVolume") + private RuleGroup airVolume; +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCFlagParmData/QCFlagParam.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCFlagParmData/QCFlagParam.java new file mode 100644 index 00000000..326fe950 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCFlagParmData/QCFlagParam.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.entity.vo.QCFlagParmData; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "config") +@XmlAccessorType(XmlAccessType.FIELD) +public class QCFlagParam { + @XmlElement(name = "sauna") + public ParamConfig sauna; + + @XmlElement(name = "sauna2") + public ParamConfig sauna2; +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCFlagParmData/Rule.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCFlagParmData/Rule.java new file mode 100644 index 00000000..44d5ee9d --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCFlagParmData/Rule.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.entity.vo.QCFlagParmData; + +import lombok.Data; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; + +@Data +@XmlAccessorType(XmlAccessType.FIELD) +public class Rule { + @XmlAttribute(name = "min") + private double min; + + @XmlAttribute(name = "max") + private Double max; // 使用Double以便可以为null(表示没有上限) + + @XmlAttribute(name = "color") + private String color; +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCFlagParmData/RuleGroup.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCFlagParmData/RuleGroup.java new file mode 100644 index 00000000..6f5af5c0 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCFlagParmData/RuleGroup.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.entity.vo.QCFlagParmData; + +import lombok.Data; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import java.util.List; + +@Data +@XmlAccessorType(XmlAccessType.FIELD) +public class RuleGroup { + @XmlElement(name = "Rule") + List rules; +}