Browse Source

update

tags/v0
zhaohe 1 year ago
parent
commit
e48949fada
  1. 4
      src/main/java/a8k/appbean/AppErrorCode.java
  2. 4
      src/main/java/a8k/controller/TmpTestController.java
  3. 6
      src/main/java/a8k/service/ctrl_service/DeviceInitializationCtrlService.java
  4. 14
      src/main/java/a8k/service/data_service/UsrMgrService.java
  5. 6
      src/main/java/a8k/service/hardware/HbotControlService.java
  6. 2
      src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java

4
src/main/java/a8k/appbean/Appecode.java → src/main/java/a8k/appbean/AppErrorCode.java

@ -1,6 +1,6 @@
package a8k.appbean; package a8k.appbean;
public enum Appecode {
public enum AppErrorCode {
Success("Success", "成功", 0), // Success("Success", "成功", 0), //
TubeNotHasHat("TubeNotHasHat", "全血试管未盖帽", 1), // TubeNotHasHat("TubeNotHasHat", "全血试管未盖帽", 1), //
SampleLiquidLevelWasNotDetected("SampleLiquidLevelWasNotDetected", "取样时未探测到液面", 2),// SampleLiquidLevelWasNotDetected("SampleLiquidLevelWasNotDetected", "取样时未探测到液面", 2),//
@ -15,7 +15,7 @@ public enum Appecode {
public int mid; public int mid;
private Appecode(String name, String chname, int errorIndex) {
private AppErrorCode(String name, String chname, int errorIndex) {
this.name = name; this.name = name;
this.chName = chname; this.chName = chname;
this.errorIndex = errorIndex; this.errorIndex = errorIndex;

4
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.CmdId;
import a8k.a8k_can_protocol.ModuleId; import a8k.a8k_can_protocol.ModuleId;
import a8k.appbean.Appecode;
import a8k.appbean.AppErrorCode;
import a8k.appbean.HardwareException; import a8k.appbean.HardwareException;
import a8k.base_hardware.A8kCanBusService; import a8k.base_hardware.A8kCanBusService;
import a8k.service.A8kDebugTaskExecutorService; import a8k.service.A8kDebugTaskExecutorService;
@ -62,7 +62,7 @@ public class TmpTestController {
} }
@PostMapping("/api/zhaohe_test/initialize_device") @PostMapping("/api/zhaohe_test/initialize_device")
public Appecode initialize_device() {
public AppErrorCode initialize_device() {
return deviceInitializationCtrlService.initializeDevice(); return deviceInitializationCtrlService.initializeDevice();
} }
} }

6
src/main/java/a8k/service/ctrl_service/DeviceInitializationCtrlService.java

@ -1,6 +1,6 @@
package a8k.service.ctrl_service; package a8k.service.ctrl_service;
import a8k.appbean.Appecode;
import a8k.appbean.AppErrorCode;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -22,9 +22,9 @@ public class DeviceInitializationCtrlService {
*/ */
public Appecode initializeDevice() {
public AppErrorCode initializeDevice() {
logger.info("Initializing device ..."); logger.info("Initializing device ...");
return Appecode.Success;
return AppErrorCode.Success;
} }

14
src/main/java/a8k/service/data_service/UsrMgrService.java

@ -1,6 +1,6 @@
package a8k.service.data_service; package a8k.service.data_service;
import a8k.appbean.Appecode;
import a8k.appbean.AppErrorCode;
import a8k.service.appdb.dao.AppUsrDao; import a8k.service.appdb.dao.AppUsrDao;
import a8k.service.appdb.entity.AppUsr; import a8k.service.appdb.entity.AppUsr;
import a8k.service.state_service.A8kStateMgrService; import a8k.service.state_service.A8kStateMgrService;
@ -32,13 +32,13 @@ public class UsrMgrService {
} }
//TODO //TODO
public Appecode addUsr(AppUsr usr) {
return Appecode.Success;
public AppErrorCode addUsr(AppUsr usr) {
return AppErrorCode.Success;
} }
//TODO //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 *TODO
* 实现描述: * 实现描述:
* 1. 校验成功,则调用A8kStateMgrService.loginAppUsr 或者 A8kStateMgrService.loginDebugPageUsr * 1. 校验成功,则调用A8kStateMgrService.loginAppUsr 或者 A8kStateMgrService.loginDebugPageUsr
*/ */
return Appecode.UserDoesNotExist;
return AppErrorCode.UserDoesNotExist;
} }

6
src/main/java/a8k/service/hardware/HbotControlService.java

@ -1,6 +1,6 @@
package a8k.service.hardware; package a8k.service.hardware;
import a8k.appbean.Appecode;
import a8k.appbean.AppErrorCode;
/** /**
* Hbot控制服务 * Hbot控制服务
@ -26,8 +26,8 @@ public class HbotControlService {
} }
//丢tip //丢tip
public Appecode dropTip() {
return Appecode.Success;
public AppErrorCode dropTip() {
return AppErrorCode.Success;
} }
//扫描板夹仓二维码 //扫描板夹仓二维码

2
src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java

@ -221,7 +221,7 @@ public class SamplesPreProcessModuleCtrlService {
4. 无论是否抓取成功只要不向外抛出异常方法结束时该模块涉及到组件均需要返回待机位置 4. 无论是否抓取成功只要不向外抛出异常方法结束时该模块涉及到组件均需要返回待机位置
*/ */
return Appecode.Success;
return AppErrorCode.Success;
} }
/** /**

Loading…
Cancel
Save