From 7736cdb124ae302bc907c3a4882996802de14d99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Thu, 29 May 2025 18:21:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E8=87=AA=E6=A3=80=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iflytop/sgs/app/service/device/SelfTestService.java | 16 ++++++++-------- .../com/iflytop/sgs/common/enums/SystemConfigCode.java | 8 ++++---- src/main/resources/sql/init.sql | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/iflytop/sgs/app/service/device/SelfTestService.java b/src/main/java/com/iflytop/sgs/app/service/device/SelfTestService.java index 3026094..d1ca50c 100644 --- a/src/main/java/com/iflytop/sgs/app/service/device/SelfTestService.java +++ b/src/main/java/com/iflytop/sgs/app/service/device/SelfTestService.java @@ -26,13 +26,13 @@ public class SelfTestService { @PostConstruct private void init() { - Boolean doorIsIgnore = systemConfigService.getSystemConfigBooleanByCode(SystemConfigCode.door_origin); + Boolean doorIsIgnore = systemConfigService.getSystemConfigBooleanByCode(SystemConfigCode.ignore_door_self_test); selfTestState.setDoorOriginIsIgnore(doorIsIgnore); - Boolean dualRobotIsIgnore = systemConfigService.getSystemConfigBooleanByCode(SystemConfigCode.dual_robot_origin); + Boolean dualRobotIsIgnore = systemConfigService.getSystemConfigBooleanByCode(SystemConfigCode.ignore_dual_robot_self_test); selfTestState.setDualRobotOriginIsIgnore(dualRobotIsIgnore); - Boolean transferXIsIgnore = systemConfigService.getSystemConfigBooleanByCode(SystemConfigCode.transfer_x_origin); + Boolean transferXIsIgnore = systemConfigService.getSystemConfigBooleanByCode(SystemConfigCode.ignore_transfer_x_self_test); selfTestState.setTransferXOriginIsIgnore(transferXIsIgnore); - Boolean transferZIsIgnore = systemConfigService.getSystemConfigBooleanByCode(SystemConfigCode.transfer_z_origin); + Boolean transferZIsIgnore = systemConfigService.getSystemConfigBooleanByCode(SystemConfigCode.ignore_transfer_z_self_test); selfTestState.setTransferZOriginIsIgnore(transferZIsIgnore); } @@ -54,13 +54,13 @@ public class SelfTestService { */ public void setIgnoreItem(SetIgnoreItemDTO setIgnoreItemDTO) { systemConfigService.setSystemConfigByCode(setIgnoreItemDTO.getIgnoreSelfTestType(), setIgnoreItemDTO.getIgnore().toString()); - if(setIgnoreItemDTO.getIgnoreSelfTestType().equals(SystemConfigCode.door_origin)) { + if(setIgnoreItemDTO.getIgnoreSelfTestType().equals(SystemConfigCode.ignore_door_self_test)) { selfTestState.setDoorOriginIsIgnore(setIgnoreItemDTO.getIgnore()); - } else if (setIgnoreItemDTO.getIgnoreSelfTestType().equals(SystemConfigCode.dual_robot_origin)) { + } else if (setIgnoreItemDTO.getIgnoreSelfTestType().equals(SystemConfigCode.ignore_dual_robot_self_test)) { selfTestState.setDualRobotOriginIsIgnore(setIgnoreItemDTO.getIgnore()); - }else if(setIgnoreItemDTO.getIgnoreSelfTestType().equals(SystemConfigCode.transfer_x_origin)){ + }else if(setIgnoreItemDTO.getIgnoreSelfTestType().equals(SystemConfigCode.ignore_transfer_x_self_test)){ selfTestState.setTransferXOriginIsIgnore(setIgnoreItemDTO.getIgnore()); - }else if(setIgnoreItemDTO.getIgnoreSelfTestType().equals(SystemConfigCode.transfer_z_origin)){ + }else if(setIgnoreItemDTO.getIgnoreSelfTestType().equals(SystemConfigCode.ignore_transfer_z_self_test)){ selfTestState.setTransferZOriginIsIgnore(setIgnoreItemDTO.getIgnore()); } } diff --git a/src/main/java/com/iflytop/sgs/common/enums/SystemConfigCode.java b/src/main/java/com/iflytop/sgs/common/enums/SystemConfigCode.java index f06c884..bf06d5e 100644 --- a/src/main/java/com/iflytop/sgs/common/enums/SystemConfigCode.java +++ b/src/main/java/com/iflytop/sgs/common/enums/SystemConfigCode.java @@ -18,10 +18,10 @@ public enum SystemConfigCode { cycle_clean_max("清洁最大次数"), liquid_max_speed("蠕动泵最大转速"), - door_origin("忽略门自检"), - dual_robot_origin("忽略加液升降自检"), - transfer_x_origin("忽略转运机械臂X轴自检"), - transfer_z_origin("忽略转运机械臂Z轴自检"), + ignore_door_self_test("忽略门自检"), + ignore_dual_robot_self_test("忽略加液升降自检"), + ignore_transfer_x_self_test("忽略转运机械臂X轴自检"), + ignore_transfer_z_self_test("忽略转运机械臂Z轴自检"), ; diff --git a/src/main/resources/sql/init.sql b/src/main/resources/sql/init.sql index b0eb331..6580130 100644 --- a/src/main/resources/sql/init.sql +++ b/src/main/resources/sql/init.sql @@ -57,10 +57,10 @@ VALUES ('1', '稀硝酸容量与泵行程比率', 'scale_thin', '1'), ('7', '清洁时加水的量 ml', 'number_reduce', '5'), ('8', '抽液时机蠕动泵的转数', 'cycle_clean_max', '8'), ('9', '蠕动泵最大转速限制', 'liquid_max_speed', '150'), - ('10', '忽略门自检', 'door_origin', 'false'), - ('11', '忽略加液升降自检', 'dual_robot_origin', 'false'), - ('12', '忽略转运机械臂X轴自检', 'transfer_x_origin', 'false'), - ('13', '忽略转运机械臂Z轴自检', 'transfer_z_origin', 'false'); + ('10', '忽略门自检', 'ignore_door_self_test', 'false'), + ('11', '忽略加液升降自检', 'ignore_dual_robot_self_test', 'false'), + ('12', '忽略转运机械臂X轴自检', 'ignore_transfer_x_self_test', 'false'), + ('13', '忽略转运机械臂Z轴自检', 'ignore_transfer_z_self_test', 'false'); -- 系统日志 表