From 9830ed887f809224be07de7badaaaa0e354aa573 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 14 四月 2026 11:23:50 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java
index b7cd673..45d9d36 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java
@@ -4,6 +4,7 @@
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.controller.vo.SiteTableVo;
import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
+import com.zy.acs.conveyor.core.model.SafeSignal;
import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.properties.OutputQueue;
@@ -16,10 +17,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 杈撻�佽澶囨帴鍙�
@@ -73,7 +71,7 @@
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
vo.setWeight(staProtocol.getWeight() == null ? 0D : staProtocol.getWeight());
vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() ? (staProtocol.isLow() ? "浣�" : "楂�") : "-"); //楂樹綆搴撲綅
-
+ vo.setAllow((staProtocol.getAllowPut() ? "鍙斁" : "涓嶅彲鏀�") + "/" + (staProtocol.getAllowTake() ? "鍙彇" : "涓嶅彲鍙�"));
}
return R.ok().add(list);
@@ -115,6 +113,7 @@
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
vo.setWeight(staProtocol.getWeight() == null ? 0D : staProtocol.getWeight());
vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() ? (staProtocol.isLow() ? "浣�" : "楂�") : "-"); //楂樹綆搴撲綅
+ vo.setAllow((staProtocol.getAllowPut() ? "鍙斁" : "涓嶅彲鏀�") + "/" + (staProtocol.getAllowTake() ? "鍙彇" : "涓嶅彲鍙�"));
return R.ok().add(vo);
}
}
@@ -126,8 +125,7 @@
@ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
public R siteDetlUpdate(@RequestParam Integer siteId,
@RequestParam Integer workNo,
- @RequestParam Integer staNo,
- @RequestParam String pakMk) {
+ @RequestParam Integer staNo) {
for (DevpSlave devp : slaveProperties.getDevp()) {
Map<Integer, StaProtocol> station = stationService.getStationMap(devp.getId());
for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
@@ -153,5 +151,47 @@
return R.error("plc宸叉帀绾�");
}
+ @PostMapping("/detl/safe")
+ @ManagerAuth(memo = "琛ュ厖瀹夊叏淇″彿")
+ public R safe(@RequestParam Integer siteId) {
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ Map<Integer, StaProtocol> station = stationService.getStationMap(devp.getId());
+ for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
+ if (siteId.equals(entry.getKey())) {
+ StaProtocol staProtocol = entry.getValue();
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ boolean flag = true;
+ List<DevpSlave.Sta> putSta = devp.getPutSta();
+ List<DevpSlave.Sta> takeSta = devp.getTakeSta();
+ Optional<DevpSlave.Sta> first = takeSta.stream().filter(sta -> sta.getStaNo().equals(siteId)).findFirst();
+ int i = -1;
+ if (first.isPresent()) {
+ i = takeSta.indexOf(first.get());
+ if (i != -1) {
+ flag = false;
+ }
+ }
+ if (i == -1) {
+ first = putSta.stream().filter(sta -> sta.getStaNo().equals(siteId)).findFirst();
+ if (first.isPresent()) {
+ i = putSta.indexOf(first.get());
+ flag = true;
+ }
+ }
+ if (i == -1) {
+ return R.error("姝ょ珯鐐规棤闇�瀹夊叏淇″彿");
+ }
+ staProtocol.setSafeSignal(new SafeSignal(i, (short) 0, flag));
+ redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocol);
+ return R.ok();
+ }
+ }
+ }
+ return R.error("plc宸叉帀绾�");
+ }
}
--
Gitblit v1.9.1