From 21fa85b313c072db15933668fe77995b927b386c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 31 七月 2023 14:35:49 +0800
Subject: [PATCH] 提升机
---
src/main/java/com/zy/core/thread/LiftThread.java | 425 +++++++---------------------------------------
src/main/java/com/zy/common/utils/NyLiftUtils.java | 23 ++
src/main/java/com/zy/core/model/command/LiftAssignCommand.java | 2
src/main/java/com/zy/core/model/command/NyLiftCommand.java | 43 ++++
4 files changed, 135 insertions(+), 358 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NyLiftUtils.java b/src/main/java/com/zy/common/utils/NyLiftUtils.java
new file mode 100644
index 0000000..1794678
--- /dev/null
+++ b/src/main/java/com/zy/common/utils/NyLiftUtils.java
@@ -0,0 +1,23 @@
+package com.zy.common.utils;
+
+import com.zy.core.model.command.NyLiftCommand;
+
+/**
+ * 鐗涚溂鎻愬崌鏈哄伐鍏风被
+ */
+public class NyLiftUtils {
+
+ /**
+ * 鑾峰彇鎻愬崌鏈哄懡浠�
+ */
+ public NyLiftCommand getLiftCommand(Integer liftNo, Integer taskModel, Integer sourceSta, Integer targetSta, Integer taskNo) {
+ NyLiftCommand command = new NyLiftCommand();
+ command.setLiftNo(liftNo.shortValue());
+ command.setTaskNo(taskNo.shortValue());
+ command.setTaskModel(taskModel.shortValue());
+ command.setSourceSta(sourceSta.shortValue());
+ command.setTargetSta(targetSta.shortValue());
+ return command;
+ }
+
+}
diff --git a/src/main/java/com/zy/core/model/command/LiftAssignCommand.java b/src/main/java/com/zy/core/model/command/LiftAssignCommand.java
index 6c529cd..0dfba73 100644
--- a/src/main/java/com/zy/core/model/command/LiftAssignCommand.java
+++ b/src/main/java/com/zy/core/model/command/LiftAssignCommand.java
@@ -20,7 +20,7 @@
/**
* 鍛戒护list
*/
- private List<LiftCommand> commands;
+ private List<NyLiftCommand> commands;
/**
* 浣滀笟绫诲瀷
diff --git a/src/main/java/com/zy/core/model/command/NyLiftCommand.java b/src/main/java/com/zy/core/model/command/NyLiftCommand.java
new file mode 100644
index 0000000..130019e
--- /dev/null
+++ b/src/main/java/com/zy/core/model/command/NyLiftCommand.java
@@ -0,0 +1,43 @@
+package com.zy.core.model.command;
+
+import lombok.Data;
+
+/**
+ *
+ */
+@Data
+public class NyLiftCommand {
+
+ /**
+ * 鎻愬崌鏈哄彿
+ */
+ private Short liftNo = 0;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ private Short taskNo = 0;
+
+ /**
+ * 鍛戒护鏄惁瀹屾垚,榛樿false鏈畬鎴�
+ */
+ private Boolean complete = false;
+
+ /**
+ * 浠诲姟绫诲瀷
+ * 1=绉绘墭鐩橈紱鍗囬檷鏈哄皢婧愮珯鍙版墭鐩樼Щ鍒扮洰鏍囩珯鍙�
+ * 2=绉诲皬杞︼紝鍗囬檷鏈虹Щ鍒扮洰鏍囧眰锛岀瓑寰�
+ */
+ private Short taskModel;
+
+ /**
+ * 婧愮珯鍙扮紪鍙�
+ */
+ private Short sourceSta;
+
+ /**
+ * 鐩爣绔欏彴缂栧彿
+ */
+ private Short targetSta;
+
+}
diff --git a/src/main/java/com/zy/core/thread/LiftThread.java b/src/main/java/com/zy/core/thread/LiftThread.java
index 9503c0e..1fe3e6c 100644
--- a/src/main/java/com/zy/core/thread/LiftThread.java
+++ b/src/main/java/com/zy/core/thread/LiftThread.java
@@ -73,7 +73,7 @@
break;
// 鍐欏叆鏁版嵁
case 2:
- write((LiftCommand) task.getData());
+ write((NyLiftCommand) task.getData());
break;
//鍒嗛厤浠诲姟
case 3:
@@ -223,146 +223,52 @@
}
}
- private boolean write(LiftCommand command){
+ private boolean write(NyLiftCommand command){
if (null == command) {
News.error("鎻愬崌鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
-// 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;
-// }
+ command.setLiftNo(slave.getId().shortValue());
+ short[] array = getCommandArr(command);//鑾峰彇鍛戒护鎶ユ枃
- return true;
+ OperateResult result = siemensS7Net.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;
+ }
}
//鑾峰彇鍛戒护鎶ユ枃
- private short[] getCommandArr(LiftCommand command) {
+ private short[] getCommandArr(NyLiftCommand command) {
// 寮�濮嬩换鍔�
- short[] array = new short[30];
- //寮�濮嬭繍琛�
- array[0] = command.getRun();
- if (command.getDistPosition() != null) {
- //鐩爣浣嶇疆
- array[1] = command.getDistPosition();
+ short[] array = new short[4];
+ if (command.getTaskModel() != null) {
+ //浠诲姟绫诲瀷
+ array[0] = command.getTaskModel();
}
- if (command.getSpeed() != null) {
- //杩愯閫熷害
- array[2] = command.getSpeed();
+ if (command.getSourceSta() != null) {
+ //婧愮珯鍙扮紪鍙�
+ array[1] = command.getSourceSta();
}
- if (command.getHeight2() != null) {
- //浜屽眰楂樺害璁惧畾
- array[3] = command.getHeight2();
+ if (command.getTargetSta() != null) {
+ //鐩爣绔欏彴缂栧彿
+ array[2] = command.getTargetSta();
}
- if (command.getHeight3() != null) {
- //涓夊眰楂樺害璁惧畾
- array[4] = command.getHeight3();
- }
- if (command.getHeight4() != null) {
- //鍥涘眰楂樺害璁惧畾
- array[5] = command.getHeight4();
- }
- if (command.getHeight5() != null) {
- //鍥涘眰楂樺害璁惧畾
- array[6] = command.getHeight5();
- }
- if (command.getLiftLockShortValue() != null) {
- //鎻愬崌鏈洪攣瀹�
- array[29] = command.getLiftLockShortValue();
- }
-
- if (array[2] == 0) {
- // 寮�濮嬩换鍔�
- short[] tmp = new short[2];
- tmp[0] = array[0];
- tmp[1] = array[1];
- array = tmp;
+ if (command.getTaskNo() != null) {
+ //浠诲姟鍙�
+ array[3] = command.getTaskNo();
}
return array;
}
//鍒嗛厤浠诲姟
private void assignWork(LiftAssignCommand assignCommand) {
- //鎵嬪姩妯″紡鎸囦护
- if (!assignCommand.getAuto()) {
- LiftCommand command = new LiftCommand();
- //鎻愬崌鏈哄綋鍓嶆ゼ灞�
- Short lev = liftProtocol.getLev();
- List<LiftCommand> commands = assignCommand.getCommands();
- if (commands == null) {
- commands = new ArrayList<LiftCommand>();
- }
- liftProtocol.setTaskNo(assignCommand.getTaskNo());
- switch (assignCommand.getTaskMode()) {
- case 1://绉诲姩鎻愬崌鏈�
- command = getLiftUpDownCommand(assignCommand.getLev());//鑾峰彇鎻愬崌鏈轰笂鍗囦笅闄嶅懡浠�
- break;
- case 3://鏃犺揣姝ｈ浆
- command = getLiftTurnCommand(3);//鑾峰彇鎻愬崌鏈鸿浆鍔ㄥ懡浠�
- break;
- case 4://鏃犺揣鍙嶈浆
- command = getLiftTurnCommand(4);//鑾峰彇鎻愬崌鏈鸿浆鍔ㄥ懡浠�
- break;
- case 5://鏈夎揣姝ｈ浆
- command = getLiftTurnCommand(1);//鑾峰彇鎻愬崌鏈鸿浆鍔ㄥ懡浠�
- break;
- case 6://鏈夎揣鍙嶈浆
- command = getLiftTurnCommand(2);//鑾峰彇鎻愬崌鏈鸿浆鍔ㄥ懡浠�
- break;
- case 7://閾炬潯鍋滄
- command = getLiftTurnCommand(5);//鑾峰彇鎻愬崌鏈鸿浆鍔ㄥ懡浠�
- break;
- case 0://澶嶄綅
- command = getResetCommand();//鑾峰彇澶嶄綅鍛戒护
- break;
- default:
- }
- commands.add(command);
- assignCommand.setCommands(commands);
- }
-
LiftRedisCommand redisCommand = new LiftRedisCommand();
redisCommand.setLiftNo(assignCommand.getLiftNo());//鎻愬崌鏈哄彿
redisCommand.setWrkNo(assignCommand.getTaskNo());//宸ヤ綔鍙�
@@ -389,257 +295,62 @@
return false;
}
LiftRedisCommand redisCommand = JSON.parseObject(o.toString(), LiftRedisCommand.class);
- List<LiftCommand> commands = redisCommand.getAssignCommand().getCommands();
+ List<NyLiftCommand> commands = redisCommand.getAssignCommand().getCommands();
//褰撳墠姝ュ簭
int commandStep = redisCommand.getCommandStep();
//鎬绘搴�
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;
- }
- staProtocol.setWorkNo(wrkNo);//璁剧疆浠诲姟鍙�
- if (command.getStaNo() != null) {
- staProtocol.setStaNo(command.getStaNo());//璁剧疆鐩爣绔�
- }
-
- if (command.getRotationDire() != null) {
- staProtocol.setRotationDire(command.getRotationDire());//绔欑偣閾炬潯杞姩淇″彿
- }
- Integer devpId = command.getDevpId();
- 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;
- }
- }
- }
- }
+ NyLiftCommand command = commands.get(commandStep);
//涓嬪彂鍛戒护
if (!write(command)) {
News.error("鎻愬崌鏈哄懡浠や笅鍙戝け璐ワ紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
return false;
+ }
+
+ News.info("鎻愬崌鏈哄懡浠や笅鍙戞垚鍔燂紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
+
+ //灏嗘爣璁扮疆涓篺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) {
+ //鏇存柊redis鏁版嵁
+ //姝ュ簭澧炲姞
+ commandStep++;
+ redisCommand.setCommandStep(commandStep);
+ //浠诲姟鏁版嵁淇濆瓨鍒皉edis
+ redisUtil.set("lift_wrk_no_" + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
}else {
- News.info("鎻愬崌鏈哄懡浠や笅鍙戞垚鍔燂紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
+ //宸叉墽琛屽畬鎴�
+ //鍒犻櫎redis
+ redisUtil.del("lift_wrk_no_" + redisCommand.getWrkNo());
- //灏嗘爣璁扮疆涓篺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) {
- //鏇存柊redis鏁版嵁
- //姝ュ簭澧炲姞
- commandStep++;
- redisCommand.setCommandStep(commandStep);
- //浠诲姟鏁版嵁淇濆瓨鍒皉edis
- redisUtil.set("lift_wrk_no_" + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
- }else {
- //宸叉墽琛屽畬鎴�
- //鍒犻櫎redis
- redisUtil.del("lift_wrk_no_" + redisCommand.getWrkNo());
-
- //瀵逛富绾跨▼鎶涘嚭绛夊緟纭鐘舵�亀aiting
- liftProtocol.setProtocolStatus(LiftProtocolStatusType.WAITING);
- News.info("鎻愬崌鏈轰换鍔℃墽琛屼笅鍙戝畬鎴愮瓑寰呮墽琛岀粨鏉燂紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
- }
+ //瀵逛富绾跨▼鎶涘嚭绛夊緟纭鐘舵�亀aiting
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.WAITING);
+ News.info("鎻愬崌鏈轰换鍔℃墽琛屼笅鍙戝畬鎴愮瓑寰呮墽琛岀粨鏉燂紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
}
return true;
- }
-
- /**
- * 鑾峰彇鎻愬崌鏈鸿В閿佸懡浠�
- */
- public LiftCommand getUnlockCommand(Short liftNo) {
- LiftCommand command = new LiftCommand();
- command.setRun((short) 0);
- command.setLiftNo(liftNo);
- command.setLiftLock(false);
- return command;
- }
-
- /**
- * 鑾峰彇澶嶄綅鍛戒护
- */
- public LiftCommand getResetCommand() {
- LiftCommand command = new LiftCommand();
- command.setRun((short) 5);
- command.setLiftLock(false);
- return command;
- }
-
- /**
- * 鑾峰彇鎻愬崌鏈轰笂鍗囦笅闄嶅懡浠�
- */
- public LiftCommand getLiftUpDownCommand(Integer lev) {
- LiftCommand command = new LiftCommand();
- 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));
- return command;
- }
-
- /**
- * 鑾峰彇鎻愬崌鏈轰笂鍗囦笅闄嶅懡浠�
- */
- public LiftCommand getLiftUpDownCommand(Short liftNo, Short taskNo, Integer lev) {
- LiftCommand command = new LiftCommand();
- Short position = LiftLevType.getRealLev(lev);//鑾峰彇鎻愬崌鏈哄疄闄呮ゼ灞傛暟鍊�
- command.setRun((short) 1);//鍗囬檷
- 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);
- return command;
- }
-
- /**
- * 鑾峰彇鎻愬崌鏈鸿浆鍔ㄥ懡浠わ紝direction锛�1=銆嬫湁璐ф杞紝2=銆嬫湁璐у弽杞紝3=>鏃犺揣姝ｈ浆锛�4=>鏃犺揣鍙嶈浆
- */
- public LiftCommand getLiftTurnCommand(Integer direction) {
- LiftCommand command = new LiftCommand();
- Short run = 0;
- switch (direction) {
- case 1:
- run = 6;//鏈夎揣姝ｈ浆
- break;
- case 2:
- run = 3;//鏈夎揣鍙嶈浆
- break;
- case 3:
- run = 2;//鏃犺揣姝ｈ浆
- break;
- case 4:
- run = 7;//鏃犺揣鍙嶈浆
- break;
- case 5:
- run = 4;//閾炬潯鍋滄
- }
- command.setRun(run);
- return command;
- }
-
- /**
- * 鑾峰彇鎻愬崌鏈鸿浆鍔ㄥ懡浠わ紝direction锛�1=銆嬫湁璐ф杞紝2=銆嬫湁璐у弽杞�
- */
- public LiftCommand getLiftTurnCommand(Short liftNo, Short taskNo, Integer direction) {
- LiftCommand command = new LiftCommand();
- Short run = 0;
- switch (direction) {
- case 1:
- run = 6;//鏈夎揣姝ｈ浆
- break;
- case 2:
- run = 3;//鏈夎揣鍙嶈浆
- break;
- case 3:
- run = 2;//鏃犺揣姝ｈ浆
- break;
- case 4:
- run = 7;//鏃犺揣鍙嶈浆
- break;
- case 5:
- run = 4;//閾炬潯鍋滄
- }
- command.setRun(run);
- command.setLiftNo(liftNo);//鎻愬崌鏈哄彿
- command.setTaskNo(taskNo);//浠诲姟鍙�
- return command;
- }
-
- /**
- * 鍒濆鍖栨彁鍗囨満
- */
- private void initLift() {
- this.connect();
- if (null == liftProtocol) {
- liftProtocol = new LiftProtocol();
- }
}
/******************************************************************************************/
--
Gitblit v1.9.1