From 384847fe1506e4cf03a6431b1929cbdd72617d51 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 28 十一月 2023 11:21:08 +0800
Subject: [PATCH] #增加备注
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 185 +++++++++++++++++++++++++++-------------------
1 files changed, 108 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 52bf8d0..f3d986c 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -274,80 +274,80 @@
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]);
- crnProtocol.setCorrection(bool1[3]);
- crnProtocol.setTuError(bool1[4]);
- crnProtocol.setNoneError(bool1[5]);
- crnProtocol.setStockError(bool1[6]);
- crnProtocol.setJobInvalid(bool1[7]);
- boolean[] bool2 = siemensNet.getByteTransform().TransBool(result.Content, 61, 1); // 63
- crnProtocol.setIdle(bool2[0]);
- crnProtocol.setControl(bool2[1]);
- crnProtocol.setStopQuasi(bool2[2]);
- crnProtocol.setRunning(bool2[3]);
- crnProtocol.setFault(bool2[4]);
- crnProtocol.setForkHome(bool2[5]);
- crnProtocol.setForkSingleLeft(bool2[6]);
- crnProtocol.setForkSingleRight(bool2[7]);
- boolean[] bool3 = siemensNet.getByteTransform().TransBool(result.Content, 62, 1); // 64
- crnProtocol.setForkDoubleLeft(bool3[0]);
- crnProtocol.setForkDoubleRight(bool3[1]);
- crnProtocol.setSingleHigh(bool3[2]);
- crnProtocol.setSingleLow(bool3[3]);
- crnProtocol.setDoubleHigh(bool3[4]);
- crnProtocol.setDoubleLow(bool3[5]);
- crnProtocol.setPlatformHigh(bool3[6]);
- crnProtocol.setPlatformLow(bool3[7]);
- boolean[] bool4 = siemensNet.getByteTransform().TransBool(result.Content, 64, 1); // 66
- crnProtocol.setLoaded((short) (bool4[4]?1:0)); // 鏈夌墿
+// boolean[] bool1 = siemensNet.getByteTransform().TransBool(result.Content, 60, 1); // 62
+// crnProtocol.setConnStatus(bool1[0]);
+// crnProtocol.setCorrection(bool1[3]);
+// crnProtocol.setTuError(bool1[4]);
+// crnProtocol.setNoneError(bool1[5]);
+// crnProtocol.setStockError(bool1[6]);
+// crnProtocol.setJobInvalid(bool1[7]);
+// boolean[] bool2 = siemensNet.getByteTransform().TransBool(result.Content, 61, 1); // 63
+// crnProtocol.setIdle(bool2[0]);
+// crnProtocol.setControl(bool2[1]);
+// crnProtocol.setStopQuasi(bool2[2]);
+// crnProtocol.setRunning(bool2[3]);
+// crnProtocol.setFault(bool2[4]);
+// crnProtocol.setForkHome(bool2[5]);
+// crnProtocol.setForkSingleLeft(bool2[6]);
+// crnProtocol.setForkSingleRight(bool2[7]);
+// boolean[] bool3 = siemensNet.getByteTransform().TransBool(result.Content, 62, 1); // 64
+// crnProtocol.setForkDoubleLeft(bool3[0]);
+// crnProtocol.setForkDoubleRight(bool3[1]);
+// crnProtocol.setSingleHigh(bool3[2]);
+// crnProtocol.setSingleLow(bool3[3]);
+// crnProtocol.setDoubleHigh(bool3[4]);
+// crnProtocol.setDoubleLow(bool3[5]);
+// crnProtocol.setPlatformHigh(bool3[6]);
+// crnProtocol.setPlatformLow(bool3[7]);
+// boolean[] bool4 = siemensNet.getByteTransform().TransBool(result.Content, 64, 1); // 66
+// crnProtocol.setLoaded((short) (bool4[4]?1:0)); // 鏈夌墿
// 閫熷害
- crnProtocol.setXSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 22)); // 24
- crnProtocol.setYSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 24)); // 26
- crnProtocol.setZSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 26)); // 28
- // 绱閲岀▼銆佹椂闀�
- 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
+// crnProtocol.setXSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 22)); // 24
+// crnProtocol.setYSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 24)); // 26
+// crnProtocol.setZSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 26)); // 28
+// // 绱閲岀▼銆佹椂闀�
+// 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
- // 澧炲己
- if (crnProtocol.getForkHome()) {
- crnProtocol.setForkPos(CrnForkPosType.HOME);
- }
- if (crnProtocol.getForkSingleLeft()) {
- crnProtocol.setForkPos(CrnForkPosType.LEFT);
- }
- if (crnProtocol.getForkSingleRight()) {
- crnProtocol.setForkPos(CrnForkPosType.RIGHT);
- }
- if (crnProtocol.getForkDoubleLeft()) {
- crnProtocol.setForkPos(CrnForkPosType._LEFT);
- }
- if (crnProtocol.getForkDoubleRight()) {
- crnProtocol.setForkPos(CrnForkPosType._RIGHT);
- }
- if (crnProtocol.getSingleHigh()) {
- crnProtocol.setLiftPos(CrnLiftPosType.UP);
- }
- if (crnProtocol.getSingleLow()) {
- crnProtocol.setLiftPos(CrnLiftPosType.DOWN);
- }
- if (crnProtocol.getDoubleHigh()) {
- crnProtocol.setLiftPos(CrnLiftPosType._UP);
- }
- if (crnProtocol.getDoubleLow()) {
- crnProtocol.setLiftPos(CrnLiftPosType._DOWN);
- }
- if (crnProtocol.getIdle()) {
- crnProtocol.setStatus(CrnStatusType.IDLE);
- }
+// // 澧炲己
+// if (crnProtocol.getForkHome()) {
+// crnProtocol.setForkPos(CrnForkPosType.HOME);
+// }
+// if (crnProtocol.getForkSingleLeft()) {
+// crnProtocol.setForkPos(CrnForkPosType.LEFT);
+// }
+// if (crnProtocol.getForkSingleRight()) {
+// crnProtocol.setForkPos(CrnForkPosType.RIGHT);
+// }
+// if (crnProtocol.getForkDoubleLeft()) {
+// crnProtocol.setForkPos(CrnForkPosType._LEFT);
+// }
+// if (crnProtocol.getForkDoubleRight()) {
+// crnProtocol.setForkPos(CrnForkPosType._RIGHT);
+// }
+// if (crnProtocol.getSingleHigh()) {
+// crnProtocol.setLiftPos(CrnLiftPosType.UP);
+// }
+// if (crnProtocol.getSingleLow()) {
+// crnProtocol.setLiftPos(CrnLiftPosType.DOWN);
+// }
+// if (crnProtocol.getDoubleHigh()) {
+// crnProtocol.setLiftPos(CrnLiftPosType._UP);
+// }
+// if (crnProtocol.getDoubleLow()) {
+// crnProtocol.setLiftPos(CrnLiftPosType._DOWN);
+// }
+// if (crnProtocol.getIdle()) {
+// crnProtocol.setStatus(CrnStatusType.IDLE);
+// }
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
// 澶嶄綅淇″彿
- if (crnProtocol.getTaskFinish() == 1) {
+ if (crnProtocol.getTaskFinish() == 0) {
if (resetFlag) {
CrnCommand crnCommand = new CrnCommand();
crnCommand.setAckFinish((short)1);
@@ -392,7 +392,7 @@
}
command.setCrnNo(slave.getId());
- short[] array = new short[12];
+ short[] array = new short[10];
if (Cools.isEmpty(command.getAckFinish())) {
array[0] = 5;
} else {
@@ -413,7 +413,7 @@
// }else {
array[4] = command.getSourcePosX();
// }
- array[5] = command.getDestinationPosY();
+ array[5] = command.getSourcePosY();
array[6] = command.getDestinationPosZ();
// if (rowOne.contains(command.getDestinationPosX())){
@@ -429,9 +429,7 @@
// }
array[8] = command.getDestinationPosY();
array[9] = command.getCommand();
- if (!Cools.isEmpty(command.getAuto())){
- array[10] = command.getAuto();
- }
+
// 浣滀笟淇℃伅
@@ -448,7 +446,7 @@
// }
// 鏃ュ織璁板綍
- try {
+// try {
if (command.getAckFinish() != 1) {
BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
BasCrnOpt basCrnOpt = new BasCrnOpt(
@@ -470,14 +468,29 @@
);
bean.insert(basCrnOpt);
}
- } catch (Exception ignore) {}
+// } catch (Exception ignore) {}
//鏇存柊鍛戒护鏃ュ織
CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
CommandInfo commandInfo = commandInfoService.selectById(command.getCommandId());
- CommandInfoLog commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
- commandInfoLog.setId(null);
+ CommandInfoLog commandInfoLog = new CommandInfoLog();
+ if (commandInfo != null) {
+ commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
+ commandInfoLog.setId(null);
+ }else {
+ Date now = new Date();
+ commandInfoLog.setCommand(JSON.toJSONString(command));
+ commandInfoLog.setCommandStatus(3);
+ commandInfoLog.setStartTime(now);
+ commandInfoLog.setExecuteTime(now);
+ commandInfoLog.setCompleteTime(now);
+ commandInfoLog.setDevice(SlaveType.Devp.toString());
+ commandInfoLog.setWrkNo(9999);
+ commandInfoLog.setTaskNo("9999");
+ commandInfoLog.setCommandDesc("鎵嬪姩鍛戒护");
+ }
+
if (result.IsSuccess) {
log.warn("鍫嗗灈鏈哄懡浠や笅鍙慬id:{},鏃堕棿锛歿}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));
@@ -512,9 +525,27 @@
log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
+ OperateResult result = new OperateResult();
short[] array = new short[1];
array[0] = command.getAuto();
- OperateResult result = siemensNet.Write("DB100.20", array);
+ if(command.getAuto() !=0){
+ array[0] = command.getAuto();
+ result = siemensNet.Write("DB103.0", array);
+ }else if (command.getOnlineWrk1() != 0){
+ array[0] = command.getOnlineWrk1();
+ result = siemensNet.Write("DB103.2", array);
+ }else if (command.getOnlineWrk2() !=0){
+ array[0] = command.getOnlineWrk2();
+ result = siemensNet.Write("DB103.4", array);
+ }else if (command.getOnlineWrk3() != 0){
+ array[0] = command.getOnlineWrk3();
+ result = siemensNet.Write("DB103.6", array);
+ }else if (command.getOnlineWrk4() != 0){
+ array[0] = command.getOnlineWrk4();
+ result = siemensNet.Write("DB103.8", array);
+ }
+
+
//鏇存柊鍛戒护鏃ュ織
CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
--
Gitblit v1.9.1