From af1e6e2ccc7ecd165ac5f6ee619f0665a4919871 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 21 六月 2025 16:02:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 272 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 153 insertions(+), 119 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 9c57985..f3d001a 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -1,9 +1,17 @@
package com.zy.core.thread;
+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;
@@ -20,6 +28,9 @@
import onbon.bx05.utils.DisplayStyleFactory;
import java.awt.*;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -37,27 +48,17 @@
TextCaptionBxArea area;
DisplayStyleFactory.DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyleFactory.DisplayStyle[0]);
private Set<Integer> workNos = new HashSet<>();
- private boolean resetStatus = false; // 澶嶄綅鐘舵��
-
- // 鏄剧ず鍣�
- private StringBuffer stringBuffer = new StringBuffer();
+ private boolean ledMk = false;
+ private boolean resetStatus = false; // 澶嶄綅鐘舵��
+ private StringBuffer errorMsg = new StringBuffer();
public LedThread(Slave slave) {
this.slave = slave;
- try {
- Bx5GEnv.initial(3000);
- screen = new Bx5GScreenClient("my");
- screen.turnOn();
- } catch (Exception e) {
- e.printStackTrace();
- log.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- }
}
@Override
@SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
public void run() {
-// connect();
while (true) {
try {
Task task = MessageQueue.poll(SlaveType.Led, slave.getId());
@@ -70,33 +71,119 @@
// 澶嶄綅
case 2:
reset();
+// this.ledMk = false;
+ break;
+ case 5:
+ error((String) task.getData());
break;
default:
break;
}
}
- Thread.sleep(1000);
+ Thread.sleep(400);
} catch (Exception e) {
e.printStackTrace();
}
}
}
+ private void write(List<LedCommand> list) throws Bx5GException {
+ if (!connect()) {
+ return;
+ }
+ pf = new ProgramBxFile( 0, screen.getProfile());
+ pf.setFrameShow(false);
+ // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
+ area = new TextCaptionBxArea( 0,0,96,48, screen.getProfile());
+ // 鍒涘缓涓�涓暟鎹〉
+ TextBxPage page = new TextBxPage();
+ for (LedCommand command : list) {
+ page.newLine(command.getTitle() +"锛�"+command.getWorkNo()+")");
+ page.newLine("搴撲綅锛�"+ (command.getIoType() < 100 ? command.getLocNo() : command.getSourceLocNo()));
+ page.newLine("鐩爣绔欙細"+command.getStaNo());
+ if (!command.isEmptyMk()) {
+ for (MatDto matDto : command.getMatDtos()) {
+ //鍘绘帀灏忔暟鐐�
+ 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);
+ }
+
+ // 璁剧疆瀛椾綋
+ page.setFont(new Font("瀹嬩綋",Font.PLAIN,12));
+ // 璁剧疆鏂囨湰棰滆壊
+ page.setForeground(Color.red);
+ // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
+ page.setDisplayStyle(styles[6]);
+ area.clearPages();
+ area.addPage(page);
+ pf.addArea(area);
+ if (pf.validate() != null) {
+ log.info("pf out of range");
+ } else {
+ // 鏇存柊鑺傜洰
+ screen.writeProgram(pf);
+// resetStatus = false;
+ }
+ close();
+ }
+
+ private void reset() throws Bx5GException {
+ errorMsg.delete(0, errorMsg.length());
+ }
+
+
@Override
public boolean connect() {
boolean connRes = false;
+
+ // ======= 馃寪 娣诲姞缃戠粶鍙揪鎬ф娴� =======
try {
- connRes = screen.connect(slave.getIp(),slave.getPort());
- } catch (Exception ignore) {
+ InetAddress address = InetAddress.getByName(slave.getIp());
+ if (!address.isReachable(2000)) {
+ log.warn("璁惧涓嶅彲杈撅紝璺宠繃杩炴帴: {}", slave.getIp());
+ return false; // 鎻愬墠杩斿洖锛岄伩鍏嶆棤鎰忎箟杩炴帴灏濊瘯
+ }
+ } catch (IOException e) {
+ log.error("IP妫�娴嬪紓甯�: {}", e.getMessage());
+ return false; // 鍙鎯呭喌鍐冲畾鏄惁 return
}
+
+ // ======= 灏濊瘯杩炴帴璁惧 =======
+ try {
+ connRes = screen.connect(slave.getIp(), slave.getPort());
+ screen.turnOn(); // 濡傛灉 connect 鎴愬姛鍐嶅紑灞�
+ } catch (Exception e) {
+ log.error("杩炴帴寮傚父: {}", e.getMessage(), e); // 閬垮厤鎹曡幏鍚庢棤鎻愮ず
+ }
+
+ // ======= 璁惧閿欒鐘舵�佸鐞� =======
+ 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;
}
+
@Override
public void close() {
@@ -104,117 +191,61 @@
}
- private void write(List<LedCommand> list) throws Bx5GException {
-// pf = new ProgramBxFile( 0, screen.getProfile());
-// pf.setFrameShow(false);
-// // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
-// area = new TextCaptionBxArea( 0,0,192,128,screen.getProfile());
-// // 鍒涘缓涓�涓暟鎹〉
-// TextBxPage page = new TextBxPage();
-// for (LedCommand command : list) {
-// page.newLine(command.getTitle() +"锛�"+command.getWorkNo()+")");
-// page.newLine("婧愬簱浣嶏細"+command.getSourceLocNo());
-// page.newLine("鐩爣绔欙細"+command.getStaNo());
-// if (!command.isEmptyMk()) {
-// for (MatDto matDto : command.getMatDtos()) {
-// page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
-// }
-// }
-// page.newLine("\n");
-// }
-//
-// // 璁剧疆瀛椾綋
-// page.setFont(new Font("瀹嬩綋",Font.PLAIN,12));
-// // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
-// page.setDisplayStyle(styles[6]);
-// area.clearPages();
-// area.addPage(page);
-// pf.addArea(area);
-// // 鏇存柊鑺傜洰
-// screen.writeProgram(pf);
-// resetStatus = false;
-
- StringBuilder sb = new StringBuilder();
- for (LedCommand command : list) {
- sb.append(command.getTitle() +"锛�"+command.getWorkNo()+")").append("\n");
- sb.append("婧愬簱浣嶏細"+command.getSourceLocNo()).append("\n");
- sb.append("鐩爣绔欙細"+command.getStaNo()).append("\n");
- if (!command.isEmptyMk()) {
- for (MatDto matDto : command.getMatDtos()) {
- sb.append(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�").append("\n");
- }
- }
- sb.append("\n");
- }
- stringBuffer.delete(0, stringBuffer.length());
- stringBuffer.append(sb.toString());
- resetStatus = false;
- }
-
- private void reset() throws Bx5GException {
- if (!resetStatus) {
-// pf = new ProgramBxFile( 0, screen.getProfile());
-// pf.setFrameShow(false);
-// // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
-// area = new TextCaptionBxArea( 0,0,192,128,screen.getProfile());
-// // 鍒涘缓涓�涓暟鎹〉
-// TextBxPage page = new TextBxPage();
-// page.newLine("骞垮痉涓壃鐗╂祦瑁呭鏈夐檺鍏徃");
-// page.newLine("鑷姩鍖栫珛浣撲粨搴�");
-// page.newLine("娴欐睙涓壃鐗╂祦瑁呭鏈夐檺鍏徃");
-// // 璁剧疆瀛椾綋
-// page.setFont(new Font("瀹嬩綋",Font.PLAIN,12));
-// // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
-// page.setDisplayStyle(styles[6]);
-// area.clearPages();
-// area.addPage(page);
-// pf.addArea(area);
-// // 鏇存柊鑺傜洰
-// screen.writeProgram(pf);
-
- stringBuffer.delete(0, stringBuffer.length());
- resetStatus = true;
- }
- }
-
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]);
- if (!screen.connect("192.168.10.61",5005)) {
+ if (!screen.connect("192.168.10.101",5005)) {
System.err.println("杩炴帴澶辫触锛侊紒锛侊紒");
return;
}
screen.turnOn();
- ProgramBxFile pf = new ProgramBxFile( 0, screen.getProfile());
- pf.setFrameShow(false);
- // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eigth
- TextCaptionBxArea area = new TextCaptionBxArea( 0,0,192,128,screen.getProfile());
- // 鍒涘缓涓�涓暟鎹〉
- // 绗竴琛屾暟鎹�
- TextBxPage page = new TextBxPage("鍏ㄦ澘鍏ュ簱");
- page.newLine("鐩爣搴撲綅锛�0100204");
- // 绗簩琛屾暟鎹�
- page.newLine("鎺ユ敹鍣� RX18 XH 6V 銆愭暟閲忥細2銆�");
- page.newLine("涓帶 BM钃濈墮 鑻辨枃 6V 銆愭暟閲忥細1銆�");
- page.newLine("绾挎潫 S2588-1-XX 鏃犲疄鐗┿�愭暟閲忥細5銆�");
- page.newLine("鎺ユ敹鍣� RX18 XH 6V 銆愭暟閲忥細2銆�");
- page.newLine("涓帶 BM钃濈墮 鑻辨枃 6V 銆愭暟閲忥細1銆�");
- page.newLine("绾挎潫 S2588-1-XX 鏃犲疄鐗┿�愭暟閲忥細5銆�");
- page.newLine("鎺ユ敹鍣� RX18 XH 6V 銆愭暟閲忥細2銆�");
- page.newLine("涓帶 BM钃濈墮 鑻辨枃 6V 銆愭暟閲忥細1銆�");
- page.newLine("绾挎潫 S2588-1-XX 鏃犲疄鐗┿�愭暟閲忥細5銆�");
- // 璁剧疆瀛椾綋
- page.setFont( new Font("瀹嬩綋",Font.PLAIN,12));
- // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
- page.setDisplayStyle(styles[6]);
- area.addPage(page);
- pf.addArea( area );
- // 鏇存柊鑺傜洰
- screen.writeProgram(pf);
+
+
+ while (true) {
+ Thread.sleep(5000L);
+
+ ProgramBxFile pf = new ProgramBxFile( 0, screen.getProfile());
+ pf.setFrameShow(false);
+ // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eigth
+ TextCaptionBxArea area = new TextCaptionBxArea( 0,0,192,96,screen.getProfile());
+
+ // 鍒涘缓涓�涓暟鎹〉
+ // 绗竴琛屾暟鎹�
+ TextBxPage page = new TextBxPage("鍑哄簱浠诲姟锛�303锛�");
+ page.newLine("婧愬簱浣嶏細0100204");
+ page.newLine("鐩爣绔欙細1000");
+ // 璁剧疆瀛椾綋
+ page.setFont( new Font("瀹嬩綋",Font.PLAIN,15));
+ // 璁剧疆鏂囨湰棰滆壊
+ page.setForeground(Color.red);
+ // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
+ page.setDisplayStyle(styles[6]);
+ area.clearPages();
+ area.addPage(page);
+ pf.addArea( area );
+
+ // 鏇存柊鑺傜洰
+ // 鏇存柊鑺傜洰
+ if (pf.validate() != null) {
+ System.out.println("pf out of range");
+ log.info("pf out of range");
+ } else {
+ // 鏇存柊鑺傜洰
+ screen.writeProgram(pf);
+ }
+ }
+
// 缁у紑涓庢帶鍒跺櫒涔嬮棿鐨勯摼鎺�
- screen.disconnect();
+// screen.disconnect();
}
@@ -400,8 +431,11 @@
//
// 缁у紑涓庢帶鍒跺櫒涔嬮棿鐨勯摼鎺�
screen.disconnect();
-
-
+ }
+ private void error(String msg) {
+ log.error("閿欒淇℃伅涓猴細{}",msg);
+ errorMsg.delete(0, errorMsg.length());
+ errorMsg.append(msg);
}
}
--
Gitblit v1.9.1