From 9fff52f6488da182e664f7018951e626af869eb4 Mon Sep 17 00:00:00 2001 From: sige Date: Wed, 17 Apr 2024 21:13:27 +0800 Subject: [PATCH] ~ --- app.db | Bin 335872 -> 348160 bytes .../com/iflytop/digester/DigestionTaskThread.java | 2 ++ .../deviceinstance/LiquidAdditionInstance.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app.db b/app.db index 7376d49114e72363c0619858a814bbc755ad773b..b3fb896a990ea1c70104544decfcfcc644c439f6 100644 GIT binary patch delta 6141 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 V+ve~Bdk3eI`Ob6LOkvhJ<{yuC*e?J8 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("未找到对应的液体类型");