From 0a37b816117828dfc216d00c17724900f4bb14e3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 17 四月 2026 14:29:23 +0800
Subject: [PATCH] 123
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java
index 6a4b32d..22137bd 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java
@@ -2,12 +2,9 @@
import com.zy.acs.conveyor.common.web.BaseController;
import com.zy.acs.conveyor.controller.requestParam.StaParam;
-import com.zy.acs.conveyor.controller.responseParam.StationResponseParam;
import com.zy.acs.conveyor.controller.vo.PlcErrorTableVo;
-import com.zy.acs.conveyor.core.DevpThread;
-import com.zy.acs.conveyor.core.cache.SlaveConnection;
-import com.zy.acs.conveyor.core.enums.SlaveType;
-import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
+import com.zy.acs.conveyor.core.model.StaProtocol;
+import com.zy.acs.conveyor.core.service.StationService;
import com.zy.acs.conveyor.entity.Job;
import com.zy.acs.conveyor.service.JobService;
import com.zy.acs.framework.common.R;
@@ -33,18 +30,20 @@
@Autowired
private JobService jobService;
+ @Autowired
+ private StationService stationService;
+
/**
* 绔欑偣鏌ヨ
*/
@ResponseBody
@PostMapping("/station/getTaskNo")
public R query(@RequestBody StaParam param) {
- log.info("鏍规嵁绔欑偣鏌ヨstaNo锛歿}", param);
- String staNo = param.getStaNo();
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, param.getDevpId());
- List<StationResponseParam> list = new ArrayList<>();
- Map<Integer, StaProtocol> station = devpThread.getStation();
- StaProtocol staProtocol = station.get(Integer.parseInt(staNo));
+ Map<Integer, StaProtocol> station = stationService.getStationMap(param.getDevpId());
+ StaProtocol staProtocol = station.get(param.getStationId());
+ if (staProtocol == null) {
+ return R.error("绔欑偣涓嶅瓨鍦�");
+ }
Integer workNo = staProtocol.getWorkNo();
if (workNo != null) {
Job jobByJobNo = jobService.getJobByJobNo(workNo);
@@ -62,20 +61,28 @@
@ResponseBody
@PostMapping("/station/getError")
public R getError(@RequestBody StaParam param) {
- log.info("鏍规嵁绔欑偣鏌ヨstaNo锛歿}", param);
- String staNo = param.getStaNo();
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, param.getDevpId());
- Map<Integer, StaProtocol> station = devpThread.getStation();
- StaProtocol staProtocol = station.get(Integer.parseInt(staNo));
- return R.ok(staPlcErr(staProtocol));
+ List<PlcErrorTableVo> list = new ArrayList<>();
+ if (param.getStationId() != null) {
+ Map<Integer, StaProtocol> station = stationService.getStationMap(param.getDevpId());
+ StaProtocol staProtocol = station.get(param.getStationId());
+ return R.ok(staPlcErr(list, staProtocol));
+ }
+ if (param.getStationIds() != null && !param.getStationIds().isEmpty()) {
+ Map<Integer, StaProtocol> station = stationService.getStationMap(param.getDevpId());
+ for (Integer stationId : param.getStationIds()) {
+ StaProtocol staProtocol = station.get(stationId);
+ list = staPlcErr(list, staProtocol);
+ return R.ok(list);
+ }
+ }
+ return R.ok();
}
- private List<PlcErrorTableVo> staPlcErr(StaProtocol staProtocol) {
+ private List<PlcErrorTableVo> staPlcErr(List<PlcErrorTableVo> list, StaProtocol staProtocol) {
if (staProtocol == null) {
return null;
}
- List<PlcErrorTableVo> list = new ArrayList<>();
if (staProtocol.getBreakerErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setStaNo(staProtocol.getSiteId());
--
Gitblit v1.9.1