diff --git a/app.db b/app.db index 7376d49..b3fb896 100644 Binary files a/app.db and b/app.db differ diff --git a/src/main/java/com/iflytop/digester/DigestionTaskThread.java b/src/main/java/com/iflytop/digester/DigestionTaskThread.java index 8cbc01a..7eeecf9 100644 --- a/src/main/java/com/iflytop/digester/DigestionTaskThread.java +++ b/src/main/java/com/iflytop/digester/DigestionTaskThread.java @@ -2,6 +2,7 @@ package com.iflytop.digester; import com.iflytop.digester.deviceinstance.*; import com.iflytop.digester.model.MdbDigestionTask; import com.iflytop.digester.model.MdbDigestionSolution; +import com.iflytop.digester.model.MdbDigestionTaskLog; import com.iflytop.digester.underframework.dao.model.UfMdbNotification; import com.iflytop.digester.underframework.dao.record.UfActiveRecord; import org.slf4j.Logger; @@ -461,5 +462,6 @@ public class DigestionTaskThread extends Thread { this.taskModel.status = status; this.taskModel.message = message; this.taskModel.save(); + MdbDigestionTaskLog.log(this.taskModel.id, status, message); } } diff --git a/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java b/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java index 89da8ae..8ac0783 100644 --- a/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java +++ b/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java @@ -112,7 +112,7 @@ public class LiquidAdditionInstance { private List getPumpIndexForGroupOutAndIn( String type ) { for ( int i=0; i<8; i++ ) { if ( liquids.get(i).type.equals(type) ) { - return List.of(i, i+8); + return List.of(i*2, i*2+1); } } throw new RuntimeException("未找到对应的液体类型");