From 73bec8c1f394beb8e98461c562a569a19064bc86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Fri, 30 May 2025 10:51:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8C=87=E4=BB=A4=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iflytop/sgs/app/service/api/SystemConfigService.java | 2 +- .../iflytop/sgs/app/service/device/SelfTestService.java | 16 ++++++++-------- .../com/iflytop/sgs/common/enums/SystemConfigCode.java | 8 ++++---- src/main/resources/sql/init.sql | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/iflytop/sgs/app/service/api/SystemConfigService.java b/src/main/java/com/iflytop/sgs/app/service/api/SystemConfigService.java index b868f07..6b92b90 100644 --- a/src/main/java/com/iflytop/sgs/app/service/api/SystemConfigService.java +++ b/src/main/java/com/iflytop/sgs/app/service/api/SystemConfigService.java @@ -97,7 +97,7 @@ public class SystemConfigService extends ServiceImpl().eq(SystemConfig::getCode, systemConfigCode.name())); - systemConfig.setCode(value); + systemConfig.setValue(value); return this.updateById(systemConfig); } 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 d1ca50c..44e2c51 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.ignore_door_self_test); + Boolean doorIsIgnore = systemConfigService.getSystemConfigBooleanByCode(SystemConfigCode.doorOriginIsIgnore); selfTestState.setDoorOriginIsIgnore(doorIsIgnore); - Boolean dualRobotIsIgnore = systemConfigService.getSystemConfigBooleanByCode(SystemConfigCode.ignore_dual_robot_self_test); + Boolean dualRobotIsIgnore = systemConfigService.getSystemConfigBooleanByCode(SystemConfigCode.dualRobotOriginIsIgnore); selfTestState.setDualRobotOriginIsIgnore(dualRobotIsIgnore); - Boolean transferXIsIgnore = systemConfigService.getSystemConfigBooleanByCode(SystemConfigCode.ignore_transfer_x_self_test); + Boolean transferXIsIgnore = systemConfigService.getSystemConfigBooleanByCode(SystemConfigCode.transferXOriginIsIgnore); selfTestState.setTransferXOriginIsIgnore(transferXIsIgnore); - Boolean transferZIsIgnore = systemConfigService.getSystemConfigBooleanByCode(SystemConfigCode.ignore_transfer_z_self_test); + Boolean transferZIsIgnore = systemConfigService.getSystemConfigBooleanByCode(SystemConfigCode.transferZOriginIsIgnore); 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.ignore_door_self_test)) { + if(setIgnoreItemDTO.getIgnoreSelfTestType().equals(SystemConfigCode.doorOriginIsIgnore)) { selfTestState.setDoorOriginIsIgnore(setIgnoreItemDTO.getIgnore()); - } else if (setIgnoreItemDTO.getIgnoreSelfTestType().equals(SystemConfigCode.ignore_dual_robot_self_test)) { + } else if (setIgnoreItemDTO.getIgnoreSelfTestType().equals(SystemConfigCode.dualRobotOriginIsIgnore)) { selfTestState.setDualRobotOriginIsIgnore(setIgnoreItemDTO.getIgnore()); - }else if(setIgnoreItemDTO.getIgnoreSelfTestType().equals(SystemConfigCode.ignore_transfer_x_self_test)){ + }else if(setIgnoreItemDTO.getIgnoreSelfTestType().equals(SystemConfigCode.transferXOriginIsIgnore)){ selfTestState.setTransferXOriginIsIgnore(setIgnoreItemDTO.getIgnore()); - }else if(setIgnoreItemDTO.getIgnoreSelfTestType().equals(SystemConfigCode.ignore_transfer_z_self_test)){ + }else if(setIgnoreItemDTO.getIgnoreSelfTestType().equals(SystemConfigCode.transferZOriginIsIgnore)){ 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 bf06d5e..13e97cf 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("蠕动泵最大转速"), - ignore_door_self_test("忽略门自检"), - ignore_dual_robot_self_test("忽略加液升降自检"), - ignore_transfer_x_self_test("忽略转运机械臂X轴自检"), - ignore_transfer_z_self_test("忽略转运机械臂Z轴自检"), + doorOriginIsIgnore("忽略门自检"), + dualRobotOriginIsIgnore("忽略加液升降自检"), + transferXOriginIsIgnore("忽略转运机械臂X轴自检"), + transferZOriginIsIgnore("忽略转运机械臂Z轴自检"), ; diff --git a/src/main/resources/sql/init.sql b/src/main/resources/sql/init.sql index 018e308..566db82 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', '抽液时机蠕动泵的转数', 'number_reduce', '5'), ('8', '最大清洁次数', 'cycle_clean_max', '8'), ('9', '蠕动泵最大转速限制', 'liquid_max_speed', '150'), - ('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'); + ('10', '忽略门自检', 'doorOriginIsIgnore', 'false'), + ('11', '忽略加液升降自检', 'dualRobotOriginIsIgnore', 'false'), + ('12', '忽略转运机械臂X轴自检', 'transferXOriginIsIgnore', 'false'), + ('13', '忽略转运机械臂Z轴自检', 'transferZOriginIsIgnore', 'false'); -- 系统日志 表