From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/core/thread/LedThread.java | 350 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 235 insertions(+), 115 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index bca7310..fcc9970 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -1,10 +1,21 @@
package com.zy.core.thread;
+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.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;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import onbon.bx05.Bx5GEnv;
+import onbon.bx05.Bx5GException;
import onbon.bx05.Bx5GScreen;
import onbon.bx05.Bx5GScreenClient;
import onbon.bx05.area.TextCaptionBxArea;
@@ -14,6 +25,9 @@
import onbon.bx05.utils.DisplayStyleFactory;
import java.awt.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
/**
* Created by vincent on 2020/9/1
@@ -22,124 +36,81 @@
@Slf4j
public class LedThread implements Runnable, ThreadHandler {
+ ProgramBxFile pf;
+ TextCaptionBxArea area;
+ DisplayStyleFactory.DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyleFactory.DisplayStyle[0]);
private Slave slave;
private Bx5GScreenClient screen;
+ private Set<Integer> workNos = new HashSet<>();
+ private boolean ledMk = false;
+ private boolean resetStatus = false; // 澶嶄綅鐘舵��
public LedThread(Slave slave) {
this.slave = slave;
try {
Bx5GEnv.initial(3000);
- screen = new Bx5GScreenClient("MyScreen");
+ screen = new Bx5GScreenClient("my");
} catch (Exception e) {
e.printStackTrace();
log.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
}
- @Override
- @SuppressWarnings("InfiniteLoopStatement")
- public void run() {
- connect();
- while (true) {
- try {
-
-
-
- Thread.sleep(500);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- @Override
- public boolean connect() {
- boolean connRes = false;
- try {
- connRes = screen.connect(slave.getIp(),slave.getPort());
- } catch (Exception e) {
- e.printStackTrace();
- }
- if (connRes) {
- log.info("led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- } else {
- log.error("led杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- }
- return connRes;
- }
-
- @Override
- public void close() {
- screen.disconnect();
- }
-
-
-
-
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( 100,50,800,600,screen.getProfile());
- // 鍒涘缓涓�涓暟鎹〉
- // 绗竴琛屾暟鎹�
- TextBxPage page = new TextBxPage("鍏ュ簱");
- // 绗簩琛屾暟鎹�
- page.newLine( "鐗╂枡锛�" );
- page.newLine("鎺ユ敹鍣� RX18 XH 6V 锛堟暟閲忥細2锛�");
- page.newLine("涓帶 BM钃濈墮 鑻辨枃 6V 锛堟暟閲忥細1锛�");
- page.newLine("绾挎潫 S2588-1-XX 鏃犲疄鐗╋紙鏁伴噺锛�5锛�");
- page.newLine("鐩爣搴撲綅锛�0100204");
- // 璁剧疆瀛椾綋
- page.setFont( new Font("瀹嬩綋",Font.PLAIN,12));
- // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
- page.setDisplayStyle(styles[2]);
- 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();
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
public static void main1(String[] args) throws Exception {
Bx5GEnv.initial(3000);
@@ -149,7 +120,7 @@
// Bx5GScreenRS screen = new Bx5GScreenRS("MyScreen");
// 鍦ㄥ鎺у埗鍣ㄤ氦浜掍箣鍓嶏紝闇�瑕佸厛涓庢帶鍒跺櫒寤虹珛杩炴帴
- boolean conn = screen.connect("192.168.10.61",5005);
+ boolean conn = screen.connect("192.168.10.61", 5005);
System.out.println(conn);
// 涓庢帶鍒跺櫒浜や簰瀹屾垚鍚庯紝闇�鏂紑涓庢帶鍒跺櫒涔嬮棿鐨勮繛鎺�
// screen.disconnect();
@@ -171,10 +142,9 @@
// // 瑙ｉ櫎閿佸畾灞忓箷褰撳墠鐢婚潰
// screen.unlock();
- Bx5GScreen.Result <ReturnControllerStatus> result1 =
+ Bx5GScreen.Result<ReturnControllerStatus> result1 =
screen.checkControllerStatus();
- if (result1.isOK())
- {
+ if (result1.isOK()) {
ReturnControllerStatus status = result1.reply;
System.out.println(status.getBrightness());
System.out.println(status.getRtcDay());
@@ -187,7 +157,7 @@
// 浠ヤ笅鏄潤鎬佸尯閮ㄥ垎 Demo
// 鍒涘缓鑺傜洰鏂囦欢
- ProgramBxFile pf = new ProgramBxFile( 0,screen.getProfile() );
+ ProgramBxFile pf = new ProgramBxFile(0, screen.getProfile());
// 鏄惁鏄剧ず鑺傜洰杈规
pf.setFrameShow(true);
// 鑺傜洰杈规鐨勭Щ鍔ㄩ�熷害
@@ -199,21 +169,21 @@
// 鍒涘缓涓�涓枃鏈尯
// 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eigth
// 娉ㄦ剰鍖哄煙鍧愭爣鍜屽搴﹂珮搴︼紝涓嶈瓒婄晫
- TextCaptionBxArea area = new TextCaptionBxArea( 0,0,160,64,screen.getProfile() );
+ TextCaptionBxArea area = new TextCaptionBxArea(0, 0, 160, 64, screen.getProfile());
// 鍒涘缓涓�涓暟鎹〉
// 绗竴琛屾暟鎹�
TextBxPage page = new TextBxPage("鍏ュ簱");
// 绗簩琛屾暟鎹�
- page.newLine( "鐗╂枡锛�" );
+ page.newLine("鐗╂枡锛�");
page.newLine("鎺ユ敹鍣� RX18 XH 6V 锛堟暟閲忥細2锛�");
page.newLine("涓帶 BM钃濈墮 鑻辨枃 6V 锛堟暟閲忥細1锛�");
page.newLine("绾挎潫 S2588-1-XX 鏃犲疄鐗╋紙鏁伴噺锛�5锛�");
page.newLine("鐩爣搴撲綅锛�0100204");
// 璁剧疆瀛椾綋
- page.setFont( new Font("瀹嬩綋",Font.PLAIN,12) );
+ page.setFont(new Font("瀹嬩綋", Font.PLAIN, 12));
// 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
- page.setDisplayStyle( styles[2] );
+ page.setDisplayStyle(styles[2]);
// 鏁版嵁椤靛彲浠ユ槸鍥剧墖
// ImageFileBxPage iPage = new ImageFileBxPage( "E;a/001.bmp" );
@@ -222,22 +192,14 @@
// TextFileBxPage tPage = new TextFileBxPage("E:a/001.txt");
// 灏嗗墠闈㈢殑page娣诲姞鍒癮rea涓� area涓彲浠ユ坊鍔犲涓猵age 鍏朵腑page鍙互鏄瓧绗︿覆锛屽彲浠ユ槸txt鏂囦欢锛屽彲浠ユ槸鍥剧墖锛屼笉鍙互鏄〃鏍硷紝濡傛灉闇�瑕丩ed灞忎笂鏄剧ず琛ㄦ牸锛岃鍏堝皢琛ㄦ牸缁樺埗鎴愬浘鐗�
- area.addPage( page );
+ area.addPage(page);
// area.addPage( iPage );
// area.addPage( tPage );
// 灏哸rea娣诲姞鍒拌妭鐩腑 鑺傜洰涓彲浠ユ坊鍔犲涓猘rea
- pf.addArea( area );
+ pf.addArea(area);
// 鏇存柊鑺傜洰
- screen.writeProgram( pf );
-
-
-
-
-
-
-
-
+ screen.writeProgram(pf);
//
@@ -297,4 +259,162 @@
}
+ @Override
+ @SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
+ public void run() {
+ connect();
+ close();
+ while (true) {
+ try {
+ Task task = MessageQueue.poll(SlaveType.Led, slave.getId());
+ if (task != null) {
+ switch (task.getStep()) {
+ // 鍐欐暟鎹�
+ case 1:
+ write((List<LedCommand>) task.getData());
+ break;
+ // 澶嶄綅
+ case 2:
+ reset();
+ break;
+ default:
+ break;
+ }
+ }
+
+ 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 {
+ if (!connect()) {
+ return;
+ }
+// if (resetStatus) {
+// 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();
+
+// 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));
+ // 璁剧疆鏂囨湰棰滆壊
+ 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 = true;
+ }
+ close();
+ }
+
+ @Override
+ public boolean connect() {
+ boolean connRes = false;
+ try {
+ connRes = screen.connect(slave.getIp(), slave.getPort());
+ 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;
+ }
+
+ @Override
+ public void close() {
+ screen.disconnect();
+ }
+
}
--
Gitblit v1.9.1