From b22b5b594c4cc9321f1b0ab6814a6290f1bfa7b2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 六月 2025 15:52:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 70 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index de41c18..056c0e8 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;
@@ -40,7 +46,7 @@
TextCaptionBxArea area;
DisplayStyleFactory.DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyleFactory.DisplayStyle[0]);
private Set<Integer> workNos = new HashSet<>();
- private boolean ledMk = true;
+ private boolean ledMk = false;
private boolean resetStatus = false; // 澶嶄綅鐘舵��
public LedThread(Slave slave) {
@@ -96,14 +102,27 @@
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()) {
- page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
+ //鍘绘帀灏忔暟鐐�
+ String strQty = matDto.getCount().toString();
+ int idx = strQty.lastIndexOf(".");
+ if(idx >= 0){
+ strQty.substring(0,idx);
+ }
+ page.newLine(matDto.getMaknx() + "[鏁伴噺" + strQty +"]");
+// page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
}
}
page.newLine("\n");
+
+ //鏇存柊鎸囦护鐘舵��
+ CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
+ CommandInfo commandInfo = command.getCommandInfo();
+ commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);
+ commandInfoService.updateById(commandInfo);
}
// 璁剧疆瀛椾綋
@@ -126,9 +145,9 @@
}
private void reset() throws Bx5GException {
-// if (!connect()) {
-// return;
-// }
+ if (!connect()) {
+ return;
+ }
// if (resetStatus) {
// return;
// }
@@ -139,20 +158,21 @@
// 鍒涘缓涓�涓暟鎹〉
TextBxPage page = new TextBxPage();
- List<String> list = null;
- try {
- String ledDefaultMsg = Parameter.get().getLedDefaultMsg();
- list = JSON.parseArray(ledDefaultMsg, String.class);
- } catch (Exception ignore) {
- }
- if (!Cools.isEmpty(list)) {
- for (String str : list) {
- page.newLine(str);
- }
- } else {
- page.newLine("鑷姩鍖栫珛浣撲粨搴�");
- page.newLine("瑗挎牸閭佽偂浠芥湁闄愬叕鍙�");
- }
+// List<String> list = null;
+// try {
+// String ledDefaultMsg = Parameter.get().getLedDefaultMsg();
+// list = JSON.parseArray(ledDefaultMsg, String.class);
+// } catch (Exception ignore) {
+// }
+// if (!Cools.isEmpty(list)) {
+// for (String str : list) {
+// page.newLine(str);
+// }
+// } else {
+// page.newLine("鑷姩鍖栫珛浣撲粨搴�");
+// page.newLine("瑗挎牸杩堣偂浠芥湁闄愬叕鍙�");
+// }
+ page.newLine("鍔涙簮鏅鸿兘浠撳偍");
// 璁剧疆瀛椾綋
page.setFont(new Font("瀹嬩綋",Font.PLAIN,13));
@@ -182,10 +202,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;
}
@@ -198,6 +221,13 @@
public static void main(String[] args) throws Exception {
+ String strQty = "1234";
+ int index = strQty.lastIndexOf(".");
+ if(index>=0) {
+ strQty=strQty.substring(0, index);
+ }
+ System.out.println("2==>>"+strQty);
+
Bx5GEnv.initial(3000);
Bx5GScreenClient screen = new Bx5GScreenClient("my");
DisplayStyleFactory.DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyleFactory.DisplayStyle[0]);
--
Gitblit v1.9.1