From d3f3d4b309cfb285fcbbc48b91c4046111c7e9cd Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 02 七月 2025 13:45:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 158 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 6a5eb26..d382695 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -17,6 +17,7 @@
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.DeviceErrorService;
import com.zy.asrs.service.WrkMastService;
@@ -24,19 +25,25 @@
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.Slave;
+import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.RgvSlave;
+import com.zy.core.model.Task;
+import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.protocol.CrnProtocol;
+import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.ScaleThread;
import com.zy.core.thread.SiemensCrnThread;
+import com.zy.core.thread.SiemensRgvThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -67,6 +74,60 @@
private ReportQueryMapper reportQueryMapper;
@Autowired
private DeviceErrorService deviceErrorService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+
+ @PostMapping("/system/running/error")
+ @ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
+ public R systemRunningError(){
+ StringBuilder msg = new StringBuilder();
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ if (crnThread == null) {
+ continue;
+ }
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ continue;
+ }
+ if (crnProtocol.getStatus() == 99){
+ msg.append("<span style=\"color: red\">").append(crn.getId()).append("鍙峰爢鍨涙満鎶ヨ<span><br>");
+ }
+ }
+ for (RgvSlave rgv : slaveProperties.getRgv()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ SiemensRgvThread rgvThread = (SiemensRgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
+ if (rgvThread == null) {
+ continue;
+ }
+ RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+ if (rgvProtocol == null) {
+ continue;
+ }
+ if (rgvProtocol.getAlarm() > 0){
+ msg.append("<span style=\"color: red\">").append(rgv.getId()).append("鍙稲gv鎶ヨ<span><br>");
+ }
+ }
+ 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 (entry.getKey() == 302 || entry.getKey() == 303 || entry.getKey() == 304 || entry.getKey() == 305) {
+ if (!Cools.isEmpty(staPlcErr(entry))){
+ msg.append("<span style=\"color: red\">").append(staPlcErr(entry).get(0).getNo()).append("鍙锋彁鍗囨満鎶ヨ<span><br>");
+ }
+ }
+
+
+ }
+ }
+ if (!Cools.isEmpty(msg.toString())){
+ return R.error().add(msg.toString());
+ }
+ return R.ok();
+ }
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -115,6 +176,28 @@
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
vo.setNearbySta(staProtocol.getNearbySta()); //RGV浣嶇疆
+ vos.add(vo);
+ }
+ return R.ok().add(vos);
+ }
+
+
+ @PostMapping("/latest/data/hoist")
+ @ManagerAuth(memo = "鎻愬崌鏈哄疄鏃舵暟鎹�")
+ public R hoistLatestData(){
+ List<HoistDataVo> vos = new ArrayList<>();
+ Map<Integer, StaProtocol> stations = new HashMap<>();
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ if (null != devpThread) {
+ stations.putAll(devpThread.getStation());
+ }
+ }
+ for (Map.Entry<Integer, StaProtocol> entry : stations.entrySet()) {
+ HoistDataVo vo = new HoistDataVo();
+ StaProtocol staProtocol = entry.getValue();
+ vo.setHoistId(String.valueOf(entry.getKey()));
+ vo.setPlace(staProtocol.getPlace());
vos.add(vo);
}
return R.ok().add(vos);
@@ -310,6 +393,11 @@
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
if (crnSlave.getId().equals(crnNo)) {
+ BasCrnp basCrnp = basCrnpService.selectById(crnNo);
+ if (basCrnp == null) {
+ return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
+ }
+
SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
@@ -334,6 +422,8 @@
vo.setError(""); // todo
}
}
+ vo.setInEnable(basCrnp.getInEnable());//鍙叆
+ vo.setOutEnable(basCrnp.getOutEnable());//鍙嚭
return R.ok().add(vo);
}
}
@@ -445,4 +535,72 @@
return R.ok(map);
}
+ public List<PlcErrorTableVo> staPlcErr(Map.Entry<Integer, StaProtocol> entry){
+ List<PlcErrorTableVo> list = new ArrayList<>();
+ StaProtocol staProtocol = entry.getValue();
+ if (staProtocol.getBreakerErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+ vo.setPlcDesc("鏂矾鍣ㄦ晠闅�");
+ vo.setError("鏂矾鍣ㄦ晠闅�");
+ list.add(vo);
+ }
+ if (staProtocol.getInfraredErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+ vo.setPlcDesc("鍏夌數寮傚父");
+ vo.setError("鍏夌數寮傚父");
+ list.add(vo);
+ }
+ if (staProtocol.getOutTimeErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("杩愯瓒呮椂");
+ vo.setError("杩愯瓒呮椂");
+ list.add(vo);
+ }
+ if (staProtocol.getSeizeSeatErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("鍗犱綅瓒呮椂");
+ vo.setError("鍗犱綅瓒呮椂");
+ list.add(vo);
+ }
+ if (staProtocol.getWrkYgoodsN()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("鏈変换鍔℃棤璐ф晠闅�");
+ vo.setError("鏈変换鍔℃棤璐ф晠闅�");
+ list.add(vo);
+ }
+ if (staProtocol.getInverterErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("鍙橀鍣ㄦ晠闅�");
+ vo.setError("鍙橀鍣ㄦ晠闅�");
+ list.add(vo);
+ }
+ if (staProtocol.getContactErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
+ vo.setError("鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
+ list.add(vo);
+ }
+ if (staProtocol.getUpcontactErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
+ vo.setError("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
+ list.add(vo);
+ }
+ return list;
+ }
+
}
--
Gitblit v1.9.1