From d34366b9d348f47a8083aa3dd2e3e0efa2377dcf Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期五, 25 四月 2025 20:57:18 +0800
Subject: [PATCH] 初步调试
---
src/main/java/com/zy/asrs/controller/SiteController.java | 109 ++++++++++++++++++++++++++----------------------------
1 files changed, 53 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 122b07c..3d8f95a 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -7,6 +7,7 @@
import com.zy.asrs.domain.vo.SiteTableVo;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -15,8 +16,7 @@
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.DevpThread;
-import com.zy.core.thread.SiemensDevpThread;
+import com.zy.core.thread.impl.FyDevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,51 +37,33 @@
private SlaveProperties slaveProperties;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private MainServiceImpl mainService;
@GetMapping("/io/mode/info/site")
- @ManagerAuth(memo = "鍏呯數妯″紡")
- public R ioMode(){
+ @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> map1 = new HashMap<>();
- map1.put("floor", 1);
- map1.put("modeVal", devpThread.charge0);
- map1.put("modeDesc", devpThread.charge0?"鍏呯數涓�":"鍏抽棴");
- res.add(map1);
+ FyDevpThread devpThread = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
Map<String, Object> map2 = new HashMap<>();
map2.put("floor", 2);
- map2.put("modeVal", devpThread.charge1);
- map2.put("modeDesc", devpThread.charge1?"鍏呯數涓�":"鍏抽棴");
+ //map2.put("modeVal", devpThread.ioModeOf2F.id);
+ //map2.put("modeDesc", devpThread.ioModeOf2F.desc);
res.add(map2);
- Map<String, Object> map3 = new HashMap<>();
- map3.put("floor", 3);
- map3.put("modeVal", devpThread.charge2);
- map3.put("modeDesc", devpThread.charge2?"鍏呯數涓�":"鍏抽棴");
- res.add(map3);
}
return R.ok().add(res);
}
- @PostMapping("/io/mode/action/site")
- @ManagerAuth(memo = "鍏呯數鎺у埗")
- public R ioModeAction(@RequestParam("floor") Integer floor, @RequestParam("charge") Boolean charge){
- for (DevpSlave devp : slaveProperties.getDevp()) {
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- boolean res = devpThread.charge(floor - 1, charge);
- return res?R.ok():R.error();
- }
- return R.ok();
- }
-
@PostMapping("/table/site")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
- public R siteTable(){
+ public R siteTable() {
List<SiteTableVo> list = new ArrayList<>();
// 鍐呭瓨鏁版嵁
Map<Integer, StaProtocol> station = new HashMap<>();
+ FyDevpThread xx = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ FyDevpThread devpThread = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
station.putAll(devpThread.getStation());
}
// 鎸佷箙鏁版嵁
@@ -91,28 +73,38 @@
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(mainService.isInEnable(xx, devp.getDevNo()) ? "Y" : "N"); // 鍙叆
+ vo.setOutEnable(mainService.isOutEnable(xx, devp.getDevNo()) ? "Y" : "N"); // 鍙嚭
+ vo.setPakMk(staProtocol.isPakMk() ? "Y" : "N"); // 鍏ュ簱鏍囪
+ vo.setEmptyMk(staProtocol.isEmptyMk() ? "Y" : "N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setFinishWorkNo(staProtocol.getFinishWorkNo());
+// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
+ //vo.setLocType1(staProtocol.getWeight() == 1 ? "閲�" : "杞�");
+ vo.setFinishWorkNo(staProtocol.getFinishWorkNo());
+// if (staProtocol.getSiteId() == 1031 || staProtocol.getSiteId() == 1032) {
+// vo.setOutInModel((staProtocol.getOutInModel() != null && staProtocol.getOutInModel() == 1) ? "鍑�" : "鍏�");
+//
+// }
}
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());
+ FyDevpThread devpThread = (FyDevpThread) 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();
@@ -127,11 +119,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;
}
@@ -141,11 +133,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++;
}
@@ -157,23 +149,24 @@
/****************************************************************/
@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());
+ FyDevpThread devpThread = (FyDevpThread) 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();
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);
}
}
@@ -186,14 +179,18 @@
public R siteDetlUpdate(@RequestParam Integer siteId,
@RequestParam Short workNo,
@RequestParam Short staNo,
- @RequestParam String pakMk){
+ @RequestParam String pakMk) {
for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ FyDevpThread devpThread = (FyDevpThread) 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();
- staProtocol = staProtocol.clone();
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
if (workNo != null) {
staProtocol.setWorkNo(workNo);
}
--
Gitblit v1.9.1