diff --git a/src/main/java/a8k/app/constant/OptConstant.java b/src/main/java/a8k/app/constant/OptConstant.java index 18138c0..824f25c 100644 --- a/src/main/java/a8k/app/constant/OptConstant.java +++ b/src/main/java/a8k/app/constant/OptConstant.java @@ -3,7 +3,8 @@ package a8k.app.constant; public class OptConstant { static public final Integer FOPT_LASTER_GAIN = 100; static public final Integer TOPT_LASTER_GAIN = 100; - static public final Integer OPT_RESULT_TOLERATE = 300; - static public final Integer OPT_T_TARGE_VAL = 3000; + static public final Integer OPT_F_RESULT_TOLERATE = 700; + static public final Integer OPT_T_RESULT_TOLERATE = 700; + static public final Integer OPT_T_TARGE_VAL = 2300; static public final Integer OPT_F_TARGE_VAL = 2000; } diff --git a/src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java index 109be56..bf960a4 100644 --- a/src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java @@ -169,16 +169,24 @@ public class OptScanModuleCtrlService { } Integer targetVal = 0; - if(optType == A8kOptType.TOPT) { + Integer tolerate = 0; + if (optType == A8kOptType.TOPT) { targetVal = OptConstant.OPT_T_TARGE_VAL; } else if (optType == A8kOptType.FOPT) { targetVal = OptConstant.OPT_F_TARGE_VAL; } + if (optType == A8kOptType.TOPT) { + tolerate = OptConstant.OPT_T_RESULT_TOLERATE; + } else if (optType == A8kOptType.FOPT) { + tolerate = OptConstant.OPT_F_RESULT_TOLERATE; + } + + //Adjustment - gainAdjuster.process(result, scanRealGain, targetVal, OptConstant.OPT_RESULT_TOLERATE); + gainAdjuster.process(result, scanRealGain, targetVal, tolerate); log.info("adjuct {}", i); - log.info(" target : {}->{}", targetVal, targetVal + OptConstant.OPT_RESULT_TOLERATE); + log.info(" target : {}->{}", targetVal, targetVal + tolerate); log.info(" suggestGain : {}", gainAdjuster.suggestGain); log.info(" scanAgain : {}", gainAdjuster.scanAgain); diff --git a/src/main/java/a8k/app/type/a8k/state/DeviceWorkState.java b/src/main/java/a8k/app/type/a8k/state/DeviceWorkState.java index c694452..d6b7ba7 100644 --- a/src/main/java/a8k/app/type/a8k/state/DeviceWorkState.java +++ b/src/main/java/a8k/app/type/a8k/state/DeviceWorkState.java @@ -2,6 +2,7 @@ package a8k.app.type.a8k.state; import a8k.app.service.mainctrl.mainflowctrl.base.AppActionErrorContext; import a8k.app.type.a8k.state.enumtype.A8kWorkState; +import a8k.app.type.a8k.state.enumtype.A8kWorkTaskType; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; @@ -14,6 +15,8 @@ public class DeviceWorkState implements Serializable { @Schema(description = "设备工作状态") public A8kWorkState workState = A8kWorkState.IDLE; // + @Schema(description = "设备运行任务类型") + public A8kWorkTaskType workTaskType = A8kWorkTaskType.None; //当前工作任务类型 @Schema(description = "设备错误标志") public Boolean fatalErrorFlag = false; //错误标志 @Schema(description = "错误列表") diff --git a/src/main/java/a8k/app/type/a8k/state/enumtype/A8kWorkTaskType.java b/src/main/java/a8k/app/type/a8k/state/enumtype/A8kWorkTaskType.java new file mode 100644 index 0000000..cc8b914 --- /dev/null +++ b/src/main/java/a8k/app/type/a8k/state/enumtype/A8kWorkTaskType.java @@ -0,0 +1,7 @@ +package a8k.app.type.a8k.state.enumtype; + +public enum A8kWorkTaskType { + None, + MainFlowTask, + EngineerTask, +}