From c48d0150aa9f6b297671f28adb6b9dc95b529cfc Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 16:59:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/SteController.java | 21 +++++++++++++++++++--
1 files changed, 19 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 4986dd8..415685f 100644
--- a/src/main/java/com/zy/asrs/controller/SteController.java
+++ b/src/main/java/com/zy/asrs/controller/SteController.java
@@ -79,7 +79,20 @@
}
vo.setTaskNo(steProtocol.getTaskNo().intValue()); // 浠诲姟鍙�
vo.setStatusVal(steProtocol.getMode().intValue()); // 鍦ㄧ嚎鐘舵��
- vo.setStatusType(steProtocol.mode == 0 ? "绂荤嚎" : "鍦ㄧ嚎"); // 妯″紡鐘舵��
+ String modeName = "绂荤嚎";
+ switch (steProtocol.mode){
+ case -1:
+ modeName = "绂荤嚎";
+ break;
+ case 0:
+ modeName = "鑴辨満";
+ break;
+ case 1:
+ modeName = "鑱旀満";
+ break;
+ }
+ vo.setStatusType(modeName); // 妯″紡
+// vo.setStatusType(steProtocol.mode == 0 ? "绂荤嚎" : "鍦ㄧ嚎"); // 妯″紡鐘舵��
if (!Cools.isEmpty(steProtocol.getStatus())) {
vo.setStatus(steProtocol.getStatusType().desc); // 鐘舵��
}
@@ -107,10 +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(Cools.isEmpty(steProtocol.getAlarm0())? "鏈煡":steProtocol.getAlarm0().toString());
}
return R.ok().add(list);
}
@@ -247,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