From 1e8898f3fca605a9e8bd22b8e21829b3bb385f45 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 21 二月 2022 15:53:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 266 ++++++++++++++++++++++++++++++----------------------
src/main/java/com/zy/common/entity/Parameter.java | 11 ++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +-
3 files changed, 168 insertions(+), 119 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index e753cd9..19460b6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -7,7 +7,6 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.WaitPakinMapper;
@@ -17,11 +16,11 @@
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.MatDto;
+import com.zy.common.model.SearchLocParam;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.CollectionUtils;
import com.zy.common.utils.HttpHandler;
-import com.zy.common.model.SearchLocParam;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
@@ -1155,8 +1154,6 @@
StaProtocol staProtocol = devpThread.getStation().get(staNo);
if (staProtocol == null) {
continue;
- } else {
- staProtocol = staProtocol.clone();
}
if (staProtocol.getWorkNo() != 0) {
reset = false;
@@ -1166,9 +1163,12 @@
// 鑾峰彇led绾跨▼
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getDevpPlcId());
// led鏄剧ず榛樿鍐呭
- if (reset) {
+ if (reset && !ledThread.isLedMk()) {
+ ledThread.setLedMk(true);
if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
+ } else {
+
}
}
}
diff --git a/src/main/java/com/zy/common/entity/Parameter.java b/src/main/java/com/zy/common/entity/Parameter.java
index a5106b6..548158f 100644
--- a/src/main/java/com/zy/common/entity/Parameter.java
+++ b/src/main/java/com/zy/common/entity/Parameter.java
@@ -59,4 +59,15 @@
public void setCodeSwitch(String codeSwitch) {
this.codeSwitch = codeSwitch;
}
+
+ private String ledDefaultMsg;
+
+ public String getLedDefaultMsg() {
+ return ledDefaultMsg;
+ }
+
+ public void setLedDefaultMsg(String ledDefaultMsg) {
+ this.ledDefaultMsg = ledDefaultMsg;
+ }
+
}
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index d2a5d83..deb64fe 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -1,5 +1,8 @@
package com.zy.core.thread;
+import com.alibaba.fastjson.JSON;
+import com.core.common.Cools;
+import com.zy.common.entity.Parameter;
import com.zy.common.model.MatDto;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
@@ -37,17 +40,14 @@
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 = true;
+// private boolean resetStatus = false; // 澶嶄綅鐘舵��
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());
@@ -57,7 +57,8 @@
@Override
@SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
public void run() {
-// connect();
+ connect();
+ close();
while (true) {
try {
Task task = MessageQueue.poll(SlaveType.Led, slave.getId());
@@ -71,16 +72,124 @@
case 2:
reset();
break;
+ // 璀﹀憡淇℃伅
+ case 3:
+ write(String.valueOf(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,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,14));
+ // 璁剧疆鏂囨湰棰滆壊
+ page.setForeground(Color.red);
+ // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
+ page.setDisplayStyle(styles[6]);
+ area.clearPages();
+ area.addPage(page);
+ pf.addArea(area);
+ // 鏇存柊鑺傜洰
+ screen.writeProgram(pf);
+// resetStatus = false;
+ close();
+ }
+
+ private void write(String str) throws Bx5GException {
+// if (!connect() || Cools.isEmpty(str)) {
+// return;
+// }
+ 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(str);
+ page.newLine("\n");
+ // 璁剧疆瀛椾綋
+ page.setFont(new Font("瀹嬩綋",Font.PLAIN,14));
+ // 璁剧疆鏂囨湰棰滆壊
+ page.setForeground(Color.red);
+ // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
+ page.setDisplayStyle(styles[6]);
+ area.clearPages();
+ area.addPage(page);
+ pf.addArea(area);
+ // 鏇存柊鑺傜洰
+ screen.writeProgram(pf);
+// resetStatus = false;
+ close();
+ }
+
+ private void reset() throws Bx5GException {
+// if (!connect()) {
+// return;
+// }
+ 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();
+
+ 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.setFont(new Font("瀹嬩綋",Font.PLAIN,15));
+ // 璁剧疆鏂囨湰棰滆壊
+ page.setForeground(Color.red);
+ // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
+ page.setDisplayStyle(styles[6]);
+ area.clearPages();
+ area.addPage(page);
+ pf.addArea(area);
+ // 鏇存柊鑺傜洰
+ screen.writeProgram(pf);
+ close();
}
@Override
@@ -88,13 +197,14 @@
boolean connRes = false;
try {
connRes = screen.connect(slave.getIp(),slave.getPort());
- } catch (Exception ignore) {
- }
- 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());
- }
+ screen.turnOn();
+ if (connRes) {
+ log.info("led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ reset();
+ } else {
+ log.error("led杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ }
+ } catch (Exception ignore) { }
return connRes;
}
@@ -103,79 +213,6 @@
screen.disconnect();
}
-
- 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 {
@@ -187,34 +224,35 @@
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,128,screen.getProfile());
+
+ // 鍒涘缓涓�涓暟鎹〉
+ // 绗竴琛屾暟鎹�
+ TextBxPage page = new TextBxPage("鍑哄簱浠诲姟锛�303锛�");
+ page.newLine("婧愬簱浣嶏細0100204");
+ page.newLine("鐩爣绔欙細1000");
+ // 璁剧疆瀛椾綋
+ page.setFont( new Font("瀹嬩綋",Font.PLAIN,12));
+ // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
+ page.setDisplayStyle(styles[6]);
+ area.clearPages();
+ area.addPage(page);
+ pf.addArea( area );
+
+ // 鏇存柊鑺傜洰
+ screen.writeProgram(pf);
+ }
+
// 缁у紑涓庢帶鍒跺櫒涔嬮棿鐨勯摼鎺�
- screen.disconnect();
+// screen.disconnect();
}
--
Gitblit v1.9.1