From 4f713c3b31c6ffa30b9b195330316fe04d43866d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 11 四月 2025 09:39:53 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/SiteController.java | 62 ++++++++++----------
src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java | 20 ++++++
src/main/webapp/views/pipeline.html | 4
src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java | 42 ++++++++++++++
src/main/java/com/zy/core/thread/impl/FyDevpThread.java | 3
5 files changed, 97 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 3699198..ee27010 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -1,6 +1,5 @@
package com.zy.asrs.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
@@ -8,7 +7,6 @@
import com.zy.asrs.domain.vo.SiteTableVo;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
-import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -17,7 +15,6 @@
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
-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.*;
@@ -42,14 +39,14 @@
@GetMapping("/io/mode/info/site")
@ManagerAuth(memo = "鍏ュ嚭搴撴ā寮�")
- public R ioMode(){
+ public R ioMode() {
List<Map<String, Object>> res = new ArrayList<>();
for (DevpSlave devp : slaveProperties.getDevp()) {
FyDevpThread devpThread = (FyDevpThread) 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);
+ //map2.put("modeVal", devpThread.ioModeOf2F.id);
+ //map2.put("modeDesc", devpThread.ioModeOf2F.desc);
res.add(map2);
}
return R.ok().add(res);
@@ -57,7 +54,7 @@
@PostMapping("/table/site")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
- public R siteTable(){
+ public R siteTable() {
List<SiteTableVo> list = new ArrayList<>();
// 鍐呭瓨鏁版嵁
Map<Integer, StaProtocol> station = new HashMap<>();
@@ -72,30 +69,33 @@
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 ? "楂�" : "浣�");
+ vo.setLocType1(staProtocol.getWeight() == 1 ? "閲�" : "杞�");
+ vo.setFinishWorkNo(staProtocol.getFinishWorkNo());
}
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();
@@ -110,11 +110,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;
}
@@ -124,11 +124,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++;
}
@@ -140,7 +140,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()) {
FyDevpThread devpThread = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
@@ -150,12 +150,12 @@
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);
@@ -170,7 +170,7 @@
public R siteDetlUpdate(@RequestParam Integer siteId,
@RequestParam Short workNo,
@RequestParam Short staNo,
- @RequestParam String pakMk){
+ @RequestParam String pakMk) {
for (DevpSlave devp : slaveProperties.getDevp()) {
FyDevpThread devpThread = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
Map<Integer, StaProtocol> station = devpThread.getStation();
diff --git a/src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java b/src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java
new file mode 100644
index 0000000..38fed7e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java
@@ -0,0 +1,20 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+@Data
+public class PlcErrorTableVo {
+
+ // 搴忓彿
+ private Integer no;
+
+ // plc寮傚父鎻忚堪
+ private String plcDesc;
+
+ // 寮傚父
+ private String error;
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
new file mode 100644
index 0000000..af36c3c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -0,0 +1,42 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+@Data
+public class SiteTableVo {
+
+ // 绔欏彿
+ private Integer devNo;
+
+ // 宸ヤ綔鍙�
+ private Short workNo = 0;
+
+ // 鑷姩
+ private String autoing = "-";
+
+ // 鏈夌墿
+ private String loading = "-";
+
+ // 鍙叆
+ private String inEnable = "-";
+
+ // 鍙嚭
+ private String outEnable = "-";
+
+ // 闇�姹�1
+ private String pakMk = "-";
+
+ // 绌烘澘淇″彿
+ private String emptyMk = "-";
+
+ // 鐩爣绔�
+ private Short staNo = 0;
+
+ //楂樹綆搴撲綅
+ private String locType1 = "-";
+
+ private Short finishWorkNo = 0;
+}
diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index 36cb2a9..2461f15 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -185,6 +185,8 @@
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
try {
+ BasDevpService basConveyorStaService = SpringUtils.getBean(BasDevpService.class);
+
List<BasDevp> stations = new ArrayList<>();
for (Integer sta : staNos2) {
StaProtocol staProtocol = station.get(sta);
@@ -192,7 +194,6 @@
stations.add(sqlModel);
}
if (!stations.isEmpty()) {
- BasDevpService basConveyorStaService = SpringUtils.getBean(BasDevpService.class);
if (null != basConveyorStaService && !basConveyorStaService.updateBatchById(stations)) {
throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
}
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 34bc757..abdeac7 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -100,7 +100,7 @@
<th>鍙叆</th>
<th>鍙嚭</th>
<th>鍑哄叆搴撴ā寮�</th>
- <th>绌烘澘淇″彿</th>
+ <th>瀹岀粨宸ヤ綔鍙�</th>
<th>鐩爣绔�</th>
<th>鎻愬崌鏈哄埌浣嶄俊鍙�</th>
<th>楂樹綆淇″彿</th>
@@ -287,7 +287,7 @@
setVal(tr.children("td").eq(4), table[i-1].inEnable);
setVal(tr.children("td").eq(5), table[i-1].outEnable);
setVal(tr.children("td").eq(6), table[i-1].outInModel);
- setVal(tr.children("td").eq(7), table[i-1].emptyMk);
+ setVal(tr.children("td").eq(7), table[i-1].finishWorkNo);
setVal(tr.children("td").eq(8), table[i-1].staNo);
setVal(tr.children("td").eq(9), table[i-1].liftArrival);
setVal(tr.children("td").eq(10), table[i-1].locType1);
--
Gitblit v1.9.1