From 29e8cbccfba7cd77026c724d093d6a82da99e5af Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 九月 2022 13:55:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 182 +++++++++++++++++++-------------------------
1 files changed, 79 insertions(+), 103 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 849049c..e37e85a 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -1,15 +1,18 @@
package com.zy.core.thread;
+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.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.Bx5GScreenClient;
-import onbon.bx05.area.TextCaptionBxArea;
-import onbon.bx05.area.page.TextBxPage;
-import onbon.bx05.cmd.dyn7.DynamicBxAreaRule;
-import onbon.bx05.utils.DisplayStyleFactory;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
/**
* Created by vincent on 2020/9/1
@@ -19,124 +22,97 @@
public class LedThread implements Runnable, ThreadHandler {
private Slave slave;
+ private Set<Integer> workNos = new HashSet<>();
+
+ // 鏄剧ず鍣�
+ private StringBuffer stringBuffer = new StringBuffer();
+ private List<LedCommand> commandList;
+
+ private StringBuffer errorMsg = new StringBuffer();
public LedThread(Slave slave) {
this.slave = slave;
}
@Override
+ @SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
public void run() {
- connect();
+// connect();
while (true) {
try {
-
-
-
- Thread.sleep(500);
+ 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;
+ case 3:
+ error((String) task.getData());
+ break;
+ case 4:
+ errorReset();
+ break;
+ default:
+ break;
+ }
+ }
+ Thread.sleep(1000);
} catch (Exception e) {
e.printStackTrace();
}
}
}
+ private void write(List<LedCommand> list) {
+ commandList = list;
+
+ StringBuilder sb = new StringBuilder();
+ for (LedCommand command : list) {
+ sb.append(command.getTitle()).append("锛�").append(command.getWorkNo()).append(")").append("\n");
+ sb.append("婧愬簱浣嶏細").append(command.getSourceLocNo()).append("\n");
+ sb.append("鐩爣绔欙細").append(command.getStaNo()).append("\n");
+ if (!command.isEmptyMk()) {
+ for (MatDto matDto : command.getMatDtos()) {
+ sb.append(matDto.getMatnr()).append("-").append(matDto.getBatch()).append("\n");
+ }
+ }
+ sb.append("\n");
+ }
+ stringBuffer.delete(0, stringBuffer.length());
+ stringBuffer.append(sb.toString());
+
+ errorReset();
+ }
+
+
+ private void reset() {
+ commandList = null;
+
+ stringBuffer.delete(0, stringBuffer.length());
+ }
+
+
+ private void error(String msg) {
+ errorMsg.delete(0, errorMsg.length());
+ errorMsg.append(msg);
+ }
+
+ public void errorReset() {
+ this.errorMsg.delete(0, errorMsg.length());
+ }
+
@Override
public boolean connect() {
- return false;
+ return true;
}
@Override
public void close() {
-
- }
-
-
- public static void main(String[] args) throws Exception {
- Bx5GEnv.initial(3000);
- // 鍒涘缓screen瀵硅薄锛岀敤浜庡鎺у埗鍣ㄨ繘琛岃闂紝瀹㈡埛绔ā寮�
- Bx5GScreenClient screen = new Bx5GScreenClient("MyScreen");
- // 鍒涘缓screen瀵硅薄锛岀敤浜庡鎺у埗鍣ㄨ繘琛岃闂紝涓插彛妯″紡
- // Bx5GScreenRS screen = new Bx5GScreenRS("MyScreen");
-
-
- // 鍦ㄥ鎺у埗鍣ㄤ氦浜掍箣鍓嶏紝闇�瑕佸厛涓庢帶鍒跺櫒寤虹珛杩炴帴
- screen.connect("192.168.100.199",5005);
- // 涓庢帶鍒跺櫒浜や簰瀹屾垚鍚庯紝闇�鏂紑涓庢帶鍒跺櫒涔嬮棿鐨勮繛鎺�
- screen.disconnect();
-
- // 浠ヤ笅涓轰竴浜涚畝鍗曟帶鍒跺懡浠ょ殑浣跨敤鏂规硶
- // 寮�鍏虫満鍛戒护
- screen.turnOff();// 鍏虫満
- screen.turnOn();// 寮�鏈�
- screen.syncTime();// 鏍℃椂
- screen.ping();// ping鍛戒护
- // 鏌ヨ鎺у埗鍣ㄧ姸鎬�
- screen.checkControllerStatus();
- // 鏌ヨ鎺у埗鍣ㄥ綋鍓嶅浐浠剁増鏈�
- screen.checkFirmware();
- // 鏌ヨ鎺у埗鍣ㄥ唴瀛�
- screen.checkMemVolumes();
- // 閿佸畾灞忓箷褰撳墠鐢婚潰
- screen.lock();
- // 瑙ｉ櫎閿佸畾灞忓箷褰撳墠鐢婚潰
- screen.unlock();
-
-
-
- //
- // 浠ヤ笅鏄姩鎬佸尯閮ㄥ垎 Demo
- // 鍔ㄦ�佸尯鐨勭壒鐐�
-
- // DynamicBxAreaRule(id, runMode, immediatePlay, timeout)
- // runMode 杩愯妯″紡锛�
- // 0锛氬惊鐜樉绀恒��
- // 1锛氭樉绀哄畬鎴愬悗闈欐鏄剧ず鏈�鍚庝竴椤垫暟鎹��
- // 2锛氬惊鐜樉绀猴紝瓒呰繃璁惧畾鏃堕棿鍚庢暟鎹粛鏈洿鏂版椂涓嶅啀鏄剧ず銆�
- // 3锛氬惊鐜樉绀猴紝瓒呰繃璁惧畾鏃堕棿鍚庢暟鎹粛鏈洿鏂版椂鏄剧ず Logo 淇℃伅銆�
- // 4锛氬惊鐜樉绀猴紝鏄剧ず瀹屾渶鍚庝竴椤靛悗灏变笉鍐嶆樉绀恒��
- // immediatePlay 鏄惁绔嬪嵆鎾斁锛�
- // 0锛氫笌寮傛鑺傜洰涓�璧锋挱鏀俱��
- // 1锛氬紓姝ヨ妭鐩仠姝㈡挱鏀撅紝浠呮挱鏀惧姩鎬佸尯鍩熴��
- // 2锛氬綋鎾斁瀹岃妭鐩紪鍙锋渶楂樼殑寮傛鑺傜洰鍚庢挱鏀捐鍔ㄦ�佸尯鍩熴��
-
- //
- // 瀹氫箟涓�涓姩鎬佸尯
- // 鍙互閫氳繃ID鏉ユ洿鏂颁笉鍚岀殑鍔ㄦ�佸尯鍐呭, 姝ゅ ID 涓� 0
- DynamicBxAreaRule dynRule = new DynamicBxAreaRule(0, (byte) 4, (byte) 1, 0);
- //dArea.addProgram("P000");
- //dArea.addProgram("P001");
-
- int posX = 440;
- int posY = 4;
- TextCaptionBxArea dAreaContent = new TextCaptionBxArea(posX, posY, 64, 16, screen.getProfile());
- TextBxPage page = new TextBxPage("鍔ㄦ�佺涓�娆″皾璇�");
- page.setDisplayStyle(DisplayStyleFactory.getStyle(4));
- dAreaContent.addPage(page);
-
- // 鍙戦�佸姩鎬佸尯涔嬪墠锛屽鏋滈渶瑕佸垹闄や箣鍓嶇殑鍔ㄦ�佸尯锛屽彲浠ヨ皟鐢ㄤ互涓嬫帴鍙�
- // 閫氬父濡傛灉鍔ㄦ�佸尯鐨勪綅缃垨澶у皬娌℃湁鍙戠敓鏀瑰彉锛屼笉鐢ㄥ垹闄�
- screen.deleteAllDynamic();
-
- // 鏇存柊鍔ㄦ�佸尯
- screen.writeDynamic(dynRule, dAreaContent);
- Thread.sleep(15000);
-
- //
- // 涓嬮潰妯℃嫙鍐嶆鏇存柊鍔ㄦ�佸尯
- page = new TextBxPage("鍐嶆灏濊瘯");
- TextBxPage page2 = new TextBxPage("鎴愬姛");
-
- dAreaContent.clearPages();
- dAreaContent.addPage(page);
- dAreaContent.addPage(page2);
-
- // 鏇存柊鍔ㄦ�佸尯
- screen.writeDynamic(dynRule, dAreaContent);
-
- //
- // 缁у紑涓庢帶鍒跺櫒涔嬮棿鐨勯摼鎺�
- screen.disconnect();
-
-
}
}
--
Gitblit v1.9.1