From 7d06cea49f39ab2bc9177833d0ab2a04bd53e3eb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 22 十一月 2023 13:42:27 +0800
Subject: [PATCH] #联机
---
src/main/java/com/zy/core/thread/LedThread.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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..569df3c 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -2,6 +2,10 @@
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;
@@ -23,6 +27,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;
@@ -96,7 +101,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 +116,12 @@
}
}
page.newLine("\n");
+
+ //鏇存柊鎸囦护鐘舵��
+ CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
+ CommandInfo commandInfo = command.getCommandInfo();
+ commandInfo.setCommandStatus(2);
+ commandInfoService.updateById(commandInfo);
}
// 璁剧疆瀛椾綋
@@ -160,7 +171,7 @@
// page.newLine("鑷姩鍖栫珛浣撲粨搴�");
// page.newLine("瑗挎牸杩堣偂浠芥湁闄愬叕鍙�");
// }
- page.newLine("");
+ page.newLine("鍔涙簮鏅鸿兘浠撳偍");
// 璁剧疆瀛椾綋
page.setFont(new Font("瀹嬩綋",Font.PLAIN,13));
@@ -190,10 +201,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;
}
--
Gitblit v1.9.1