From b0a96a43d99eb5baf708c4fa0d0482696d7b0823 Mon Sep 17 00:00:00 2001
From: Administrator <zc857179121@qq.com>
Date: 星期一, 13 四月 2026 19:55:26 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java
index 2f201f2..4727f24 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java
@@ -3,11 +3,9 @@
import com.zy.acs.conveyor.common.web.BaseController;
import com.zy.acs.conveyor.controller.requestParam.StationRequestParam;
import com.zy.acs.conveyor.controller.responseParam.StationResponseParam;
-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.properties.SlaveProperties;
+import com.zy.acs.conveyor.core.service.StationService;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import lombok.extern.slf4j.Slf4j;
@@ -32,6 +30,11 @@
@Autowired
private SlaveProperties slaveProperties;
+
+ @Autowired
+ private StationService stationService;
+
+
/**
* 绔欑偣鏌ヨ
*/
@@ -40,9 +43,8 @@
public R query(@RequestBody StationRequestParam param) {
log.info("绔欑偣鏌ヨ锛歿}", param);
List<String> staNos = param.getStaNos();
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, param.getDevpId());
+ Map<Integer, StaProtocol> station = stationService.getStationMap(param.getDevpId());
List<StationResponseParam> list = new ArrayList<>();
- Map<Integer, StaProtocol> station = devpThread.getStation();
if (Cools.isEmpty(staNos)) {
for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
staNos.add(entry.getKey() + "");
@@ -54,8 +56,8 @@
stationResponseParam = new StationResponseParam();
stationResponseParam.setStaNo(staNo);
stationResponseParam.setOccupied(staProtocol.isLoading());
- stationResponseParam.setInEnable((staProtocol.isInEnable() && staProtocol.getWorkNo() == 0 ? true : false));
- stationResponseParam.setOutEnable((staProtocol.isOutEnable() ? true : false));
+ stationResponseParam.setInEnable((staProtocol.getAllowPut()));
+ stationResponseParam.setOutEnable((staProtocol.getAllowTake()));
stationResponseParam.setOnline(staProtocol.isAutoing());
list.add(stationResponseParam);
}
--
Gitblit v1.9.1