diff --git a/src/main/java/a8k/controler/engineer/utils/TabDisplay.java b/src/main/java/a8k/controler/engineer/utils/TabDisplay.java new file mode 100644 index 0000000..a98ce04 --- /dev/null +++ b/src/main/java/a8k/controler/engineer/utils/TabDisplay.java @@ -0,0 +1,23 @@ +package a8k.controler.engineer.utils; + +public class TabDisplay { + public static final boolean AppCtrlService = false; + public static final boolean AppConsumablesMgrService = false; + public static final boolean AppProjectItemMgrService = false; + public static final boolean AppUserMgrService = false; + public static final boolean AppSettingsMgr = false; + public static final boolean AppStateMgrService = false; + public static final boolean AppCfgMgrService = false; + public static final boolean AppFrontEndEventRouter = false; + public static final boolean PosParam = true; + public static final boolean TimeParam = true; + public static final boolean DeviceStatus = true; + public static final boolean HardwareCommonCtrl = true; + public static final boolean TubeRackMoveCtrl = true; + public static final boolean SamplesPreProcesCtrl = true; + public static final boolean ReactionPlatesTransmitCtrl = true; + public static final boolean HbotControlService = true; + public static final boolean PositionCalibration = true; + public static final boolean CodeDebugParam = true; + public static final boolean TestScript = true; +} diff --git a/src/main/java/a8k/service/appcfgs/AppCfgMgrService.java b/src/main/java/a8k/service/appcfgs/AppCfgMgrService.java index 8b48adf..d0c36c3 100644 --- a/src/main/java/a8k/service/appcfgs/AppCfgMgrService.java +++ b/src/main/java/a8k/service/appcfgs/AppCfgMgrService.java @@ -4,6 +4,7 @@ import a8k.appbase.appret.AppRet; import a8k.controler.engineer.utils.EngineerPageTab; import a8k.controler.engineer.utils.EnginnerPageAction; import a8k.controler.engineer.utils.EnginnerPageTabOrder; +import a8k.controler.engineer.utils.TabDisplay; import a8k.service.appcfgs.base.A8kDeviceCfg; import a8k.service.appcfgs.base.EmergencyCfg; import a8k.appbase.type.BloodType; @@ -13,7 +14,7 @@ import a8k.service.hardware.canbus.protocol.A8kEcode; import org.springframework.stereotype.Component; @Component -@EngineerPageTab(name = "应用-测试任务提交", order = EnginnerPageTabOrder.AppCfgMgrService) +@EngineerPageTab(name = "应用-测试任务提交", order = EnginnerPageTabOrder.AppCfgMgrService,display = TabDisplay.AppCfgMgrService) public class AppCfgMgrService { A8kDeviceCfg deviceCfg = new A8kDeviceCfg(); diff --git a/src/main/java/a8k/service/appconsumable/AppConsumablesMgrService.java b/src/main/java/a8k/service/appconsumable/AppConsumablesMgrService.java index faed26f..1cfac31 100644 --- a/src/main/java/a8k/service/appconsumable/AppConsumablesMgrService.java +++ b/src/main/java/a8k/service/appconsumable/AppConsumablesMgrService.java @@ -4,6 +4,7 @@ import a8k.appbase.appret.AppRet; import a8k.controler.engineer.utils.EngineerPageTab; import a8k.controler.engineer.utils.EnginnerPageAction; import a8k.controler.engineer.utils.EnginnerPageTabOrder; +import a8k.controler.engineer.utils.TabDisplay; import a8k.service.ProjectColorAllocer; import a8k.service.appconsumable.base.Consumables; import a8k.service.appconsumable.base.ReactantItem; @@ -14,7 +15,7 @@ import org.slf4j.Logger; import org.springframework.stereotype.Component; -@EngineerPageTab(name = "应用-耗材管理服务", order = EnginnerPageTabOrder.AppConsumablesMgrService) +@EngineerPageTab(name = "应用-耗材管理服务", order = EnginnerPageTabOrder.AppConsumablesMgrService,display = TabDisplay.AppConsumablesMgrService) @Component public class AppConsumablesMgrService { static Logger logger = org.slf4j.LoggerFactory.getLogger(AppConsumablesMgrService.class); diff --git a/src/main/java/a8k/service/appctrl/AppCtrlService.java b/src/main/java/a8k/service/appctrl/AppCtrlService.java index 01fc4fb..5f965f7 100644 --- a/src/main/java/a8k/service/appctrl/AppCtrlService.java +++ b/src/main/java/a8k/service/appctrl/AppCtrlService.java @@ -4,10 +4,11 @@ import a8k.appbase.appret.AppRet; import a8k.controler.engineer.utils.EngineerPageTab; import a8k.controler.engineer.utils.EnginnerPageAction; import a8k.controler.engineer.utils.EnginnerPageTabOrder; +import a8k.controler.engineer.utils.TabDisplay; import org.slf4j.Logger; import org.springframework.stereotype.Component; -@EngineerPageTab(name = "应用-设备控制", order = EnginnerPageTabOrder.AppCtrlService) +@EngineerPageTab(name = "应用-设备控制", order = EnginnerPageTabOrder.AppCtrlService,display = TabDisplay.AppCtrlService) @Component public class AppCtrlService { static final Logger logger = org.slf4j.LoggerFactory.getLogger(AppCtrlService.class); diff --git a/src/main/java/a8k/service/appfrontend/AppFrontEndEventRouter.java b/src/main/java/a8k/service/appfrontend/AppFrontEndEventRouter.java index 0eb2d19..b583bf1 100644 --- a/src/main/java/a8k/service/appfrontend/AppFrontEndEventRouter.java +++ b/src/main/java/a8k/service/appfrontend/AppFrontEndEventRouter.java @@ -1,6 +1,7 @@ package a8k.service.appfrontend; import a8k.controler.engineer.utils.EnginnerPageTabOrder; +import a8k.controler.engineer.utils.TabDisplay; import a8k.service.appeventbus.AppEventListener; import a8k.appbase.appret.AppRet; import a8k.controler.engineer.utils.EngineerPageTab; @@ -16,7 +17,7 @@ import org.springframework.stereotype.Component; import java.util.Queue; @Component -@EngineerPageTab(name = "应用-前端事件路由器", order = EnginnerPageTabOrder.AppFrontEndEventRouter) +@EngineerPageTab(name = "应用-前端事件路由器", order = EnginnerPageTabOrder.AppFrontEndEventRouter,display = TabDisplay.AppFrontEndEventRouter) public class AppFrontEndEventRouter implements AppEventListener { static Logger logger = org.slf4j.LoggerFactory.getLogger(AppFrontEndEventRouter.class); diff --git a/src/main/java/a8k/service/appsettings/AppSettingsMgr.java b/src/main/java/a8k/service/appsettings/AppSettingsMgr.java index 1a96119..0d70a68 100644 --- a/src/main/java/a8k/service/appsettings/AppSettingsMgr.java +++ b/src/main/java/a8k/service/appsettings/AppSettingsMgr.java @@ -4,6 +4,7 @@ import a8k.appbase.appret.AppRet; import a8k.controler.engineer.utils.EngineerPageTab; import a8k.controler.engineer.utils.EnginnerPageAction; import a8k.controler.engineer.utils.EnginnerPageTabOrder; +import a8k.controler.engineer.utils.TabDisplay; import a8k.db.AppSetting; import a8k.service.appsettings.base.AppSettingTab; import a8k.service.appsettings.base.AppOptionName; @@ -22,7 +23,7 @@ import java.util.Map; import java.util.Objects; @Component -@EngineerPageTab(name = "应用-系统设置", order = EnginnerPageTabOrder.AppSettingsMgr) +@EngineerPageTab(name = "应用-系统设置", order = EnginnerPageTabOrder.AppSettingsMgr, display = TabDisplay.AppSettingsMgr) public class AppSettingsMgr { Logger logger = org.slf4j.LoggerFactory.getLogger(AppSettingsMgr.class); diff --git a/src/main/java/a8k/service/appstate/AppStateMgrService.java b/src/main/java/a8k/service/appstate/AppStateMgrService.java index 8ffba9c..7364a98 100644 --- a/src/main/java/a8k/service/appstate/AppStateMgrService.java +++ b/src/main/java/a8k/service/appstate/AppStateMgrService.java @@ -3,6 +3,7 @@ package a8k.service.appstate; import a8k.controler.engineer.utils.EngineerPageTab; import a8k.controler.engineer.utils.EnginnerPageAction; import a8k.controler.engineer.utils.EnginnerPageTabOrder; +import a8k.controler.engineer.utils.TabDisplay; import a8k.db.ProjectInfo; import a8k.service.appconsumable.base.Consumables; import a8k.service.appbase.A8kDeviceState; @@ -12,7 +13,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @Component -@EngineerPageTab(name = "应用-系统状态", order = EnginnerPageTabOrder.AppStateMgrService) +@EngineerPageTab(name = "应用-系统状态", order = EnginnerPageTabOrder.AppStateMgrService, display = TabDisplay.AppStateMgrService) public class AppStateMgrService { public static final Logger logger = LoggerFactory.getLogger(AppStateMgrService.class); diff --git a/src/main/java/a8k/service/devicectrl/param/PosParam.java b/src/main/java/a8k/service/devicectrl/param/PosParam.java index 5b4888b..a789fa5 100644 --- a/src/main/java/a8k/service/devicectrl/param/PosParam.java +++ b/src/main/java/a8k/service/devicectrl/param/PosParam.java @@ -10,23 +10,66 @@ import org.springframework.stereotype.Component; public class PosParam { EnginnerParamReader hpReader = new EnginnerParamReader(PosParam.class); + class ORDER { + static final int getGripperOpenPos = 1; + static final int getGripperClosePos = 2; + static final int getGripperTakeCapPos = 3; + static final int getGripperTakeTubeYPos = 4; + static final int getGripperShakeYPos = 5; + static final int getGripperZeroYPos = 6; + static final int getGripperTakeHTubeZPos = 7; + static final int getGripperTakeSTubeZPos = 8; + static final int getGripperJudgeHTubeCapZPos = 9; + static final int getGripperJudgeSTubeCapZPos = 10; + static final int getGripperShakeTubeZPos = 11; + static final int getGripperTakeCapZPos = 12; + static final int getShakeClampingPos = 13; + static final int getShakeModShakeMStandbyPos = 14; + static final int getTREnterXPos = 15; + static final int getTRExitXPos = 16; + static final int getTRScanXPos = 17; + static final int getTScanXPos = 18; + static final int getTAltitJudgXPos = 19; + static final int getTExistJudgXPos = 20; + static final int getTPreProcessXPos = 21; + static final int getTubeSpacing = 22; + static final int getTubeScanServoTorque = 23; + static final int getTubeScanOvertime = 24; + static final int getPBCh0Pos = 25; + static final int getPBChSpacing = 26; + static final int getPusherEndPos = 27; + static final int getPusherScanStartPos = 28; + static final int getTurntablePushPos0 = 29; + static final int getTurntablePullPos0 = 30; + static final int getTurntableDropLiquidPos0 = 31; + static final int getTurntablePosSpacing = 32; + static final int getPullerTargetPos = 33; + static final int getPlateDropPos = 34; + static final int getOptScanScandbyPos = 35; + static final int getTOptPosOffset = 36; + static final int getFOptPosOffset = 37; + static final int getOptTLasterGain = 38; + static final int getOptFLasterGain = 39; + } + + // // SamplesPreProcessModuleCtrlService // @EnginnerPageParam(name = "抓手张开位置", group = "抓手") public Integer getGripperOpenPos() { - return hpReader.getInteger("GripperOpenPos", 300+150); + return hpReader.getInteger("GripperOpenPos", 300 + 150); } @EnginnerPageParam(name = "抓手闭合位置", group = "抓手") public Integer getGripperClosePos() { - return hpReader.getInteger("GripperClosePos", 300+10); + return hpReader.getInteger("GripperClosePos", 300 + 10); } @EnginnerPageParam(name = "抓手取试管位置", group = "抓手") public Integer getGripperTakeCapPos() { - return hpReader.getInteger("GripperTakeCapPos", 300+55); + return hpReader.getInteger("GripperTakeCapPos", 300 + 55); } @EnginnerPageParam(name = "取试管位置", group = "抓手Y轴位置") @@ -78,6 +121,7 @@ public class PosParam { return hpReader.getInteger("GripperTakeCapZPos", 835); } + @EnginnerPageParam(name = "试管夹紧位", group = "试管夹紧模块") public Integer getShakeClampingPos() { return hpReader.getInteger("ShakeClampingPos", 10); diff --git a/src/main/java/a8k/service/project_mgr/AppProjectItemMgrService.java b/src/main/java/a8k/service/project_mgr/AppProjectItemMgrService.java index ab77822..3572da9 100644 --- a/src/main/java/a8k/service/project_mgr/AppProjectItemMgrService.java +++ b/src/main/java/a8k/service/project_mgr/AppProjectItemMgrService.java @@ -1,14 +1,11 @@ package a8k.service.project_mgr; -import a8k.controler.engineer.utils.EnginnerPageStatu; -import a8k.controler.engineer.utils.EnginnerPageTabOrder; +import a8k.controler.engineer.utils.*; import a8k.service.appeventbus.AppEventListener; import a8k.appbase.HardwareException; import a8k.appbase.ProjectInfoSimple; import a8k.appbase.appret.AppRet; -import a8k.controler.engineer.utils.EngineerPageTab; -import a8k.controler.engineer.utils.EnginnerPageAction; import a8k.db.ProjectInfo; import a8k.service.appeventbus.AppEventBusService; import a8k.service.appeventbus.appevent.A8kCanBusOnConnectEvent; @@ -28,7 +25,7 @@ import java.util.List; import java.util.Map; @Component -@EngineerPageTab(name = "应用-项目管理", order = EnginnerPageTabOrder.AppProjectItemMgrService) +@EngineerPageTab(name = "应用-项目管理", order = EnginnerPageTabOrder.AppProjectItemMgrService, display = TabDisplay.AppProjectItemMgrService) public class AppProjectItemMgrService implements AppEventListener { static Logger logger = org.slf4j.LoggerFactory.getLogger(AppProjectItemMgrService.class); diff --git a/src/main/java/a8k/service/usermgr/AppUserMgrService.java b/src/main/java/a8k/service/usermgr/AppUserMgrService.java index eab344f..3f9948a 100644 --- a/src/main/java/a8k/service/usermgr/AppUserMgrService.java +++ b/src/main/java/a8k/service/usermgr/AppUserMgrService.java @@ -16,7 +16,7 @@ import java.util.Map; @Component -@EngineerPageTab(name = "应用-用户管理", order = EnginnerPageTabOrder.AppUserMgrService) +//@EngineerPageTab(name = "应用-用户管理", order = EnginnerPageTabOrder.AppUserMgrService) public class AppUserMgrService { static Logger logger = org.slf4j.LoggerFactory.getLogger(AppUserMgrService.class); diff --git a/zhaohe_app.db b/zhaohe_app.db index 9698f32..278ecde 100644 Binary files a/zhaohe_app.db and b/zhaohe_app.db differ