From f7371a4a3413ec37931b26a95b7b0290a46219f2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 10 四月 2026 15:18:56 +0800
Subject: [PATCH] Merge branch 'rcs_master' into jdxaj
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 69 insertions(+), 0 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
new file mode 100644
index 0000000..9f98232
--- /dev/null
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java
@@ -0,0 +1,69 @@
+package com.zy.acs.conveyor.controller;
+
+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.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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 瀵筩tu绯荤粺鐨勬帴鍙�
+ */
+@Slf4j
+@RestController
+public class CtuController extends BaseController {
+
+
+ @Autowired
+ private SlaveProperties slaveProperties;
+
+
+ @Autowired
+ private StationService stationService;
+
+
+ /**
+ * 绔欑偣鏌ヨ
+ */
+ @ResponseBody
+ @PostMapping("/station/query")
+ public R query(@RequestBody StationRequestParam param) {
+ log.info("绔欑偣鏌ヨ锛歿}", param);
+ List<String> staNos = param.getStaNos();
+ Map<Integer, StaProtocol> station = stationService.getStationMap(param.getDevpId());
+ List<StationResponseParam> list = new ArrayList<>();
+ if (Cools.isEmpty(staNos)) {
+ for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
+ staNos.add(entry.getKey() + "");
+ }
+ }
+ StationResponseParam stationResponseParam;
+ for (String staNo : staNos) {
+ StaProtocol staProtocol = station.get(Integer.parseInt(staNo));
+ 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.setOnline(staProtocol.isAutoing());
+ list.add(stationResponseParam);
+ }
+ log.info("绔欑偣鏌ヨ锛歿}", list);
+ return R.ok(list);
+ }
+
+
+}
--
Gitblit v1.9.1