From 0fde674eccc26dd17601dac6e748aae8ab8f12dd Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 08 十月 2024 18:01:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SteController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SteController.java b/src/main/java/com/zy/asrs/controller/SteController.java
index ff4d8a6..415685f 100644
--- a/src/main/java/com/zy/asrs/controller/SteController.java
+++ b/src/main/java/com/zy/asrs/controller/SteController.java
@@ -120,11 +120,13 @@
if (!Cools.isEmpty(steProtocol.getChargeStatus())) {
vo.setChargeStatus(steProtocol.getChargeStatus()==1?"鉁�":"脳");
}
- if(steProtocol.getAlarm() > 0){
+ if(Cools.isEmpty(steProtocol.getAlarm())){
+ vo.setAlarm1("鏈煡寮傚父");
+ } else if(!Cools.isEmpty(steProtocol.getAlarm()) && steProtocol.getAlarm() > 0){
BasSteErr steErr = basSteErrMapper.selectById(steProtocol.getAlarm());
vo.setAlarm1(steErr==null?"鏈煡寮傚父":steErr.getErrName());
}
- vo.setAlarm2(steProtocol.getAlarm0().toString());
+ vo.setAlarm2(Cools.isEmpty(steProtocol.getAlarm0())? "鏈煡":steProtocol.getAlarm0().toString());
}
return R.ok().add(list);
}
@@ -261,6 +263,7 @@
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steSlave.getId());
SteProtocol steProtocol = steThread.getSteProtocol();
if (steProtocol == null) { continue; }
+ if (steProtocol.loca==0) continue;
SteCommand steCommand = new SteCommand();
steCommand.setSteNo(param.getSteNo()); // 绌挎杞︾紪鍙�
if (steProtocol.getMode() == 0) {
--
Gitblit v1.9.1