From 84f42d7198729df0823483183e9f9918db92fc17 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 11 三月 2023 15:38:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 98 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 73 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 30500f8..910788e 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -1,5 +1,7 @@
package com.zy.asrs.controller;
+import HslCommunication.Core.Types.OperateResultExOne;
+import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
@@ -15,7 +17,8 @@
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.DevpThread;
+import com.zy.core.DevpThread;
+import com.zy.core.thread.SiemensDevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,9 +40,25 @@
@Autowired
private BasDevpService basDevpService;
+
+// @GetMapping("/io/mode/info/site")
+// @ManagerAuth(memo = "鍏ュ嚭搴撴ā寮�")
+// public R ioMode() {
+// List<Map<String, Object>> res = new ArrayList<>();
+// for (DevpSlave devp : slaveProperties.getDevp()) {
+// SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+// Map<String, Object> map2 = new HashMap<>();
+// map2.put("floor", 2);
+// map2.put("modeVal", devpThread.ioModeOf2F.id);
+// map2.put("modeDesc", devpThread.ioModeOf2F.desc);
+// res.add(map2);
+// }
+// return R.ok().add(res);
+// }
+
@PostMapping("/table/site")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
- public R siteTable(){
+ public R siteTable() {
List<SiteTableVo> list = new ArrayList<>();
// 鍐呭瓨鏁版嵁
Map<Integer, StaProtocol> station = new HashMap<>();
@@ -54,28 +73,32 @@
vo.setDevNo(devp.getDevNo()); // 绔欑偣缂栧彿
list.add(vo);
StaProtocol staProtocol = station.get(devp.getDevNo());
- if (null == staProtocol) { continue; }
+ if (null == staProtocol) {
+ continue;
+ }
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
- vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
- vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
- vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
- vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
+ vo.setAutoing(staProtocol.isAutoing() ? "Y" : "N"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading() ? "Y" : "N"); // 鏈夌墿
+ vo.setInEnable(staProtocol.isInEnable() ? "Y" : "N"); // 鍙叆
+ vo.setOutEnable(staProtocol.isOutEnable() ? "Y" : "N"); // 鍙嚭
+ vo.setPakMk(staProtocol.isPakMk() ? "Y" : "N"); // 鍏ュ簱鏍囪
+ vo.setEmptyMk(staProtocol.isEmptyMk() ? "Y" : "N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
+ vo.setLocType1(devp.getDevNo() == 102 ? "楂�" : "浣�");
}
return R.ok().add(list);
}
@PostMapping("/table/plc/errors")
@ManagerAuth(memo = "杈撻�佽澶噋lc寮傚父淇℃伅琛�")
- public R plcErrorTable(){
+ public R plcErrorTable() {
List<PlcErrorTableVo> list = new ArrayList<>();
for (DevpSlave devp : slaveProperties.getDevp()) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
Map<Integer, StaProtocol> station = devpThread.getStation();
- for(Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
+ for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
StaProtocol staProtocol = entry.getValue();
// if (staProtocol) {
// PlcErrorTableVo vo = new PlcErrorTableVo();
@@ -90,11 +113,11 @@
}
list.sort((o1, o2) -> {
- if (o1.getNo().compareTo(o2.getNo()) > 0){
+ if (o1.getNo().compareTo(o2.getNo()) > 0) {
return 1;
- }else if (o1.getNo().compareTo(o2.getNo()) < 0){
+ } else if (o1.getNo().compareTo(o2.getNo()) < 0) {
return 0;
- }else{
+ } else {
return -1;
}
@@ -104,11 +127,11 @@
@PostMapping("/output/site")
@ManagerAuth(memo = "绔欑偣璁惧鎶ユ枃鏃ュ織杈撳嚭")
- public R siteOutput(){
+ public R siteOutput() {
StringBuilder str = new StringBuilder();
String s;
int i = 0;
- while((s = OutputQueue.DEVP.poll()) != null && i <=10) {
+ while ((s = OutputQueue.DEVP.poll()) != null && i <= 10) {
str.append("\n").append(s);
i++;
}
@@ -120,7 +143,7 @@
/****************************************************************/
@GetMapping("/detl/{siteId}")
- public R siteDetl(@PathVariable("siteId") Integer siteId){
+ public R siteDetl(@PathVariable("siteId") Integer siteId) {
SiteTableVo vo = new SiteTableVo();
for (DevpSlave devp : slaveProperties.getDevp()) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
@@ -130,13 +153,14 @@
StaProtocol staProtocol = entry.getValue();
vo.setDevNo(entry.getKey()); // 绔欑偣缂栧彿
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
- vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
- vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
- vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 闇�姹�1
- vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
+ vo.setAutoing(staProtocol.isAutoing() ? "Y" : "N"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading() ? "Y" : "N"); // 鏈夌墿
+ vo.setInEnable(staProtocol.isInEnable() ? "Y" : "N"); // 鍙叆
+ vo.setOutEnable(staProtocol.isOutEnable() ? "Y" : "N"); // 鍙嚭
+ vo.setPakMk(staProtocol.isPakMk() ? "Y" : "N"); // 闇�姹�1
+ vo.setEmptyMk(staProtocol.isEmptyMk() ? "Y" : "N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
return R.ok().add(vo);
}
}
@@ -148,18 +172,27 @@
@ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
public R siteDetlUpdate(@RequestParam Integer siteId,
@RequestParam Short workNo,
- @RequestParam Short staNo){
+ @RequestParam Short staNo,
+ @RequestParam String pakMk) {
for (DevpSlave devp : slaveProperties.getDevp()) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
Map<Integer, StaProtocol> station = devpThread.getStation();
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();
+ }
if (workNo != null) {
staProtocol.setWorkNo(workNo);
}
if (staNo != null) {
staProtocol.setStaNo(staNo);
+ }
+ if (pakMk != null) {
+ staProtocol.setPakMk(pakMk.equals("Y"));
}
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (result) {
@@ -173,5 +206,20 @@
return R.error("plc宸叉帀绾�");
}
-
+ /**
+ * 姣嶆墭鐩樺嚭搴�
+ *
+ * @return
+ */
+ @PostMapping("/motherPallet")
+ public R motherPalletOut() {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = devpThread.getStation().get(12);
+ if (staProtocol.getAllowEmptyOut().equals("1")) {
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, null));
+ return R.ok("姣嶆墭鐩樺嚭搴撴垚鍔�");
+ } else {
+ return R.error("姣嶆墭鐩樺嚭搴撳け璐ワ紝12绔欐棤绌烘墭鐩樻垨13绔欐湁鐗�");
+ }
+ }
}
--
Gitblit v1.9.1