From c6ac196d7207e64b8591f84932439214561fc446 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 29 八月 2025 15:56:52 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/TVController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index c0160b0..87211a4 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -1,13 +1,16 @@
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.DateUtils;
import com.core.common.R;
import com.zy.asrs.domain.dto.AxisBean;
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;
@@ -57,6 +60,7 @@
private SlaveProperties slaveProperties;
@Autowired
private BasShuttleErrService basShuttleErrService;
+
@Autowired
private RedisUtil redisUtil;
@@ -306,8 +310,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()) {
--
Gitblit v1.9.1