From 8ba4ddfed043b20b0a15316141a9be10162ba664 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 12 十二月 2022 12:17:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs_tqs' into bfwcs_tqs
---
src/main/java/com/zy/asrs/controller/SteController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SteController.java b/src/main/java/com/zy/asrs/controller/SteController.java
index a0a9a87..409c972 100644
--- a/src/main/java/com/zy/asrs/controller/SteController.java
+++ b/src/main/java/com/zy/asrs/controller/SteController.java
@@ -14,7 +14,9 @@
import com.zy.asrs.domain.vo.SteStateTableVo;
import com.zy.asrs.domain.vo.SteDataVo;
import com.zy.asrs.entity.BasSte;
+import com.zy.asrs.entity.BasSteErr;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.BasSteErrMapper;
import com.zy.asrs.service.BasSteService;
import com.zy.asrs.service.WrkMastService;
import com.zy.core.cache.MessageQueue;
@@ -53,6 +55,8 @@
private BasSteService basSteService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private BasSteErrMapper basSteErrMapper;
@PostMapping("/table/ste/state")
@ManagerAuth(memo = "绌挎杞︿俊鎭〃")
@@ -103,6 +107,11 @@
if (!Cools.isEmpty(steProtocol.getChargeStatus())) {
vo.setChargeStatus(steProtocol.getChargeStatus()==1?"鉁�":"脳");
}
+ if(steProtocol.getAlarm() > 0){
+ BasSteErr steErr = basSteErrMapper.selectById(steProtocol.getAlarm());
+ vo.setAlarm1(steErr==null?"鏈煡寮傚父":steErr.getErrName());
+ }
+ vo.setAlarm2(steProtocol.getAlarm0().toString());
}
return R.ok().add(list);
}
--
Gitblit v1.9.1