From f30358a20ae9a74ee7f6c604a8d102c1b9b24659 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 25 六月 2024 16:24:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SteThread.java | 86 +++++++++++++++++++------------------------
1 files changed, 38 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index 22155d8..41ef4d8 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -163,16 +163,16 @@
OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
- // 澶嶄綅淇″彿
- if (steProtocol.getWaiting()) {
- if (resetFlag) {
- SteCommand steCommand = new SteCommand();
- steCommand.setComplete(true);
- if (write(steCommand) && confirmPos()) {
- resetFlag = false;
- }
- }
- }
+// // 澶嶄綅淇″彿
+// if (steProtocol.getWaiting()) {
+// if (resetFlag) {
+// SteCommand steCommand = new SteCommand();
+// steCommand.setComplete(true);
+// if (write(steCommand) && confirmPos()) {
+// resetFlag = false;
+// }
+// }
+// }
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
BasSteService service = SpringUtils.getBean(BasSteService.class);
@@ -223,8 +223,10 @@
//缁勭粐浠诲姟鍓嶏紝鍏堟竻绌哄啓浠诲姟纭浣嶏紝浠ュ強浠诲姟瀹屾垚纭浣�
siemensS7Net.Write("DB100.0", (short) 0);//璁惧鍙�
siemensS7Net.Write("DB100.2", (short) 0);//浠诲姟鍙�
- siemensS7Net.Write("DB100.12.0", false);//浠诲姟寮�濮嬬‘璁や綅
- siemensS7Net.Write("DB100.12.1", false);//浠诲姟瀹屾垚纭
+ siemensS7Net.Write("DB100.12", (short) 0);//璧峰鐐逛綅
+ siemensS7Net.Write("DB100.14", (short) 0);//鐩殑鐐逛綅
+ siemensS7Net.Write("DB100.16.0", false);//浠诲姟寮�濮嬬‘璁や綅
+ siemensS7Net.Write("DB100.16.1", false);//浠诲姟瀹屾垚纭
// 1.浠诲姟鍙�
OperateResult result0 = siemensS7Net.Write("DB100.2", command.getTaskNo().shortValue());
try {
@@ -236,9 +238,11 @@
if (command.getTaskMode() != 0) {
// 2.浣滀笟
OperateResult result1 = siemensS7Net.Write("DB100.4", command.getTaskMode());
+ OperateResult result2 = siemensS7Net.Write("DB100.12", (short) command.getStartLoad().shortValue());//璧峰鐐逛綅
+ OperateResult result3 = siemensS7Net.Write("DB100.14", (short) command.getEndLoad().shortValue());//鐩殑鐐逛綅
// 3.纭寮�濮嬩换鍔�
- if (result0.IsSuccess && result1.IsSuccess) {
- result = siemensS7Net.Write("DB100.12.0", true);
+ if (result0.IsSuccess && result1.IsSuccess && result2.IsSuccess && result3.IsSuccess) {
+ result = siemensS7Net.Write("DB100.16.0", true);
try {
Thread.sleep(300);
@@ -249,11 +253,11 @@
}
// 浠诲姟瀹屾垚
} else {
- siemensS7Net.Write("DB100.2", (short) 0);//浠诲姟鍙�
- siemensS7Net.Write("DB100.4.0", (short) 0);//浠诲姟绫诲瀷
- siemensS7Net.Write("DB100.12.0", false);//浠诲姟寮�濮嬬‘璁や綅
+// siemensS7Net.Write("DB100.2", (short) 0);//浠诲姟鍙�
+// siemensS7Net.Write("DB100.4.0", (short) 0);//浠诲姟绫诲瀷
+ siemensS7Net.Write("DB100.16.0", false);//浠诲姟寮�濮嬬‘璁や綅
- result = siemensS7Net.Write("DB100.12.1", true);//浠诲姟瀹屾垚纭
+ result = siemensS7Net.Write("DB100.16.1", true);//浠诲姟瀹屾垚纭
}
try {
@@ -286,13 +290,6 @@
} catch (Exception ignore) {}
if (result != null && result.IsSuccess) {
- // 缁存姢鏁版嵁搴撴帓鍒楀眰
- if (!steProtocol.getWaiting()) {
- if (!Cools.isEmpty(command.getRow(), command.getBay(), command.getLev())) {
- this.modifyPos(command.getRow().intValue(), command.getBay().intValue(), command.getLev().intValue());
- }
- }
-
News.info("绌挎杞﹀懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
return true;
@@ -300,13 +297,6 @@
OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戝啓鍏ョ┛姊溅plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
News.error("鍐欏叆绌挎杞lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
return false;
- }
- }
-
- public void modifyPos(Integer row, Integer bay, Integer lev) {
- BasSteService service = SpringUtils.getBean(BasSteService.class);
- if (!service.updatePos(this.slave.getId(), row, bay, lev)) {
- News.error("鏇存柊{}鍙风┛姊溅瀹氫綅澶辫触 ===>> 鎺掞細銆恵}銆�, 鍒楋細銆恵}銆戯紝灞傦細銆恵}銆�", this.slave.getId(), row, bay, lev);
}
}
@@ -367,21 +357,21 @@
/******************************************************************************************/
/**************************************** 娴嬭瘯涓撶敤 *****************************************/
/*****************************************************************************************/
- public static void main(String[] args) throws InterruptedException {
- SteSlave slave = new SteSlave();
- slave.setId(1);
- slave.setIp("192.168.2.1");
- slave.setPort(502);
- SteThread thread = new SteThread(slave);
- thread.connect();
- thread.readStatus();
- System.out.println(JSON.toJSONString(thread.steProtocol));
-
- // 绌挎杞﹁繍琛岀姝�
- SteCommand command = new SteCommand();
- command.setRun((short)0);
- thread.write(command);
-
- }
+// public static void main(String[] args) throws InterruptedException {
+// SteSlave slave = new SteSlave();
+// slave.setId(1);
+// slave.setIp("192.168.2.1");
+// slave.setPort(502);
+// SteThread thread = new SteThread(slave);
+// thread.connect();
+// thread.readStatus();
+// System.out.println(JSON.toJSONString(thread.steProtocol));
+//
+// // 绌挎杞﹁繍琛岀姝�
+// SteCommand command = new SteCommand();
+//// command.setRun((short)0);
+// thread.write(command);
+//
+// }
}
--
Gitblit v1.9.1