From 371e045764d851da877005e042c8034256983997 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 14 十二月 2021 10:29:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 194 +++++++++++++++++++++++++++++-------------------
1 files changed, 117 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index fb5bced..69a6c19 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -130,10 +130,99 @@
crnProtocol.setRow(siemensNet.getByteTransform().TransInt16(result.Content, 18)); // 20
crnProtocol.setLane(siemensNet.getByteTransform().TransInt16(result.Content, 20)); // 22
- crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt32(result.Content, 28)); // 30
- crnProtocol.setAlarm2(siemensNet.getByteTransform().TransInt32(result.Content, 32)); // 34
- crnProtocol.setAlarm3(siemensNet.getByteTransform().TransInt32(result.Content, 36)); // 38
- crnProtocol.setAlarm4(siemensNet.getByteTransform().TransInt32(result.Content, 40)); // 42
+ // 寮傚父
+ crnProtocol.setAlarm1(0);
+ crnProtocol.setAlarm2(0);
+ crnProtocol.setAlarm3(0);
+ crnProtocol.setAlarm4(0);
+ boolean[] err1 = siemensNet.getByteTransform().TransBool(result.Content, 28, 1); // 30
+ if (err1[0]) { crnProtocol.setAlarm1(1); }
+ if (err1[1]) { crnProtocol.setAlarm1(2); }
+ if (err1[2]) { crnProtocol.setAlarm1(3); }
+ boolean[] err2 = siemensNet.getByteTransform().TransBool(result.Content, 29, 1); // 31
+ if (err2[0]) { crnProtocol.setAlarm1(4); }
+ if (err2[1]) { crnProtocol.setAlarm1(5); }
+ if (err2[2]) { crnProtocol.setAlarm1(6); }
+ boolean[] err3 = siemensNet.getByteTransform().TransBool(result.Content, 30, 1); // 32
+ if (err3[6]) { crnProtocol.setAlarm1(7); }
+ if (err3[7]) { crnProtocol.setAlarm1(8); }
+ boolean[] err4 = siemensNet.getByteTransform().TransBool(result.Content, 31, 1); // 33
+ if (err4[1]) { crnProtocol.setAlarm1(9); }
+ if (err4[5]) { crnProtocol.setAlarm1(10); }
+ if (err4[6]) { crnProtocol.setAlarm1(11); }
+ if (err4[7]) { crnProtocol.setAlarm1(12); }
+ boolean[] err5 = siemensNet.getByteTransform().TransBool(result.Content, 32, 1); // 34
+ if (err5[0]) { crnProtocol.setAlarm2(13); }
+ if (err5[2]) { crnProtocol.setAlarm2(14); }
+ if (err5[3]) { crnProtocol.setAlarm2(15); }
+ if (err5[5]) { crnProtocol.setAlarm2(16); }
+ if (err5[6]) { crnProtocol.setAlarm2(17); }
+ if (err5[7]) { crnProtocol.setAlarm2(18); }
+ boolean[] err6 = siemensNet.getByteTransform().TransBool(result.Content, 33, 1); // 35
+ if (err6[1]) { crnProtocol.setAlarm2(19); }
+ if (err6[2]) { crnProtocol.setAlarm2(20); }
+ if (err6[3]) { crnProtocol.setAlarm2(21); }
+ if (err6[4]) { crnProtocol.setAlarm2(22); }
+ boolean[] err7 = siemensNet.getByteTransform().TransBool(result.Content, 34, 1); // 36
+ if (err7[4]) { crnProtocol.setAlarm2(23); }
+ if (err7[5]) { crnProtocol.setAlarm2(24); }
+ if (err7[6]) { crnProtocol.setAlarm2(25); }
+ boolean[] err8 = siemensNet.getByteTransform().TransBool(result.Content, 36, 1); // 38
+ if (err8[0]) { crnProtocol.setAlarm3(26); }
+ if (err8[1]) { crnProtocol.setAlarm3(27); }
+ if (err8[2]) { crnProtocol.setAlarm3(28); }
+ if (err8[3]) { crnProtocol.setAlarm3(29); }
+ if (err8[4]) { crnProtocol.setAlarm3(30); }
+ if (err8[5]) { crnProtocol.setAlarm3(31); }
+ if (err8[6]) { crnProtocol.setAlarm3(32); }
+ if (err8[7]) { crnProtocol.setAlarm3(33); }
+ boolean[] err9 = siemensNet.getByteTransform().TransBool(result.Content, 37, 1); // 39
+ if (err9[0]) { crnProtocol.setAlarm3(34); }
+ if (err9[1]) { crnProtocol.setAlarm3(35); }
+ if (err9[2]) { crnProtocol.setAlarm3(36); }
+ if (err9[3]) { crnProtocol.setAlarm3(37); }
+ if (err9[4]) { crnProtocol.setAlarm3(38); }
+ if (err9[5]) { crnProtocol.setAlarm3(39); }
+ if (err9[6]) { crnProtocol.setAlarm3(40); }
+ if (err9[7]) { crnProtocol.setAlarm3(41); }
+ boolean[] err10 = siemensNet.getByteTransform().TransBool(result.Content, 38, 1); // 40
+ if (err10[0]) { crnProtocol.setAlarm3(42); }
+ if (err10[1]) { crnProtocol.setAlarm3(43); }
+ if (err10[2]) { crnProtocol.setAlarm3(44); }
+ if (err10[3]) { crnProtocol.setAlarm3(45); }
+ if (err10[4]) { crnProtocol.setAlarm3(46); }
+ boolean[] err11 = siemensNet.getByteTransform().TransBool(result.Content, 39, 1); // 41
+ if (err11[0]) { crnProtocol.setAlarm3(47); }
+ if (err11[1]) { crnProtocol.setAlarm3(48); }
+ if (err11[2]) { crnProtocol.setAlarm3(49); }
+ boolean[] err12 = siemensNet.getByteTransform().TransBool(result.Content, 40, 1); // 42
+ if (err12[0]) { crnProtocol.setAlarm4(50); }
+ if (err12[1]) { crnProtocol.setAlarm4(51); }
+ if (err12[2]) { crnProtocol.setAlarm4(52); }
+ if (err12[3]) { crnProtocol.setAlarm4(53); }
+ if (err12[4]) { crnProtocol.setAlarm4(54); }
+ if (err12[5]) { crnProtocol.setAlarm4(55); }
+ boolean[] err13 = siemensNet.getByteTransform().TransBool(result.Content, 41, 1); // 43
+ if (err13[0]) { crnProtocol.setAlarm4(56); }
+ if (err13[1]) { crnProtocol.setAlarm4(57); }
+ if (err13[2]) { crnProtocol.setAlarm4(58); }
+ if (err13[3]) { crnProtocol.setAlarm4(59); }
+ boolean[] err14 = siemensNet.getByteTransform().TransBool(result.Content, 42, 1); // 44
+ if (err14[0]) { crnProtocol.setAlarm4(60); }
+ if (err14[1]) { crnProtocol.setAlarm4(61); }
+ if (err14[2]) { crnProtocol.setAlarm4(62); }
+ if (err14[3]) { crnProtocol.setAlarm4(63); }
+ if (err14[4]) { crnProtocol.setAlarm4(64); }
+ if (err14[5]) { crnProtocol.setAlarm4(65); }
+ if (err14[6]) { crnProtocol.setAlarm4(66); }
+ if (err14[7]) { crnProtocol.setAlarm4(67); }
+ boolean[] err15 = siemensNet.getByteTransform().TransBool(result.Content, 43, 1); // 45
+ if (err15[1]) { crnProtocol.setAlarm4(68); }
+ if (err15[2]) { crnProtocol.setAlarm4(69); }
+ if (err15[3]) { crnProtocol.setAlarm4(70); }
+ if (err15[4]) { crnProtocol.setAlarm4(71); }
+ if (err15[5]) { crnProtocol.setAlarm4(72); }
+ if (err15[6]) { crnProtocol.setAlarm4(73); }
boolean[] bool1 = siemensNet.getByteTransform().TransBool(result.Content, 60, 1); // 62
crnProtocol.setConnStatus(bool1[0]);
@@ -168,7 +257,7 @@
crnProtocol.setYSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 24)); // 26
crnProtocol.setZSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 26)); // 28
// 绱閲岀▼銆佹椂闀�
- crnProtocol.setXDuration((float) siemensNet.getByteTransform().TransInt32(result.Content, 88)); // 90
+ crnProtocol.setXDistance((float) siemensNet.getByteTransform().TransInt32(result.Content, 88)); // 90
crnProtocol.setYDistance((float) siemensNet.getByteTransform().TransInt32(result.Content, 92)); // 94
crnProtocol.setXDuration((float) siemensNet.getByteTransform().TransInt32(result.Content, 96)); // 98
crnProtocol.setYDuration((float) siemensNet.getByteTransform().TransInt32(result.Content, 100)); // 102
@@ -243,72 +332,15 @@
log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
- if (command.getTaskNo() == 0) {
+ if (command.getTaskNo() == 0 && command.getAckFinish() == 0) {
command.setTaskNo((short) 9999);
- }
- // 浠ｇ悊
- switch (command.getSourcePosX()) {
- case 1:
- command.setSourcePosX((short) 4);
- break;
- case 2:
- command.setSourcePosX((short) 3);
- break;
- case 3:
- command.setSourcePosX((short) 2);
- break;
- case 4:
- command.setSourcePosX((short) 1);
- break;
- case 5:
- command.setSourcePosX((short) 4);
- break;
- case 6:
- command.setSourcePosX((short) 3);
- break;
- case 7:
- command.setSourcePosX((short) 2);
- break;
- case 8:
- command.setSourcePosX((short) 1);
- break;
- default:
- log.info("{}鍙峰爢鍨涙満涓嬫柟鍛戒护閿欒锛屾簮鎺掞細{}", command.getCrnNo(), command.getSourcePosX());
- }
- switch (command.getDestinationPosX()) {
- case 1:
- command.setDestinationPosX((short) 4);
- break;
- case 2:
- command.setDestinationPosX((short) 3);
- break;
- case 3:
- command.setDestinationPosX((short) 2);
- break;
- case 4:
- command.setDestinationPosX((short) 1);
- break;
- case 5:
- command.setDestinationPosX((short) 4);
- break;
- case 6:
- command.setDestinationPosX((short) 3);
- break;
- case 7:
- command.setDestinationPosX((short) 2);
- break;
- case 8:
- command.setDestinationPosX((short) 1);
- break;
- default:
- log.info("{}鍙峰爢鍨涙満涓嬫柟鍛戒护閿欒锛岀洰鏍囨帓锛歿}", command.getCrnNo(), command.getSourcePosX());
}
command.setCrnNo(slave.getId());
short[] array = new short[9];
- if (!command.getTaskModeType().equals(CrnTaskModeType.CLEAR)) {
+ if (command.getAckFinish() == 0) {
array[0] = 5;
} else {
- array[0] = 7;
+ array[0] = 0;
}
array[1] = command.getSourcePosZ();
array[2] = command.getSourcePosY();
@@ -319,15 +351,21 @@
array[7] = command.getSourceStaNo();
array[8] = command.getDestinationStaNo();
// 浣滀笟淇℃伅
- OperateResult result = siemensNet.Write("DB10.0", array);
- // 浠诲姟鍙�
- OperateResult result1 = siemensNet.Write("DB10.24", command.getTaskNo());
- // 缁撴潫浣�
- OperateResult result2 = siemensNet.Write("DB10.28.1", true);
- if (result.IsSuccess && result1.IsSuccess && result2.IsSuccess) {
+ OperateResult result = siemensNet.Write("DB1000.0", array);
+ // 浠诲姟鍙� + 瀹屾垚浣�
+ short[] array2 = new short[2];
+ array2[0] = command.getTaskNo();
+ array2[1] = command.getAckFinish();
+ OperateResult result1 = siemensNet.Write("DB1000.24", array2);
- try {
- // 鏃ュ織璁板綍
+ // 缁撴潫浣�
+ if (command.getAckFinish() == 0) {
+ OperateResult result2 = siemensNet.Write("DB1000.28.1", true);
+ }
+
+ // 鏃ュ織璁板綍
+ try {
+ if (command.getAckFinish() != 1) {
BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
BasCrnOpt basCrnOpt = new BasCrnOpt(
command.getTaskNo().intValue(), // 浠诲姟鍙�
@@ -337,19 +375,21 @@
command.getSourcePosX().intValue(), // 婧愭帓
command.getSourcePosY().intValue(), // 婧愬垪
command.getSourcePosZ().intValue(), // 婧愬眰
- command.getSourceStaNo().intValue(), // 婧愮珯
+ null, // 婧愮珯
command.getDestinationPosX().intValue(), // 鐩爣鎺�
command.getDestinationPosY().intValue(), // 鐩爣鍒�
command.getDestinationPosZ().intValue(), // 鐩爣灞�
- command.getDestinationStaNo().intValue(), // 鐩爣绔�
+ null, // 鐩爣绔�
null, // 鍝嶅簲缁撴灉
null, // 淇敼鏃堕棿
null // 淇敼浜哄憳
);
bean.insert(basCrnOpt);
- } catch (Exception ignore) {}
+ }
+ } catch (Exception ignore) {}
- log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+ if (result.IsSuccess && result1.IsSuccess) {
+ log.warn("鍫嗗灈鏈哄懡浠や笅鍙慬id:{},鏃堕棿锛歿}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
return true;
} else {
--
Gitblit v1.9.1