From 24b27647f24c5dde68fb3df5214b79795665ca3d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 20 四月 2023 13:47:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 326ccc7..510e9dc 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -23,6 +23,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2020/11/16
@@ -33,12 +34,13 @@
private static final String[] WEEK = {"鏄熸湡鏃�","鏄熸湡涓�","鏄熸湡浜�","鏄熸湡涓�","鏄熸湡鍥�","鏄熸湡浜�","鏄熸湡鍏�"};
- private String programMsg;
-
@Autowired
private ReportQueryMapper reportQueryMapper;
@Autowired
private SlaveProperties slaveProperties;
+
+ ArrayList<Object> programs = new ArrayList<>();
+ HashMap<Integer,String> lcd = new HashMap<>();
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -278,13 +280,9 @@
@GetMapping("/led/program")
public R monitorProgramShow(@RequestParam("ledId") Integer ledId) {
String program = "";
- for (LedSlave slave : slaveProperties.getLed()) {
- if (slave.getStaArr().contains(ledId)) {
- LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
- if (null != ledThread) {
- program = ledThread.getProgram().toString();
- }
- }
+ for (Object object : programs) {
+ program = lcd.get(ledId);
+
}
return R.ok().add(program);
}
@@ -295,7 +293,23 @@
*/
@RequestMapping("/led/add/program")
public R addProgram(Integer ledId, String msg) {
- MessageQueue.offer(SlaveType.Led, ledId, new Task(5, msg));
+ lcd.put(ledId,msg);
+ for (int i = 0; i < programs.size(); i++) {
+ Object o = programs.get(i);
+ System.out.println(o);
+ }
+ programs.add(lcd);
+ Iterator<Object> iterator = programs.iterator();
+ while (iterator.hasNext()) {
+ // 鑾峰彇寰幆鐨勫��
+ Object next = iterator.next();
+ // 濡傛灉瀛樺湪涓や釜鐩稿悓鐨勫��
+ if (programs.indexOf(next) != programs.lastIndexOf(next)) {
+ // 绉婚櫎鏈�鍚庨偅涓浉鍚岀殑鍊�
+ iterator.remove();
+ }
+ }
+ System.out.println(programs);
return R.ok();
}
--
Gitblit v1.9.1