From 1cbceb60327a48f7ba661d2ba4e015fd2bcb0f2e Mon Sep 17 00:00:00 2001 From: sige Date: Wed, 13 Mar 2024 17:34:23 +0800 Subject: [PATCH] update version to 0.0.98 --- pom.xml | 2 +- .../boditech/entity/MdbEmergencyTestTask.java | 61 --------------- .../com/dreamworks/boditech/entity/MdbTest.java | 43 ----------- .../boditech/model/MdbEmergencyTestTask.java | 86 ++++++++++++++++++++++ .../com/dreamworks/boditech/model/MdbTest.java | 48 ++++++++++++ 5 files changed, 135 insertions(+), 105 deletions(-) delete mode 100644 src/main/java/com/dreamworks/boditech/entity/MdbEmergencyTestTask.java delete mode 100644 src/main/java/com/dreamworks/boditech/entity/MdbTest.java create mode 100644 src/main/java/com/dreamworks/boditech/model/MdbEmergencyTestTask.java create mode 100644 src/main/java/com/dreamworks/boditech/model/MdbTest.java diff --git a/pom.xml b/pom.xml index a482f68..ac47258 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 4.0.0 com.dreamworks boditech - 0.0.97 + 0.0.98 boditech boditech diff --git a/src/main/java/com/dreamworks/boditech/entity/MdbEmergencyTestTask.java b/src/main/java/com/dreamworks/boditech/entity/MdbEmergencyTestTask.java deleted file mode 100644 index 4b7e209..0000000 --- a/src/main/java/com/dreamworks/boditech/entity/MdbEmergencyTestTask.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.dreamworks.boditech.entity; -import com.dreamworks.boditech.utils.MyCommon; -import com.fasterxml.jackson.annotation.JsonIgnore; - -import java.util.List; -public class MdbEmergencyTestTask { - // project detect type : auto - @JsonIgnore - public static final String PROJECT_DETECT_TYPE_AUTO = "AUTO"; - // status : executing - @JsonIgnore - public static final String STATUS_EXECUTING = "EXECUTING"; - // status : finished - @JsonIgnore - public static final String STATUS_FINISHED = "FINISHED"; - // status : canceled - @JsonIgnore - public static final String STATUS_CANCELED = "CANCELED"; - - // id - public Integer id; - // index of slot - public Integer index; - // enable - public Boolean enable; - // is slot locked - public Boolean isSlotLocked; - // status - public String status; - // project detect type - public String projectDetectType; - // project ids - public String projectIds; - // sample type detect type - public String sampleTypeDetectType; - // sample type - public String sampleType; - // sample uid - public String sampleUid; - // bar code - public String barCode; - // preprocess - public Boolean attenuation; - // created at - public Long createdAt; - // created by - public Integer createdBy; - // updated at - public Long updatedAt; - // updated by - public Integer updatedBy; - // exec started at - public Long execStartedAt; - // exec finished at - public Long execFinishedAt; - - // get project id list - public List getProjectIdList() { - return MyCommon.jsonToObject(this.projectIds, List.class); - } -} diff --git a/src/main/java/com/dreamworks/boditech/entity/MdbTest.java b/src/main/java/com/dreamworks/boditech/entity/MdbTest.java deleted file mode 100644 index 90fec07..0000000 --- a/src/main/java/com/dreamworks/boditech/entity/MdbTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.dreamworks.boditech.entity; -public class MdbTest { - // id - public Integer id; - // batch id - public Long batchId; - // serial code - public String serialCode; - // task type - public String taskType; - // task id - public Integer taskId; - // lot code - public String lotCode; - // bar code - public String barCode; - // patient code - public String sampleUid; - // project id - public Integer projectId; - // patient id - public String projectName; - // tube type - public String tubeType; - // tube index - public Integer tubeIndex; - // sample type - public String sampleType; - // incubate slot index - public Integer incubateSlotIndex; - // incubate started at - public Long incubateStartedAt = 0L; - // incubate time - public Long incubateTime = 0L; - // started at - public Long startedAt; - // started by - public Integer startedBy; - // status - public String status; - // result - public String result; -} diff --git a/src/main/java/com/dreamworks/boditech/model/MdbEmergencyTestTask.java b/src/main/java/com/dreamworks/boditech/model/MdbEmergencyTestTask.java new file mode 100644 index 0000000..e8ad59f --- /dev/null +++ b/src/main/java/com/dreamworks/boditech/model/MdbEmergencyTestTask.java @@ -0,0 +1,86 @@ +package com.dreamworks.boditech.model; +import com.dreamworks.boditech.utils.MyCommon; +import com.fasterxml.jackson.annotation.JsonIgnore; + +import java.util.List; +public class MdbEmergencyTestTask extends MyActiveRecord { + // project detect type : auto + @JsonIgnore + public static final String PROJECT_DETECT_TYPE_AUTO = "AUTO"; + // status : executing + @JsonIgnore + public static final String STATUS_EXECUTING = "EXECUTING"; + // status : finished + @JsonIgnore + public static final String STATUS_FINISHED = "FINISHED"; + // status : canceled + @JsonIgnore + public static final String STATUS_CANCELED = "CANCELED"; + + @MyActiveRecordField + public Long id; + + @MyActiveRecordField + public Integer index; + + @MyActiveRecordField + public Integer enable; + + @MyActiveRecordField + public Integer isSlotLocked; + + @MyActiveRecordField + public String status; + + @MyActiveRecordField + public String projectDetectType; + + @MyActiveRecordField + public String projectIds; + + @MyActiveRecordField + public String sampleTypeDetectType; + + @MyActiveRecordField + public String sampleType; + + @MyActiveRecordField + public String sampleUid; + + @MyActiveRecordField + public String barCode; + + @MyActiveRecordField + public Integer attenuation; + + @MyActiveRecordField + public Long createdAt; + + @MyActiveRecordField + public Integer createdBy; + + @MyActiveRecordField + public Long updatedAt; + + @MyActiveRecordField + public Integer updatedBy; + + @MyActiveRecordField + public Long execStartedAt; + + @MyActiveRecordField + public Long execFinishedAt; + + @MyActiveRecordField + public String testBatchId; + + // get table name + public static String getTableName() { + return "bdt_emergency_test_tasks"; + } + + // get project id list + public List getProjectIdList() { + return MyCommon.jsonToObject(this.projectIds, List.class); + } +} diff --git a/src/main/java/com/dreamworks/boditech/model/MdbTest.java b/src/main/java/com/dreamworks/boditech/model/MdbTest.java new file mode 100644 index 0000000..8004599 --- /dev/null +++ b/src/main/java/com/dreamworks/boditech/model/MdbTest.java @@ -0,0 +1,48 @@ +package com.dreamworks.boditech.model; +public class MdbTest extends MyActiveRecord { + // id + public Long id; + // batch id + public Long batchId; + // serial code + public String serialCode; + // task type + public String taskType; + // task id + public Long taskId; + // lot code + public String lotCode; + // bar code + public String barCode; + // patient code + public String sampleUid; + // project id + public Integer projectId; + // patient id + public String projectName; + // tube type + public String tubeType; + // tube index + public Integer tubeIndex; + // sample type + public String sampleType; + // incubate slot index + public Integer incubateSlotIndex; + // incubate started at + public Long incubateStartedAt = 0L; + // incubate time + public Long incubateTime = 0L; + // started at + public Long startedAt; + // started by + public Integer startedBy; + // status + public String status; + // result + public String result; + + // get table name + public static String getTableName() { + return "bdt_tests"; + } +}