diff --git a/src/main/java/a8k/appbean/Appecode.java b/src/main/java/a8k/appbean/AppErrorCode.java similarity index 89% rename from src/main/java/a8k/appbean/Appecode.java rename to src/main/java/a8k/appbean/AppErrorCode.java index 935cc6b..cd88b8d 100644 --- a/src/main/java/a8k/appbean/Appecode.java +++ b/src/main/java/a8k/appbean/AppErrorCode.java @@ -1,6 +1,6 @@ package a8k.appbean; -public enum Appecode { +public enum AppErrorCode { Success("Success", "成功", 0), // TubeNotHasHat("TubeNotHasHat", "全血试管未盖帽", 1), // SampleLiquidLevelWasNotDetected("SampleLiquidLevelWasNotDetected", "取样时未探测到液面", 2),// @@ -15,7 +15,7 @@ public enum Appecode { public int mid; - private Appecode(String name, String chname, int errorIndex) { + private AppErrorCode(String name, String chname, int errorIndex) { this.name = name; this.chName = chname; this.errorIndex = errorIndex; diff --git a/src/main/java/a8k/controller/TmpTestController.java b/src/main/java/a8k/controller/TmpTestController.java index 9ab4a01..1879f56 100644 --- a/src/main/java/a8k/controller/TmpTestController.java +++ b/src/main/java/a8k/controller/TmpTestController.java @@ -2,7 +2,7 @@ package a8k.controller; import a8k.a8k_can_protocol.CmdId; import a8k.a8k_can_protocol.ModuleId; -import a8k.appbean.Appecode; +import a8k.appbean.AppErrorCode; import a8k.appbean.HardwareException; import a8k.base_hardware.A8kCanBusService; import a8k.service.A8kDebugTaskExecutorService; @@ -62,7 +62,7 @@ public class TmpTestController { } @PostMapping("/api/zhaohe_test/initialize_device") - public Appecode initialize_device() { + public AppErrorCode initialize_device() { return deviceInitializationCtrlService.initializeDevice(); } } diff --git a/src/main/java/a8k/service/ctrl_service/DeviceInitializationCtrlService.java b/src/main/java/a8k/service/ctrl_service/DeviceInitializationCtrlService.java index d123c00..a03f583 100644 --- a/src/main/java/a8k/service/ctrl_service/DeviceInitializationCtrlService.java +++ b/src/main/java/a8k/service/ctrl_service/DeviceInitializationCtrlService.java @@ -1,6 +1,6 @@ package a8k.service.ctrl_service; -import a8k.appbean.Appecode; +import a8k.appbean.AppErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -22,9 +22,9 @@ public class DeviceInitializationCtrlService { */ - public Appecode initializeDevice() { + public AppErrorCode initializeDevice() { logger.info("Initializing device ..."); - return Appecode.Success; + return AppErrorCode.Success; } diff --git a/src/main/java/a8k/service/data_service/UsrMgrService.java b/src/main/java/a8k/service/data_service/UsrMgrService.java index e4fefef..6d282f1 100644 --- a/src/main/java/a8k/service/data_service/UsrMgrService.java +++ b/src/main/java/a8k/service/data_service/UsrMgrService.java @@ -1,6 +1,6 @@ package a8k.service.data_service; -import a8k.appbean.Appecode; +import a8k.appbean.AppErrorCode; import a8k.service.appdb.dao.AppUsrDao; import a8k.service.appdb.entity.AppUsr; import a8k.service.state_service.A8kStateMgrService; @@ -32,13 +32,13 @@ public class UsrMgrService { } //TODO - public Appecode addUsr(AppUsr usr) { - return Appecode.Success; + public AppErrorCode addUsr(AppUsr usr) { + return AppErrorCode.Success; } //TODO - public Appecode updateUsr(String uname, String passwd) { - return Appecode.Success; + public AppErrorCode updateUsr(String uname, String passwd) { + return AppErrorCode.Success; } @@ -51,13 +51,13 @@ public class UsrMgrService { * * */ - public Appecode verifyAndLoginAppUsr(Integer loginType, String uname, String passwd) { + public AppErrorCode verifyAndLoginAppUsr(Integer loginType, String uname, String passwd) { /* *TODO * 实现描述: * 1. 校验成功,则调用A8kStateMgrService.loginAppUsr 或者 A8kStateMgrService.loginDebugPageUsr */ - return Appecode.UserDoesNotExist; + return AppErrorCode.UserDoesNotExist; } diff --git a/src/main/java/a8k/service/hardware/HbotControlService.java b/src/main/java/a8k/service/hardware/HbotControlService.java index d9d508e..c992ad8 100644 --- a/src/main/java/a8k/service/hardware/HbotControlService.java +++ b/src/main/java/a8k/service/hardware/HbotControlService.java @@ -1,6 +1,6 @@ package a8k.service.hardware; -import a8k.appbean.Appecode; +import a8k.appbean.AppErrorCode; /** * Hbot控制服务 @@ -26,8 +26,8 @@ public class HbotControlService { } //丢tip - public Appecode dropTip() { - return Appecode.Success; + public AppErrorCode dropTip() { + return AppErrorCode.Success; } //扫描板夹仓二维码 diff --git a/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java b/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java index fdc5744..d9cc057 100644 --- a/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java +++ b/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java @@ -221,7 +221,7 @@ public class SamplesPreProcessModuleCtrlService { 4. 无论是否抓取成功,只要不向外抛出异常,方法结束时,该模块涉及到组件均需要返回待机位置。 */ - return Appecode.Success; + return AppErrorCode.Success; } /**