From 61090cc2a521db18ccfccb2e02a548ceacd03447 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 27 三月 2023 16:59:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 3f9b38e..326ccc7 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -9,18 +9,17 @@
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
+import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LedSlave;
+import com.zy.core.model.Task;
import com.zy.core.model.command.LedCommand;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.LedThread;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -33,6 +32,8 @@
public class MonitorController {
private static final String[] WEEK = {"鏄熸湡鏃�","鏄熸湡涓�","鏄熸湡浜�","鏄熸湡涓�","鏄熸湡鍥�","鏄熸湡浜�","鏄熸湡鍏�"};
+
+ private String programMsg;
@Autowired
private ReportQueryMapper reportQueryMapper;
@@ -271,8 +272,42 @@
return R.ok().add(errorMsg);
}
+ /**
+ * 鑺傜洰
+ */
+ @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();
+ }
+ }
+ }
+ return R.ok().add(program);
+ }
+ /**
+ * 鏄剧ず鑺傜洰
+ */
+ @RequestMapping("/led/add/program")
+ public R addProgram(Integer ledId, String msg) {
+ MessageQueue.offer(SlaveType.Led, ledId, new Task(5, msg));
+ return R.ok();
+ }
+
+ /**
+ * 绉婚櫎鑺傜洰
+ */
+ @RequestMapping("/led/remove/program")
+ public R removeProgram(Integer ledId, String msg) {
+
+ return R.ok();
+ }
+
--
Gitblit v1.9.1