diff --git a/app.db b/app.db index 96b3180..d5f5aed 100644 Binary files a/app.db and b/app.db differ diff --git a/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java b/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java index a96b667..33a6674 100644 --- a/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java +++ b/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java @@ -168,13 +168,13 @@ public class DigestionTaskTheadManager { var task = new MdbDigestionTask(); task.digestionId = digestion.id; - task.outTaskId = "DEMO-01"; - task.batchNo = "DEMO-01"; task.tubes = UfJsonHelper.objectToJson(tubes); task.status = "pending"; task.message = "等待中"; task.startedAt = (int)(System.currentTimeMillis() / 1000); - task.startedBy = ""; + task.outTaskId = task.startedAt.toString(); + task.batchNo = task.startedAt.toString(); + task.startedBy = "demo"; task.mode = "auto"; task.save(); diff --git a/src/main/java/com/iflytop/digester/DigestionTaskThread.java b/src/main/java/com/iflytop/digester/DigestionTaskThread.java index a38f2e1..e635221 100644 --- a/src/main/java/com/iflytop/digester/DigestionTaskThread.java +++ b/src/main/java/com/iflytop/digester/DigestionTaskThread.java @@ -148,7 +148,7 @@ public class DigestionTaskThread extends Thread { this.taskModel.heatingSlotIndex = this.heatingSlot.index; this.taskModel.save(); - if ( "auto".equals(this.taskModel.mode) ) { + if ( "auto".equals(this.taskModel.mode) && !("demo".equals(this.taskModel.startedBy)) ) { this.lockLiquidPlate("消解准备"); // 打开门 device.door.open();