|
@ -41,10 +41,10 @@ public class FrontCmdController { |
|
|
String cmdId = form.getCmdId(); |
|
|
String cmdId = form.getCmdId(); |
|
|
String cmdCode = form.getCmdCode(); |
|
|
String cmdCode = form.getCmdCode(); |
|
|
try { |
|
|
try { |
|
|
if (!NO_SELF_TEST_CMDS.contains(cmdCode) && !deviceStatus.isSelfTestCompleted()) { |
|
|
|
|
|
log.error("未进行自检,无法执行业务指令"); |
|
|
|
|
|
return Result.failed("未进行自检,无法执行业务指令"); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// if (!NO_SELF_TEST_CMDS.contains(cmdCode) && !deviceStatus.isSelfTestCompleted()) { |
|
|
|
|
|
// log.error("未进行自检,无法执行业务指令"); |
|
|
|
|
|
// return Result.failed("未进行自检,无法执行业务指令"); |
|
|
|
|
|
// } |
|
|
if (deviceStatus.isStopPressed()) { |
|
|
if (deviceStatus.isStopPressed()) { |
|
|
log.error("设备急停中"); |
|
|
log.error("设备急停中"); |
|
|
return Result.failed("设备急停中"); |
|
|
return Result.failed("设备急停中"); |
|
|