From aee6386344123c250b3ddfa3efa9a7e3ff8f6cbb Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期二, 16 九月 2025 09:43:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs
---
src/main/java/com/zy/asrs/controller/TVController.java | 85 +++++++++++++++++++++++++++++++++---------
1 files changed, 66 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index 540d1d5..65dd4ce 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -1,17 +1,14 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.domain.dto.AxisBean;
-import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.dto.LocChartPie;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.BasShuttle;
+import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.entity.BasShuttleErr;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.ReportQueryMapper;
@@ -19,19 +16,15 @@
import com.zy.asrs.service.BasShuttleErrService;
import com.zy.asrs.service.BasShuttleService;
import com.zy.asrs.service.WrkMastService;
-import com.zy.common.model.MatDto;
-import com.zy.common.model.SearchLocParam;
import com.zy.common.service.CommonService;
-import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.RedisUtil;
import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.ShuttleProtocolStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LedSlave;
import com.zy.core.model.ShuttleSlave;
-import com.zy.core.model.command.LedCommand;
import com.zy.core.model.protocol.ShuttleProtocol;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.LedThread;
import com.zy.core.thread.ShuttleThread;
import com.zy.core.thread.impl.NormalLedThread;
import lombok.extern.slf4j.Slf4j;
@@ -42,7 +35,6 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -69,6 +61,7 @@
private SlaveProperties slaveProperties;
@Autowired
private BasShuttleErrService basShuttleErrService;
+
@Autowired
private RedisUtil redisUtil;
@@ -233,7 +226,7 @@
public R monitorLed(@RequestParam("ledId") Integer ledId) {
int dev_no1 = 1011;
int dev_no2 = 1012;
- int dev_no3 = 1015;
+ int dev_no3 = 0;
if (ledId == 1) {
dev_no1 = 1011;
dev_no2 = 1012;
@@ -318,8 +311,56 @@
/**
* 璁惧寮傚父閫氱煡
*/
+ @GetMapping("/sta/mode")
+ public R monitorStaMode(@RequestParam("ledId") Integer ledId) {
+ List<WrkMast> wrkMastList1 = null;
+ List<WrkMast> wrkMastList2 = null;
+ switch (ledId) {
+ case 1:
+ wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011));
+ break;
+ case 2:
+ wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1014));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1013));
+ break;
+ case 3:
+ wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1022));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1021));
+ break;
+ case 4:
+ wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1025));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1024));
+ break;
+ default:
+ break;
+ }
+ if (!Cools.isEmpty(wrkMastList1)) {
+ String msg = "绔欑偣鍦ㄥ叆搴�;";
+ Set<Integer> set = new HashSet<>();
+ for (WrkMast wrkMast : wrkMastList1) {
+ set.add(wrkMast.getSourceStaNo());
+ }
+
+ return R.ok().add(set.toString() + msg + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
+ }
+ if (!Cools.isEmpty(wrkMastList2)) {
+ String msg = "绔欑偣鍦ㄥ嚭搴�;";
+ Set<Integer> set = new HashSet<>();
+ for (WrkMast wrkMast : wrkMastList2) {
+ set.add(wrkMast.getStaNo());
+ }
+ return R.ok().add(set.toString() + msg + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
+ }
+ return R.ok();
+ }
+
+
+ /**
+ * 璁惧寮傚父閫氱煡
+ */
@GetMapping("/device/error")
- public R monitorDeviceError() {
+ public R monitorStaInfo() {
ArrayList<HashMap<String, Object>> list = new ArrayList<>();
for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
@@ -333,18 +374,24 @@
continue;
}
HashMap<String, Object> map = new HashMap<>();
- if (Cools.isEmpty(shuttleProtocol.getErrorCode())) {
- continue;
- }
- int i = Integer.parseInt(shuttleProtocol.getErrorCode());
- if (i > 0) {
- BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(i);
+ if (!Cools.isEmpty(shuttleProtocol.getErrorCode()) && Integer.parseInt(shuttleProtocol.getErrorCode()) > 0 && !Cools.isEmpty(shuttleProtocol.getErrorCode())) {
+ BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(Integer.parseInt(shuttleProtocol.getErrorCode()));
String errName = basShuttleErr == null ? "鏈煡寮傚父" : basShuttleErr.getErrName();
//鏁呴殰涓�
map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙�
map.put("errorMsg", errName);//寮傚父淇℃伅
map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅
list.add(map);
+ } else if (shuttleProtocol.getMode() != 1) {
+ map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙�
+ map.put("errorMsg", shuttleProtocol.getMode$());//寮傚父淇℃伅
+ map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅
+ list.add(map);
+ } else if (shuttleProtocol.getProtocolStatusType() != ShuttleProtocolStatusType.IDLE) {
+ map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙�
+ map.put("errorMsg", shuttleProtocol.getProtocolStatus$());//寮傚父淇℃伅
+ map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅
+ list.add(map);
}
}
return R.ok().add(list);
--
Gitblit v1.9.1