From 01a2d01abeadef5488a100ddf58a22dbcf7b95d6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 23 四月 2024 20:18:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 98 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 93 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 8977b4f..510e9dc 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -9,18 +9,21 @@
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.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2020/11/16
@@ -33,6 +36,11 @@
@Autowired
private ReportQueryMapper reportQueryMapper;
+ @Autowired
+ private SlaveProperties slaveProperties;
+
+ ArrayList<Object> programs = new ArrayList<>();
+ HashMap<Integer,String> lcd = new HashMap<>();
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -99,7 +107,7 @@
// 鑾峰彇杈撻�佺嚎plc绾跨▼
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
- String ledContent = ledThread.getWorkNos().toString();
+ String ledContent = Cools.isEmpty(ledThread) ? "" : ledThread.getWorkNos().toString();
// ledContent = "ask鐨勬ā鍧楄惃婊″ぇ绠椾簡钀ㄦ弧澶т簡\n 鏄獦澧冨埌鍩冨強鍡插鍡瞈n 钀ㄨ揪濮嗘墦寮�钀ㄦ弧澶у嚡鎾掗害褰撳姵钀ㄦ弧澶ц�佸笀";
return R.ok(
@@ -230,9 +238,89 @@
}
+ /**
+ * 鑾峰彇鍏朵粬淇℃伅
+ */
+ @GetMapping("/led")
+ public R monitorLed(@RequestParam("ledId") Integer ledId) {
+ String ledContent = "";
+ List<LedCommand> commandList = null;
+ for (LedSlave slave : slaveProperties.getLed()) {
+ if (slave.getStaArr().contains(ledId)) {
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
+ if (null != ledThread) {
+ ledContent = ledThread.getStringBuffer().toString();
+ commandList = ledThread.getCommandList();
+ }
+ }
+ }
+ return R.ok().add(commandList);
+ }
+
+ /**
+ * 寮傚父閫氱煡
+ */
+ @GetMapping("/led/error")
+ public R monitorLedError(@RequestParam("ledId") Integer ledId) {
+ String errorMsg = "";
+ for (LedSlave slave : slaveProperties.getLed()) {
+ if (slave.getStaArr().contains(ledId)) {
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
+ if (null != ledThread) {
+ errorMsg = ledThread.getErrorMsg().toString();
+ }
+ }
+ }
+ return R.ok().add(errorMsg);
+ }
+
+ /**
+ * 鑺傜洰
+ */
+ @GetMapping("/led/program")
+ public R monitorProgramShow(@RequestParam("ledId") Integer ledId) {
+ String program = "";
+ for (Object object : programs) {
+ program = lcd.get(ledId);
+
+ }
+ return R.ok().add(program);
+ }
+ /**
+ * 鏄剧ず鑺傜洰
+ */
+ @RequestMapping("/led/add/program")
+ public R addProgram(Integer ledId, String 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();
+ }
+ /**
+ * 绉婚櫎鑺傜洰
+ */
+ @RequestMapping("/led/remove/program")
+ public R removeProgram(Integer ledId, String msg) {
+
+ return R.ok();
+ }
--
Gitblit v1.9.1