From 21eac69df8b18ef44ab267a4e2efe714f985d8d9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 29 七月 2023 14:26:57 +0800
Subject: [PATCH] 提升机穿梭车配置
---
src/main/java/com/zy/core/thread/LiftThread.java | 423 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 271 insertions(+), 152 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LiftThread.java b/src/main/java/com/zy/core/thread/LiftThread.java
index 70151e9..8e1f381 100644
--- a/src/main/java/com/zy/core/thread/LiftThread.java
+++ b/src/main/java/com/zy/core/thread/LiftThread.java
@@ -4,14 +4,19 @@
import HslCommunication.Core.Types.OperateResult;
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.ModBus.ModbusTcpNet;
+import HslCommunication.Profinet.Siemens.SiemensPLCS;
+import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasLift;
import com.zy.asrs.entity.BasLiftOpt;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.BasLiftOptService;
import com.zy.asrs.service.BasLiftService;
+import com.zy.asrs.utils.Utils;
import com.zy.common.utils.CommonUtils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.DevpThread;
@@ -21,7 +26,6 @@
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.*;
-import com.zy.core.model.DevpSlave;
import com.zy.core.model.LiftSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.*;
@@ -42,7 +46,7 @@
@Slf4j
public class LiftThread implements Runnable, ThreadHandler {
- private ModbusTcpNet modbusTcpNet;
+ private SiemensS7Net siemensS7Net;
private LiftSlave slave;
private LiftProtocol liftProtocol;
private RedisUtil redisUtil;
@@ -65,7 +69,7 @@
switch (step) {
// 璇绘暟鎹�
case 1:
- readStatus();
+ read();
break;
// 鍐欏叆鏁版嵁
case 2:
@@ -89,10 +93,8 @@
public boolean connect() {
boolean result = false;
//-------------------------鎻愬崌鏈鸿繛鎺ユ柟娉�------------------------//
- modbusTcpNet = new ModbusTcpNet(slave.getIp(), slave.getPort(), (byte) 0x02);
- // 褰撲綘闇�瑕佹寚瀹氭牸寮忕殑鏁版嵁瑙ｆ瀽鏃讹紝灏遍渶瑕佽缃笅闈㈢殑杩欎釜淇℃伅
- modbusTcpNet.setDataFormat(DataFormat.ABCD);
- OperateResult connect = modbusTcpNet.ConnectServer();
+ siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
+ OperateResult connect = siemensS7Net.ConnectServer();
if(connect.IsSuccess){
result = true;
OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}銆戞彁鍗囨満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
@@ -101,19 +103,40 @@
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戞彁鍗囨満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
log.error("鎻愬崌鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}] ", slave.getId(), slave.getIp(), slave.getPort());
}
- modbusTcpNet.ConnectClose();
+ siemensS7Net.ConnectClose();
//-------------------------鎻愬崌鏈鸿繛鎺ユ柟娉�------------------------//
return result;
}
@Override
public void close() {
- modbusTcpNet.ConnectClose();
+ siemensS7Net.ConnectClose();
+ }
+
+ private void read() {
+ try {
+ readStatus();
+
+ //鎻愬崌鏈哄浜庤繍琛岀姸鎬侊紝灏嗘爣璁扮疆涓簍rue
+ if (liftProtocol.getRunning()) {
+ liftProtocol.setPakMk(true);
+ }
+
+ //鎻愬崌鏈哄浜庢湭杩愯銆佸氨缁�佹爣璁皌rue銆佹湁浠诲姟鍙�
+ if (!liftProtocol.getRunning()
+ && liftProtocol.getPakMk()
+ && liftProtocol.getTaskNo() != 0) {
+ //杩樻湁鏈畬鎴愮殑鍛戒护
+ executeWork(liftProtocol.getTaskNo());
+ }
+ } catch (Exception e) {
+ OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戞彁鍗囨満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+ }
}
private void readStatus() {
try {
- OperateResultExOne<byte[]> result = modbusTcpNet.Read("41117", (short) 50);
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.200", (short) 24);
if (result.IsSuccess) {
if (null == liftProtocol) {
liftProtocol = new LiftProtocol();
@@ -122,108 +145,97 @@
//----------璇诲彇鎻愬崌鏈虹姸鎬�-----------
//鑾峰彇鏁版嵁
- byte[] content = result.Content;
- //鎻愬崌鏈洪攣瀹�
- liftProtocol.setLiftLock(CommonUtils.shortToBoolean(modbusTcpNet.getByteTransform().TransInt16(content, 0)));
- //浣嶇疆鍒拌揪鍙嶉
- liftProtocol.setPositionArrivalFeedback(modbusTcpNet.getByteTransform().TransInt16(content,2));
-
- byte by = modbusTcpNet.getByteTransform().TransByte(content, 5);
- int[] datas = CommonUtils.byteToBits(by);
- //鍑嗗灏辩华
- liftProtocol.setReady(CommonUtils.intToBoolean(datas[0]));
- //杩愯涓�
- liftProtocol.setRunning(CommonUtils.intToBoolean(datas[1]));
- //鑱旀満/鍗曟満
- liftProtocol.setMode(CommonUtils.intToBoolean(datas[2]));
- //杈撻�佺嚎鍓嶇鍏夌數鏈夎揣
- liftProtocol.setLineFrontHasStock(CommonUtils.intToBoolean(datas[3]));
- //杈撻�佺嚎姝ｈ浆鍙嶉
- liftProtocol.setForwardRotationFeedback(CommonUtils.intToBoolean(datas[4]));
- //杈撻�佺嚎鍙嶈浆鍙嶉
- liftProtocol.setReverseFeedback(CommonUtils.intToBoolean(datas[5]));
- //杈撻�佺嚎鐢垫満杩囪浇
- liftProtocol.setMotorOverload(CommonUtils.intToBoolean(datas[6]));
- //杈撻�佺嚎鏈鍏夌數鏈夎揣
- liftProtocol.setLineEndHasStock(CommonUtils.intToBoolean(datas[7]));
- //杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�
- liftProtocol.setInConveyLineCardTrayAlarm(CommonUtils.intToBoolean(datas[8]));
- //鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�
- liftProtocol.setOutConveyLineCardTrayAlarm(CommonUtils.intToBoolean(datas[9]));
- //骞冲彴浣嶇疆鍋忓樊鎶ヨ
- liftProtocol.setPlatPositionDeviationAlarm(CommonUtils.intToBoolean(datas[10]));
- //骞冲彴鎵煩鍋忓樊鎶ヨ
- liftProtocol.setPlatTorqueDeviationAlarm(CommonUtils.intToBoolean(datas[11]));
- //骞冲彴鍥涘悜杞︽娴�
- liftProtocol.setPlatShuttleCheck(CommonUtils.intToBoolean(datas[12]));
-
-
- //鏈氨缁姸鎬�
- liftProtocol.setNotReady(modbusTcpNet.getByteTransform().TransInt16(content,6));
- //浼烘湇1閿欒
- liftProtocol.setServoError1(modbusTcpNet.getByteTransform().TransInt16(content,8));
- //浼烘湇2閿欒
- liftProtocol.setServoError2(modbusTcpNet.getByteTransform().TransInt16(content,10));
- //浼烘湇3閿欒
- liftProtocol.setServoError3(modbusTcpNet.getByteTransform().TransInt16(content,12));
- //浼烘湇4閿欒
- liftProtocol.setServoError4(modbusTcpNet.getByteTransform().TransInt16(content,14));
- //鎻愬崌鏈哄疄闄呴�熷害鍙嶉
- liftProtocol.setLiftActualSpeed(modbusTcpNet.getByteTransform().TransInt16(content,16));
-
- ///璇诲彇鎻愬崌鏈虹姸鎬�-end
-
- //鎻愬崌鏈哄浜庤繍琛岀姸鎬侊紝灏嗘爣璁扮疆涓簍rue
- if (liftProtocol.getRunning()) {
- liftProtocol.setPakMk(true);
- }
-
- //鎻愬崌鏈哄浜庢湭杩愯銆佸氨缁�佹爣璁皌rue銆佹湁浠诲姟鍙�
- if (!liftProtocol.getRunning()
- && liftProtocol.getPakMk()
- && liftProtocol.getTaskNo() != 0) {
- //杩樻湁鏈畬鎴愮殑鍛戒护
- executeWork(liftProtocol.getTaskNo());
- }
-
- //灏嗘彁鍗囨満鐘舵�佷繚瀛樿嚦鏁版嵁搴�
- BasLiftService liftService = SpringUtils.getBean(BasLiftService.class);
- BasLift basLift = liftService.selectById(liftProtocol.getLiftNo());
- if (basLift == null) {
- basLift = new BasLift();
- //鎻愬崌鏈哄彿
- basLift.setLiftNo(slave.getId());
- liftService.insert(basLift);
- }
- basLift.setStatus(liftProtocol.getProtocolStatus());
- basLift.setWrkNo(liftProtocol.getTaskNo().intValue());
- basLift.setUpdateTime(new Date());
- basLift.setPakMk(liftProtocol.getPakMk());
- basLift.setLiftLock(liftProtocol.getLiftLock());
- basLift.setPositionArrivalFeedback(liftProtocol.getPositionArrivalFeedback().intValue());
- basLift.setReady(liftProtocol.getReady());
- basLift.setRunning(liftProtocol.getRunning());
- basLift.setMode(liftProtocol.getMode());
- basLift.setLineFrontHasStock(liftProtocol.getLineFrontHasStock());
- basLift.setForwardRotationFeedback(liftProtocol.getForwardRotationFeedback());
- basLift.setReverseFeedback(liftProtocol.getReverseFeedback());
- basLift.setMotorOverload(liftProtocol.getMotorOverload());
- basLift.setLineEndHasStock(liftProtocol.getLineEndHasStock());
- basLift.setInConveyLineCardTrayAlarm(liftProtocol.getInConveyLineCardTrayAlarm());
- basLift.setOutConveyLineCardTrayAlarm(liftProtocol.getOutConveyLineCardTrayAlarm());
- basLift.setPlatPositionDeviationAlarm(liftProtocol.getPlatPositionDeviationAlarm());
- basLift.setPlatTorqueDeviationAlarm(liftProtocol.getPlatTorqueDeviationAlarm());
- basLift.setPlatShuttleCheck(liftProtocol.getPlatShuttleCheck());
- basLift.setNotReady(liftProtocol.getNotReady().intValue());
- basLift.setServoError1(liftProtocol.getServoError1().intValue());
- basLift.setServoError2(liftProtocol.getServoError2().intValue());
- basLift.setServoError3(liftProtocol.getServoError3().intValue());
- basLift.setServoError4(liftProtocol.getServoError4().intValue());
- basLift.setLiftActualSpeed(liftProtocol.getLiftActualSpeed().intValue());
- if (liftService.updateById(basLift)) {
- OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-// log.info(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
- }
+// byte[] content = result.Content;
+// //鎻愬崌鏈洪攣瀹�
+// liftProtocol.setLiftLock(CommonUtils.shortToBoolean(modbusTcpNet.getByteTransform().TransInt16(content, 0)));
+// //浣嶇疆鍒拌揪鍙嶉
+// liftProtocol.setPositionArrivalFeedback(modbusTcpNet.getByteTransform().TransInt16(content,2));
+//
+//
+// byte b1 = modbusTcpNet.getByteTransform().TransByte(content, 5);
+// byte b2 = modbusTcpNet.getByteTransform().TransByte(content, 4);
+// int[] datas1 = CommonUtils.byteToBits(b1);
+// int[] datas2 = CommonUtils.byteToBits(b2);
+// //鍑嗗灏辩华
+// liftProtocol.setReady(CommonUtils.intToBoolean(datas1[0]));
+// //杩愯涓�
+// liftProtocol.setRunning(CommonUtils.intToBoolean(datas1[1]));
+// //鑱旀満/鍗曟満
+// liftProtocol.setMode(CommonUtils.intToBoolean(datas1[2]));
+// //杈撻�佺嚎鍓嶇鍏夌數鏈夎揣
+// liftProtocol.setLineFrontHasStock(CommonUtils.intToBoolean(datas1[3]));
+// //杈撻�佺嚎姝ｈ浆鍙嶉
+// liftProtocol.setForwardRotationFeedback(CommonUtils.intToBoolean(datas1[4]));
+// //杈撻�佺嚎鍙嶈浆鍙嶉
+// liftProtocol.setReverseFeedback(CommonUtils.intToBoolean(datas1[5]));
+// //杈撻�佺嚎鐢垫満杩囪浇
+// liftProtocol.setMotorOverload(CommonUtils.intToBoolean(datas1[6]));
+// //杈撻�佺嚎鏈鍏夌數鏈夎揣
+// liftProtocol.setLineEndHasStock(CommonUtils.intToBoolean(datas1[7]));
+// //杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�
+// liftProtocol.setInConveyLineCardTrayAlarm(CommonUtils.intToBoolean(datas2[0]));
+// //鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�
+// liftProtocol.setOutConveyLineCardTrayAlarm(CommonUtils.intToBoolean(datas2[1]));
+// //骞冲彴浣嶇疆鍋忓樊鎶ヨ
+// liftProtocol.setPlatPositionDeviationAlarm(CommonUtils.intToBoolean(datas2[2]));
+// //骞冲彴鎵煩鍋忓樊鎶ヨ
+// liftProtocol.setPlatTorqueDeviationAlarm(CommonUtils.intToBoolean(datas2[3]));
+// //骞冲彴鍥涘悜杞︽娴�
+// liftProtocol.setPlatShuttleCheck(CommonUtils.intToBoolean(datas2[4]));
+//
+// //鏈氨缁姸鎬�
+// liftProtocol.setNotReady(modbusTcpNet.getByteTransform().TransInt16(content,6));
+// //浼烘湇1閿欒
+// liftProtocol.setServoError1(modbusTcpNet.getByteTransform().TransInt16(content,8));
+// //浼烘湇2閿欒
+// liftProtocol.setServoError2(modbusTcpNet.getByteTransform().TransInt16(content,10));
+// //浼烘湇3閿欒
+// liftProtocol.setServoError3(modbusTcpNet.getByteTransform().TransInt16(content,12));
+// //浼烘湇4閿欒
+// liftProtocol.setServoError4(modbusTcpNet.getByteTransform().TransInt16(content,14));
+// //鎻愬崌鏈哄疄闄呴�熷害鍙嶉
+// liftProtocol.setLiftActualSpeed(modbusTcpNet.getByteTransform().TransInt16(content,16));
+//
+// ///璇诲彇鎻愬崌鏈虹姸鎬�-end
+//
+// //灏嗘彁鍗囨満鐘舵�佷繚瀛樿嚦鏁版嵁搴�
+// BasLiftService liftService = SpringUtils.getBean(BasLiftService.class);
+// BasLift basLift = liftService.selectById(liftProtocol.getLiftNo());
+// if (basLift == null) {
+// basLift = new BasLift();
+// //鎻愬崌鏈哄彿
+// basLift.setLiftNo(slave.getId());
+// liftService.insert(basLift);
+// }
+// basLift.setStatus(liftProtocol.getProtocolStatus());
+// basLift.setWrkNo(liftProtocol.getTaskNo().intValue());
+// basLift.setUpdateTime(new Date());
+// basLift.setPakMk(liftProtocol.getPakMk());
+// basLift.setLiftLock(liftProtocol.getLiftLock());
+// basLift.setPositionArrivalFeedback(liftProtocol.getPositionArrivalFeedback().intValue());
+// basLift.setReady(liftProtocol.getReady());
+// basLift.setRunning(liftProtocol.getRunning());
+// basLift.setMode(liftProtocol.getMode());
+// basLift.setLineFrontHasStock(liftProtocol.getLineFrontHasStock());
+// basLift.setForwardRotationFeedback(liftProtocol.getForwardRotationFeedback());
+// basLift.setReverseFeedback(liftProtocol.getReverseFeedback());
+// basLift.setMotorOverload(liftProtocol.getMotorOverload());
+// basLift.setLineEndHasStock(liftProtocol.getLineEndHasStock());
+// basLift.setInConveyLineCardTrayAlarm(liftProtocol.getInConveyLineCardTrayAlarm());
+// basLift.setOutConveyLineCardTrayAlarm(liftProtocol.getOutConveyLineCardTrayAlarm());
+// basLift.setPlatPositionDeviationAlarm(liftProtocol.getPlatPositionDeviationAlarm());
+// basLift.setPlatTorqueDeviationAlarm(liftProtocol.getPlatTorqueDeviationAlarm());
+// basLift.setPlatShuttleCheck(liftProtocol.getPlatShuttleCheck());
+// basLift.setNotReady(liftProtocol.getNotReady().intValue());
+// basLift.setServoError1(liftProtocol.getServoError1().intValue());
+// basLift.setServoError2(liftProtocol.getServoError2().intValue());
+// basLift.setServoError3(liftProtocol.getServoError3().intValue());
+// basLift.setServoError4(liftProtocol.getServoError4().intValue());
+// basLift.setLiftActualSpeed(liftProtocol.getLiftActualSpeed().intValue());
+// if (liftService.updateById(basLift)) {
+// OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+//// log.info(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+// }
}else {
OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆憑1}鎻愬崌鏈簆lc鐘舵�佷俊鎭け璐�", DateUtils.convert(new Date()), slave.getId()));
@@ -231,7 +243,6 @@
}
} catch (Exception e) {
OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戞彁鍗囨満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- initLift();
}
}
@@ -241,7 +252,57 @@
return false;
}
- command.setLiftNo(slave.getId().shortValue());
+// command.setLiftNo(slave.getId().shortValue());
+// short[] array = getCommandArr(command);//鑾峰彇鍛戒护鎶ユ枃
+//
+// try {
+// Thread.sleep(500);//鍛戒护涓嬪彂鍓嶄紤鐪�
+// } catch (InterruptedException e) {
+// throw new RuntimeException(e);
+// }
+//
+// OperateResult result = modbusTcpNet.Write("41088", array);
+// if (result != null && result.IsSuccess) {
+// News.info("鎻愬崌鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+// OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+//
+// try {
+// Thread.sleep(500);//鍛戒护涓嬪彂鍚庝紤鐪�
+// } catch (InterruptedException e) {
+// throw new RuntimeException(e);
+// }
+//
+// for (int i = 0; i < 5; i++) {
+// if (command.getRun().intValue() == 4 || command.getRun().intValue() == 5) {
+// break;//绯荤粺澶嶄綅鍜岄摼鏉″仠姝㈣浆鍔ㄤ笉闇�瑕侀噸鍙�
+// }
+// readStatus();//閲嶆柊璇诲彇鐘舵��
+// if (liftProtocol.getRunning()) {
+// break;
+// }
+//
+// //鍒ゆ柇鏄惁杩愯涓紝濡備笉杩愯锛岄噸鏂颁笅鍙戝懡浠�
+// result = modbusTcpNet.Write("41088", array);
+// News.info("鎻愬崌鏈哄懡浠や笅鍙慬id:{}] >>>>> {},娆℃暟锛歿}", slave.getId(), JSON.toJSON(command), i);
+// OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2},娆℃暟锛歿}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command), i));
+// try {
+// Thread.sleep(300);//鍛戒护涓嬪彂鍚庝紤鐪�
+// } catch (InterruptedException e) {
+// throw new RuntimeException(e);
+// }
+// }
+// return true;
+// } else {
+// OutputQueue.LIFT.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;
+// }
+
+ return true;
+ }
+
+ //鑾峰彇鍛戒护鎶ユ枃
+ private short[] getCommandArr(LiftCommand command) {
// 寮�濮嬩换鍔�
short[] array = new short[30];
//寮�濮嬭繍琛�
@@ -275,16 +336,14 @@
array[29] = command.getLiftLockShortValue();
}
- OperateResult result = modbusTcpNet.Write("41088", array);;
- if (result != null && result.IsSuccess) {
- News.info("鎻愬崌鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
- OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
- return true;
- } else {
- OutputQueue.LIFT.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;
+ if (array[2] == 0) {
+ // 寮�濮嬩换鍔�
+ short[] tmp = new short[2];
+ tmp[0] = array[0];
+ tmp[1] = array[1];
+ array = tmp;
}
+ return array;
}
//鍒嗛厤浠诲姟
@@ -347,9 +406,7 @@
return false;
}
- //灏嗘爣璁扮疆涓篺alse(闃叉閲嶅彂)
- liftProtocol.setPakMk(false);
-
+ WrkMastMapper wrkMastMapper = SpringUtils.getBean(WrkMastMapper.class);
Object o = redisUtil.get("lift_wrk_no_" + wrkNo);
if (o == null) {
return false;
@@ -362,12 +419,50 @@
int size = commands.size();
LiftAssignCommand assignCommand = redisCommand.getAssignCommand();
+ if (commandStep != 0) {
+ //鍒ゆ柇涓婁竴鏉℃寚浠ゆ槸鍚﹀畬鎴�
+ LiftCommand command = commands.get(commandStep - 1);
+ if (command.getRun().intValue() == 1) {
+ //鎻愬崌鏈哄崌闄嶅懡浠�
+ if (command.getDistPosition().intValue() == liftProtocol.getPositionArrivalFeedback().intValue()) {
+ //鎻愬崌鏈虹洰鏍囨ゼ灞傚拰瀹為檯妤煎眰鐩稿悓锛屽垯璁ゅ畾鍛戒护瀹屾垚
+ command.setComplete(true);
+ }
+ } else if (command.getRun().intValue() == 2 || command.getRun().intValue() == 3) {
+ //鏃犺揣姝ｈ浆锛屾湁璐ф杞�
+ if (!liftProtocol.getForwardRotationFeedback()) {
+ //杈撻�佺嚎姝ｈ浆鍙嶉涓嶅湪杩愯涓紝璁ゅ畾鍛戒护瀹屾垚
+ command.setComplete(true);
+ }
+ } else if (command.getRun().intValue() == 6 || command.getRun().intValue() == 7) {
+ //鏈夎揣鍙嶈浆锛屾棤璐у弽杞�
+ if (!liftProtocol.getReverseFeedback()) {
+ //杈撻�佺嚎鍙嶈浆鍙嶉涓嶅湪杩愯涓紝璁ゅ畾鍛戒护瀹屾垚
+ command.setComplete(true);
+ }
+ } else if (command.getRun().intValue() == 4) {
+ //杈撻�佺嚎鍋滄
+ if (!liftProtocol.getForwardRotationFeedback() && !liftProtocol.getReverseFeedback()) {
+ //杈撻�佺嚎姝ｈ浆鍙嶈浆閮戒笉鍦ㄨ繍琛屼腑锛岃瀹氬懡浠ゅ畬鎴�
+ command.setComplete(true);
+ }
+ }
+ //浠诲姟鏁版嵁淇濆瓨鍒皉edis
+ redisUtil.set("lift_wrk_no_" + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
+
+ if (!command.getComplete()) {
+ //涓婁竴鏉′换鍔℃湭瀹屾垚锛岀姝笅鍙戝懡浠�
+ return false;
+ }
+ }
+
//鍙栧嚭鍛戒护
LiftCommand command = commands.get(commandStep);
if (command.getOperaStaNo() != null && command.getDevpId() != null) {
//绔欑偣鍜岃緭閫佺嚎ID涓嶄负null锛岄渶瑕佷笅鍙戠珯鐐规寚浠よ皟搴︽寚瀹氱珯鐐硅繘琛岄摼鏉¤浆鍔�
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, command.getDevpId());
StaProtocol staProtocol = devpThread.getStation().get(command.getOperaStaNo().intValue());
+ staProtocol = staProtocol.clone();
if (!staProtocol.isLiftArrival()) {//閾炬潯杞姩鏉′欢锛岄渶瑕佹湁鎻愬崌鏈哄埌浣嶄俊鍙�
liftProtocol.setPakMk(true);
return false;
@@ -384,6 +479,24 @@
boolean result1 = MessageQueue.offer(SlaveType.Devp, devpId, new Task(3, staProtocol));//涓嬪彂鍛戒护浣胯緭閫佺嚎閾炬潯杩愯浆
}
+ WrkMast wrkMast = wrkMastMapper.selectByWorkNo(wrkNo.intValue());
+ if (wrkMast != null) {
+ if (wrkMast.getWrkSts() == 28) {//28.鎻愬崌鏈烘惉杩愪腑
+ if (command.getRun().intValue() == 1 && command.getDistPosition().intValue() == LiftLevType.TWO.lev) {
+ //鎻愬崌鏈虹Щ鍔ㄤ笖浣嶇疆鏄埌杈撻�佺嚎妤煎眰锛岄渶瑕佸垽鏂珯鐐硅揣鐗╂槸鍚︽棤鐗╋紝鎻愬崌鏈烘槸鍚︽湁鐗�
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, command.getDevpId());
+ //宸ヤ綔妗ｆ簮搴撲綅妤煎眰
+ int wrkMastLocNoLey = Utils.getLev(wrkMast.getSourceLocNo());
+ StaProtocol staProtocol = devpThread.getStation().get(Utils.levToOutInStaNo(wrkMastLocNoLey >= 2 ? wrkMastLocNoLey + 1 : wrkMastLocNoLey));//璧峰绔欑偣
+ //鍒ゆ柇杈撻�佺珯鐐规槸鍚︽湁鐗╋紝鍙湁鏃犵墿鎯呭喌鎵嶈兘缁х画璋冨害鎻愬崌鏈�
+ if (staProtocol.isLoading()) {
+ //鏈夌墿绂佹璋冨害
+ return false;
+ }
+ }
+ }
+ }
+
//涓嬪彂鍛戒护
if (!write(command)) {
News.error("鎻愬崌鏈哄懡浠や笅鍙戝け璐ワ紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
@@ -391,6 +504,26 @@
}else {
News.info("鎻愬崌鏈哄懡浠や笅鍙戞垚鍔燂紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
liftProtocol.setWrkTime(new Date());//鏇存柊宸ヤ綔鏃堕棿
+
+ //灏嗘爣璁扮疆涓篺alse(闃叉閲嶅彂)
+ liftProtocol.setPakMk(false);
+
+ //淇濆瓨鏁版嵁鍒版暟鎹簱鍋氭祦姘�
+ BasLiftOptService liftOptService = SpringUtils.getBean(BasLiftOptService.class);
+ if (liftOptService != null) {
+ short[] commandArr = getCommandArr(command);//鑾峰彇鍛戒护鎶ユ枃
+ BasLiftOpt opt = new BasLiftOpt(
+ redisCommand.getWrkNo().intValue(),
+ redisCommand.getLiftNo().intValue(),
+ new Date(),
+ null,
+ null,
+ null,
+ JSON.toJSONString(command),
+ JSON.toJSONString(commandArr)
+ );
+ liftOptService.insert(opt);
+ }
//鍒ゆ柇鏁版嵁鏄惁鎵ц瀹屾垚
if (commandStep < size - 1) {
@@ -402,27 +535,12 @@
redisUtil.set("lift_wrk_no_" + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
}else {
//宸叉墽琛屽畬鎴�
- //淇濆瓨鏁版嵁鍒版暟鎹簱鍋氭祦姘�
- BasLiftOptService liftOptService = SpringUtils.getBean(BasLiftOptService.class);
- if (liftOptService != null) {
- BasLiftOpt opt = new BasLiftOpt(
- redisCommand.getWrkNo().intValue(),
- redisCommand.getLiftNo().intValue(),
- new Date(),
- null,
- null,
- null,
- JSON.toJSONString(assignCommand)
- );
- liftOptService.insert(opt);
- }
//鍒犻櫎redis
redisUtil.del("lift_wrk_no_" + redisCommand.getWrkNo());
//瀵逛富绾跨▼鎶涘嚭绛夊緟纭鐘舵�亀aiting
liftProtocol.setProtocolStatus(LiftProtocolStatusType.WAITING);
- News.info("鎻愬崌鏈轰换鍔℃墽琛屽畬鎴愮瓑寰呯‘璁や腑锛屾彁鍗囨満鍙�={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
-
+ News.info("鎻愬崌鏈轰换鍔℃墽琛屼笅鍙戝畬鎴愮瓑寰呮墽琛岀粨鏉燂紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
}
}
@@ -458,11 +576,11 @@
command.setRun((short) 1);//鍗囬檷
Short position = LiftLevType.getRealLev(lev);//鑾峰彇鎻愬崌鏈哄疄闄呮ゼ灞傛暟鍊�
command.setDistPosition(position);
- command.setSpeed((short) 200);
- command.setHeight2((short) 180);
- command.setHeight3((short) 1645);
- command.setHeight4((short) (2 * 1645));
- command.setHeight5((short) (3 * 1645));
+// command.setSpeed((short) 200);
+// command.setHeight2((short) 180);
+// command.setHeight3((short) 1645);
+// command.setHeight4((short) (2 * 1645));
+// command.setHeight5((short) (3 * 1645));
return command;
}
@@ -476,11 +594,11 @@
command.setLiftNo(liftNo);//鎻愬崌鏈哄彿
command.setTaskNo(taskNo);//浠诲姟鍙�
command.setDistPosition(position);//鐩爣妤煎眰
- command.setSpeed((short) 200);
- command.setHeight2((short) 180);
- command.setHeight3((short) 1645);
- command.setHeight4((short) 3290);
- command.setHeight5((short) 4945);
+// command.setSpeed((short) 200);
+// command.setHeight2((short) 180);
+// command.setHeight3((short) 1645);
+// command.setHeight4((short) 3290);
+// command.setHeight5((short) 4945);
return command;
}
@@ -542,6 +660,7 @@
* 鍒濆鍖栨彁鍗囨満
*/
private void initLift() {
+ this.connect();
if (null == liftProtocol) {
liftProtocol = new LiftProtocol();
}
--
Gitblit v1.9.1