From 2cebd39fd1514c991da647f08124e18a0b02abe9 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期三, 26 六月 2024 15:19:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/JarThread.java | 163 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 126 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index b58c74b..9471b80 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -20,6 +20,7 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.JarSlave;
import com.zy.core.model.Task;
+import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.command.JarCommand;
import com.zy.core.model.protocol.JarProtocol;
import lombok.Data;
@@ -117,6 +118,9 @@
*/
private void readStatus(){
try {
+ if (slave.getId()>4){
+ return;
+ }
OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 26);
if (result.IsSuccess) {
if (null == jarProtocol) {
@@ -150,7 +154,7 @@
jarProtocol.setJarErr((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 14));//寮傚父鐮�
jarProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));//鐘舵��
- jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) != 2);//鑷姩
+ jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//鑷姩
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
BasJarService service = SpringUtils.getBean(BasJarService.class);
if (null != service) {
@@ -168,6 +172,7 @@
}
} catch (Exception e) {
// e.printStackTrace();
+ log.error(e.getMessage());
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());
initSte();
@@ -183,41 +188,129 @@
News.error("绌挎杞﹀啓鍏ュ懡浠や负绌�");
return false;
}
- command.setJarNo(slave.getId());
- OperateResult result = null;
- // 寮�濮嬩换鍔�
- if (!command.getComplete()) {
- //缁勭粐浠诲姟鍓嶏紝鍏堟竻绌哄啓浠诲姟纭浣嶏紝浠ュ強浠诲姟瀹屾垚纭浣�
- OperateResult result01 = siemensS7Net.Write("V2000.0", false);
- OperateResult result02 = siemensS7Net.Write("V2000.1", false);
- // 1.浠诲姟鍙�
- OperateResult result0 = siemensS7Net.Write("V998", command.getTaskNo().shortValue());
- try {
- Thread.sleep(200);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- // 浣滀笟
- if (command.getTaskMode() != 0) {
- // 2.浣滀笟
- OperateResult result1 = siemensS7Net.Write("V1000", command.getTaskMode());
- // 3.纭寮�濮嬩换鍔�
- if (result0.IsSuccess && result1.IsSuccess) {
- result = siemensS7Net.Write("V2000.0", true);
- }
- }
- // 浠诲姟瀹屾垚
- } else {
- siemensS7Net.Write("V998", (short) 0);
- siemensS7Net.Write("V1000", (short) 0);
- siemensS7Net.Write("V2000.0", false);
- result = siemensS7Net.Write("V2000.1", true);
+ command.setJarNo(slave.getId());
+ OperateResult result1 = null;
+ String resultV1 = "";
+ short resultS1 = 0;
+ OperateResult result2 = null;
+ String resultV2 = null;
+ short resultS2 = 0;
+
+ switch (command.getTaskMode()){
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ return false;
+ case 5://寮�闂�
+ resultV1 = "V318";
+ resultV2 = "V320";
+ resultS1 = (short)1;
+ resultS2 = (short)1;
+ break;
+ case 6://鍏抽棬
+ resultV1 = "V322";
+ resultV2 = "V324";
+ resultS1 = (short)1;
+ resultS2 = (short)1;
+ break;
+ case 7:
+ case 8:
+ return false;
+ case 9:
+ resultV1 = "V318";
+ resultV2 = "V320";
+ break;
+ case 10:
+ resultV1 = "V322";
+ resultV2 = "V324";
+ break;
+ default:
+ return false;
}
+
+ result1 = siemensS7Net.Write(resultV1, resultS1);
+ result2 = siemensS7Net.Write(resultV2, resultS2);
+ //纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+ try {
+ Thread.sleep(200);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ int writeCount = 1;
+ do {
+ try{
+ if(!result1.IsSuccess){
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ result1 = siemensS7Net.Write(resultV1, resultS1);
+ Thread.sleep(100);
+ writeCount++;
+ continue;
+ }
+ OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2);
+ if (resultRead1.IsSuccess) {
+ short transInt16 = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0);
+ if (transInt16 == resultS1 || transInt16 == (short) 2 || transInt16 == (short) 3){
+ break;
+ } else {
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ result1 = siemensS7Net.Write(resultV1, resultS1);
+ Thread.sleep(100);
+ writeCount++;
+ continue;
+ }
+ } else {
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ result1 = siemensS7Net.Write(resultV1, resultS1);
+ Thread.sleep(100);
+ writeCount++;
+ continue;
+ }
+ }catch (Exception e){
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
+ }
+ writeCount++;
+ } while (writeCount<6);
+
+ writeCount = 1;
+ do {
+ try{
+ if(!result2.IsSuccess){
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ result2 = siemensS7Net.Write(resultV2, resultS2);
+ Thread.sleep(100);
+ writeCount++;
+ continue;
+ }
+ OperateResultExOne<byte[]> resultRead2 = siemensS7Net.Read(resultV2, (short) 2);
+ if (resultRead2.IsSuccess) {
+ short transInt16 = siemensS7Net.getByteTransform().TransInt16(resultRead2.Content, 0);
+ if (transInt16 == resultS1 || transInt16 == (short) 3){
+ break;
+ } else {
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ result2 = siemensS7Net.Write(resultV2, resultS2);
+ Thread.sleep(100);
+ writeCount++;
+ continue;
+ }
+ } else {
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ result2 = siemensS7Net.Write(resultV2, resultS2);
+ Thread.sleep(100);
+ writeCount++;
+ continue;
+ }
+ }catch (Exception e){
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
+ }
+ writeCount++;
+ } while (writeCount<6);
try {
// 鏃ュ織璁板綍
- if (!command.getComplete() && command.getTaskMode() != 0) {
+ if (command.getTaskMode() != 0) {
BasSteOptService bean = SpringUtils.getBean(BasSteOptService.class);
if (null != bean) {
BasSteOpt basSteOpt = new BasSteOpt(
@@ -241,19 +334,15 @@
bean.insert(basSteOpt);
}
}
-
} catch (Exception ignore) {}
- if (result != null && result.IsSuccess) {
+ if (result1 != null && result1.IsSuccess && result2 != null && result2.IsSuccess ) {
News.info("纭寲缃愬懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 纭寲缃愬懡浠や笅鍙戯細 {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
-
try {
Thread.sleep(500);
- } catch (Exception e){
-
- }
+ } catch (Exception e){ }
return true;
} else {
OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戝啓鍏ョ～鍖栫綈plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
--
Gitblit v1.9.1