From cb15c6400b7dfc3855e5fdd76b8b217bf6bc9567 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期三, 30 十二月 2020 10:55:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index ca7d69a..53f159b 100644
--- a/src/main/java/com/zy/core/thread/MelsecCrnThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -96,7 +96,7 @@
}
Thread.sleep(500);
} catch (Exception e) {
-// e.printStackTrace();
+ e.printStackTrace();
}
}
@@ -137,7 +137,8 @@
crnCommand.setDestinationPosY((short) cal.get(Calendar.HOUR_OF_DAY)); // 鏃讹細0锝�23
crnCommand.setDestinationPosZ((short) cal.get(Calendar.MINUTE)); // 鍒嗭細0锝�59
crnCommand.setDestinationPosX((short) cal.get(Calendar.SECOND)); // 绉掞細0锝�59
- crnCommand.setTaskNo((short) (cal.get(Calendar.DAY_OF_WEEK) - 1)); // 鏄熸湡锛�0(鏃�)锝�6(鍏�)
+// crnCommand.setTaskNo((short) (cal.get(Calendar.DAY_OF_WEEK) - 1)); // 鏄熸湡锛�0(鏃�)锝�6(鍏�)
+ crnCommand.setTaskNo((short) 0); // 鏄熸湡锛�0(鏃�)锝�6(鍏�)
crnCommand.setTaskSend((short) 1);
crnCommand.setAckFinish((short) 0);
if (write(crnCommand)) {
@@ -145,6 +146,9 @@
}
melsecMcNet.ConnectClose();
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignore) {}
return result;
}
@@ -198,6 +202,7 @@
BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
BasCrnp basCrnp = new BasCrnp();
basCrnp.setCrnNo(slave.getId());
+ crnProtocol.setAlarm1((short) (crnProtocol.getAlarm1() + 1000));
if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
@@ -218,6 +223,7 @@
}
if (command.getAckFinish() == 1) {
command.setTaskSend((short) 0);
+ command.setTaskNo((short) 0);
} else if (command.getAckFinish() == 0) {
command.setTaskSend((short) 1);
}
--
Gitblit v1.9.1