From deb12de25c41d2b8b20b0b08c9b1338e8a4d8b12 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 10:32:17 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 151 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 121 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index eb6e729..bd02abc 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -50,6 +50,8 @@
add(1008);add(1009);add(1010);add(1011);add(1012);add(1013);add(1014);add(1015);
add(1016);add(1017);add(1018);add(1019);add(1020);add(1021);add(1022);add(1023);
}};
+ private boolean connectDev = false;
+
/**
* 鏉＄爜鏁伴噺
@@ -82,36 +84,53 @@
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- connect();
- while (true) {
+ connectDev = connect();
+ while(!connectDev){
try {
- int step = 1;
- Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
- if (task != null) {
- step = task.getStep();
- }
- switch (step) {
- // 璇绘暟鎹�
- case 1:
- read();
- break;
- // 鍐欐暟鎹� ID+鐩爣绔�
- case 2:
- write((StaProtocol)task.getData());
- break;
- default:
- break;
- }
- // 蹇冭烦
-// heartbeat();
- Thread.sleep(400);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ connectDev = this.connect();
+ Thread.sleep(100);
+ } catch (Exception e){
+ }
}
+
+ // 鍚姩绾跨▼鑷姩閲嶈繛
+ new Thread(this::devConnect).start();
+ new Thread(this::readStatusDev).start();
+ new Thread(this::writeStatusDev).start();
+
+
}
+
+ private void devConnect() {
+ while (true) {
+ try {
+ Thread.sleep(1000);
+
+ if(!connectDev){
+ try {
+ connectDev = this.connect();
+ Thread.sleep(100);
+ } catch (Exception e){
+
+ }
+ }
+ } catch (Exception e) {
+ log.info("dev杩炴帴澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+
+// log.error("rgv杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("dev", slave.getId(), "rgv杩炴帴澶辫触"+e.getMessage());
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
+ initSite();
+// e.printStackTrace();
+ }
+ }
+ }
/**
* 鍒濆鍖栫珯鐐圭姸鎬�
*/
@@ -161,6 +180,78 @@
return result;
}
+
+
+ private void writeStatusDev() {
+ while (true) {
+ try {
+ if(!connectDev){
+ try {
+ Thread.sleep(1000L);
+ } catch (Exception e){
+
+ }
+ continue;
+ }
+ int step = 1;
+ Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
+ if (task != null) {
+ step = task.getStep();
+ }
+ switch (step) {
+ // 璇绘暟鎹�
+ case 1:
+// read();
+ break;
+ // 鍐欐暟鎹� ID+鐩爣绔�
+ case 2:
+ write((StaProtocol)task.getData());
+ break;
+ default:
+ break;
+ }
+ // 蹇冭烦
+// heartbeat();
+ Thread.sleep(200);
+ } catch (Exception e) {
+// e.printStackTrace();
+ }
+
+ }
+ }
+ private void readStatusDev() {
+ while (true) {
+ try {
+ if(!connectDev){
+ try {
+ Thread.sleep(1000L);
+ } catch (Exception e){
+
+ }
+ initSite();
+ continue;
+ }
+ Thread.sleep(50);
+// System.out.println("璇荤嚎绋�"+ slave.getId());
+
+ read();
+
+ } catch (Exception e) {
+ log.error("RGV鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV鏁版嵁璇诲彇绾跨▼寮傚父"+e.getMessage());
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
+ initSite();
+// e.printStackTrace();
+ }
+
+ }
+
+ }
+
/**
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
@@ -191,7 +282,7 @@
staProtocol.setInEnable(status[2]); // 鍙叆
// staProtocol.setInEnable(true); // 鍙叆
staProtocol.setOutEnable(status[3]);// 鍙嚭
- staProtocol.setOutEnable(true);// 鍙嚭
+// staProtocol.setOutEnable(true);// 鍙嚭
staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
staProtocol.setHigh(status[6]); // 楂樺簱浣�
@@ -212,7 +303,7 @@
}
//鏉＄爜
- Thread.sleep(200);
+// Thread.sleep(50);
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB400.100.0",(short) (barcodeSize*8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
@@ -225,7 +316,7 @@
}
//鏉＄爜
- Thread.sleep(200);
+// Thread.sleep(50);
int[] staW = new int[]{1004,1014,1020};
OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB400.148.0",(short) (staW.length*4));
@@ -264,7 +355,7 @@
throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
}
} catch (Exception e){
- log.error("e:"+e.getMessage());
+// log.error("e:"+e.getMessage());
}
} catch (Exception e) {
@@ -277,7 +368,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.deleteDeviceError("devp", slave.getId());
} catch (Exception e){
- log.error("e:"+e.getMessage());
+// log.error("e:"+e.getMessage());
}
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣鍙栬緭閫佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
--
Gitblit v1.9.1