diff --git a/app.db b/app.db index afe0a4d..bbfa731 100644 Binary files a/app.db and b/app.db differ diff --git a/src/main/java/com/iflytop/digester/DigesterApplicationRunner.java b/src/main/java/com/iflytop/digester/DigesterApplicationRunner.java index 632467b..48bd29a 100644 --- a/src/main/java/com/iflytop/digester/DigesterApplicationRunner.java +++ b/src/main/java/com/iflytop/digester/DigesterApplicationRunner.java @@ -37,6 +37,5 @@ public class DigesterApplicationRunner implements ApplicationRunner { UfApplication.getApp().connections.setup(); this.device.liquidAddition.setup(); - DigestionTaskTheadManager.getInstance().setup(); } } diff --git a/src/main/java/com/iflytop/digester/DigestionTaskThread.java b/src/main/java/com/iflytop/digester/DigestionTaskThread.java index 08aa9bb..574190d 100644 --- a/src/main/java/com/iflytop/digester/DigestionTaskThread.java +++ b/src/main/java/com/iflytop/digester/DigestionTaskThread.java @@ -4,6 +4,7 @@ import com.iflytop.digester.model.MdbDigestionTask; import com.iflytop.digester.model.MdbDigestionSolution; import com.iflytop.digester.model.MdbDigestionTaskLog; import com.iflytop.digester.underframework.UfCmdSnippetExecutor; +import com.iflytop.digester.underframework.dao.model.UfMdbDictItem; import com.iflytop.digester.underframework.dao.model.UfMdbNotification; import com.iflytop.digester.underframework.dao.model.UfMdbOption; import com.iflytop.digester.underframework.dao.model.UfMdbRuntimeVariable; @@ -167,7 +168,8 @@ public class DigestionTaskThread extends Thread { var tubes = this.heatingSlot.getExistTubeIndexes(); var liquidAddition = device.liquidAddition; for ( var liquid : digestionRound.liquids ) { - this.updateTaskStatus("Liquid", String.format("加液 %s %dml", liquid.type, liquid.volume)); + var liquidTypeName = UfMdbDictItem.getValueName("LIQUID", liquid.type); + this.updateTaskStatus("Liquid", String.format("加液 %s %dml", liquidTypeName, liquid.volume)); liquidAddition.addLiquidToTubes(tubes, liquid.type, liquid.volume); this.updateTaskStatus("Liquid", "加液完成"); } @@ -201,7 +203,8 @@ public class DigestionTaskThread extends Thread { var tubes = this.heatingSlot.getExistTubeIndexes(); var liquidAddition = device.liquidAddition; for ( var liquid : digestionRound.liquids ) { - this.updateTaskStatus("Liquid", String.format("加液 %s %d", liquid.type, liquid.volume)); + var liquidTypeName = UfMdbDictItem.getValueName("LIQUID", liquid.type); + this.updateTaskStatus("Liquid", String.format("加液 %s %d", liquidTypeName, liquid.volume)); liquidAddition.addLiquidToTubes(tubes, liquid.type, liquid.volume); this.updateTaskStatus("Liquid", "加液完成"); } @@ -326,7 +329,8 @@ public class DigestionTaskThread extends Thread { } // 预检查完成 - DigestionTaskThread.this.isPrecheckFinished = true; + this.unlockLiquidPlate(); + this.isPrecheckFinished = true; synchronized ( DigestionTaskThread.this.precheckLock ) { DigestionTaskThread.this.precheckLock.notifyAll(); } @@ -427,7 +431,8 @@ public class DigestionTaskThread extends Thread { var liquidAddition = device.liquidAddition; for ( var liquid : errorRound.liquids ) { - this.updateTaskStatus("ErrorRoundLiquidAdd", String.format("异常加液 %s %d", liquid.type, liquid.volume)); + var liquidTypeName = UfMdbDictItem.getValueName("LIQUID", liquid.type); + this.updateTaskStatus("ErrorRoundLiquidAdd", liquidTypeName); liquidAddition.addLiquidToTubes(this.errorTubeIndexes, liquid.type, liquid.volume); this.updateTaskStatus("ErrorRoundLiquidAdd", "异常加液完成"); } diff --git a/src/main/java/com/iflytop/digester/StartResetTaskThread.java b/src/main/java/com/iflytop/digester/StartResetTaskThread.java index eaa0392..7948e0d 100644 --- a/src/main/java/com/iflytop/digester/StartResetTaskThread.java +++ b/src/main/java/com/iflytop/digester/StartResetTaskThread.java @@ -50,6 +50,8 @@ public class StartResetTaskThread extends Thread { this.setProgressMessage("设备初始化 : 定时刷新加热盘温度"); device.heatingTurntable.temperatureMonitorStart(); + DigestionTaskTheadManager.getInstance().setup(); + UfCmdSnippetExecutor.execute("StatusLampRunning"); this.setProgressMessage("设备初始化 : 完成"); device.setStatus("ready"); diff --git a/src/main/java/com/iflytop/digester/underframework/dao/model/UfMdbDictItem.java b/src/main/java/com/iflytop/digester/underframework/dao/model/UfMdbDictItem.java index fb362f5..f7c7a97 100644 --- a/src/main/java/com/iflytop/digester/underframework/dao/model/UfMdbDictItem.java +++ b/src/main/java/com/iflytop/digester/underframework/dao/model/UfMdbDictItem.java @@ -30,4 +30,11 @@ public class UfMdbDictItem extends UfActiveRecord { public static List getItems(String groupKey) { return UfActiveRecord.find(UfMdbDictItem.class, Map.of("groupKey", groupKey)); } + + // get key name + public static String getValueName( String groupKey, String value ) { + var item = UfActiveRecord.findOne(UfMdbDictItem.class, Map.of("groupKey", groupKey, "itemValue", value)); + assert item != null; + return item.itemName; + } }