From 09de90a273d413c06306a921adc4fd25f205e2da Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 21 八月 2025 11:10:37 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/TVController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index ffe3711..5a4bb40 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -1,5 +1,7 @@
package com.zy.asrs.controller;
+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.R;
@@ -7,6 +9,7 @@
import com.zy.asrs.domain.dto.LocChartPie;
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;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.BasShuttleErrService;
@@ -56,6 +59,7 @@
private SlaveProperties slaveProperties;
@Autowired
private BasShuttleErrService basShuttleErrService;
+
@Autowired
private RedisUtil redisUtil;
@@ -241,13 +245,13 @@
Object o2 = redisUtil.get("LED_" + dev_no2);
Object o3 = redisUtil.get("LED_" + dev_no3);
if (o1 != null) {
- //log.info("鐢佃鏈烘樉绀�1锛歿}", JSONObject.toJSONString(o1));
+ log.info("鐢佃鏈烘樉绀�1锛歿}", JSONObject.toJSONString(o1));
return R.ok().add(o1);
} else if (o2 != null) {
- //log.info("鐢佃鏈烘樉绀�2锛歿}", JSONObject.toJSONString(o2));
+ log.info("鐢佃鏈烘樉绀�2锛歿}", JSONObject.toJSONString(o2));
return R.ok().add(o2);
} else if (o3 != null) {
- //log.info("鐢佃鏈烘樉绀�3锛歿}", JSONObject.toJSONString(o3));
+ log.info("鐢佃鏈烘樉绀�3锛歿}", JSONObject.toJSONString(o3));
return R.ok().add(o3);
}
return R.ok();
@@ -305,8 +309,55 @@
/**
* 璁惧寮傚父閫氱煡
*/
+ @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", 1014, 1022, 1025));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1013, 1021, 1024));
+ break;
+ case 2:
+ wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012, 1022, 1025));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011, 1021, 1024));
+ break;
+ case 3:
+ wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012, 1014, 1025));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011, 1013, 1024));
+ break;
+ case 4:
+ wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012, 1014, 1022));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011, 1013, 1021));
+ 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);
+ }
+ if (!Cools.isEmpty(wrkMastList2)) {
+ String msg = "绔欑偣鍦ㄥ嚭搴�;";
+ Set<Integer> set = new HashSet<>();
+ for (WrkMast wrkMast : wrkMastList2) {
+ set.add(wrkMast.getSourceStaNo());
+ }
+ return R.ok().add(set.toString() + msg);
+ }
+ return R.ok();
+ }
+
+
+ /**
+ * 璁惧寮傚父閫氱煡
+ */
@GetMapping("/device/error")
- public R monitorDeviceError() {
+ public R monitorStaInfo() {
ArrayList<HashMap<String, Object>> list = new ArrayList<>();
for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
--
Gitblit v1.9.1