From 56b6f93fbf3e1d5b27676a1d6ad34dc5c626249a Mon Sep 17 00:00:00 2001
From: dubin <dubin@163.com>
Date: 星期二, 27 五月 2025 15:58:16 +0800
Subject: [PATCH] 电视机ip配置和wcs监控图
---
src/main/java/com/zy/core/thread/LedThread.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index cdc583a..a0995f5 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -2,11 +2,16 @@
import com.alibaba.fastjson.JSON;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.CommandInfo;
+import com.zy.asrs.service.CommandInfoService;
+import com.zy.asrs.service.DeviceErrorService;
import com.zy.common.entity.Parameter;
import com.zy.common.model.MatDto;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
+import com.zy.core.enums.CommandStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.Task;
import com.zy.core.model.command.LedCommand;
@@ -23,6 +28,7 @@
import onbon.bx05.utils.DisplayStyleFactory;
import java.awt.*;
+import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -42,6 +48,7 @@
private Set<Integer> workNos = new HashSet<>();
private boolean ledMk = false;
private boolean resetStatus = false; // 澶嶄綅鐘舵��
+ private StringBuffer errorMsg = new StringBuffer();
public LedThread(Slave slave) {
this.slave = slave;
@@ -72,6 +79,9 @@
case 2:
reset();
break;
+ case 5:
+ error((String) task.getData());
+ break;
default:
break;
}
@@ -96,7 +106,7 @@
TextBxPage page = new TextBxPage();
for (LedCommand command : list) {
page.newLine(command.getTitle() +"锛�"+command.getWorkNo()+")");
- page.newLine("婧愬簱浣嶏細"+command.getSourceLocNo());
+ page.newLine("搴撲綅锛�"+ (command.getIoType() < 100 ? command.getLocNo() : command.getSourceLocNo()));
page.newLine("鐩爣绔欙細"+command.getStaNo());
if (!command.isEmptyMk()) {
for (MatDto matDto : command.getMatDtos()) {
@@ -111,6 +121,12 @@
}
}
page.newLine("\n");
+
+ //鏇存柊鎸囦护鐘舵��
+ CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
+ CommandInfo commandInfo = command.getCommandInfo();
+ commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);
+ commandInfoService.updateById(commandInfo);
}
// 璁剧疆瀛椾綋
@@ -160,7 +176,7 @@
// page.newLine("鑷姩鍖栫珛浣撲粨搴�");
// page.newLine("瑗挎牸杩堣偂浠芥湁闄愬叕鍙�");
// }
- page.newLine("");
+ page.newLine("鍔涙簮鏅鸿兘浠撳偍");
// 璁剧疆瀛椾綋
page.setFont(new Font("瀹嬩綋",Font.PLAIN,13));
@@ -190,10 +206,13 @@
screen.turnOn();
} catch (Exception ignore) {
}
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
if (connRes) {
log.info("led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ deviceErrorService.deleteDeviceError("led", slave.getId());
} else {
log.error("led杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ deviceErrorService.addDeviceError("led", slave.getId(), "led杩炴帴澶辫触");
}
return connRes;
}
@@ -444,8 +463,10 @@
//
// 缁у紑涓庢帶鍒跺櫒涔嬮棿鐨勯摼鎺�
screen.disconnect();
-
-
+ }
+ private void error(String msg) {
+ errorMsg.delete(0, errorMsg.length());
+ errorMsg.append(msg);
}
}
--
Gitblit v1.9.1