From 8ef2bb5e46d84594e6ed632c07ea0b47a1bf6c4d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 11 十二月 2024 16:15:17 +0800
Subject: [PATCH] #path similarity
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtLiftThread.java | 142 +++++++++++++++++++++++++++++++----------------
1 files changed, 93 insertions(+), 49 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtLiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtLiftThread.java
index c8348a4..039dcbb 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtLiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtLiftThread.java
@@ -17,10 +17,12 @@
import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
import com.zy.asrs.wcs.core.service.BasLiftService;
import com.zy.asrs.wcs.core.utils.RedisUtil;
+import com.zy.asrs.wcs.core.utils.Utils;
import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.rcs.cache.OutputQueue;
import com.zy.asrs.wcs.rcs.entity.Device;
import com.zy.asrs.wcs.rcs.entity.DeviceDataLog;
+import com.zy.asrs.wcs.rcs.model.CommandResponse;
import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
import com.zy.asrs.wcs.rcs.service.DeviceDataLogService;
@@ -29,10 +31,7 @@
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
@Slf4j
@SuppressWarnings("all")
@@ -114,8 +113,8 @@
liftProtocol.setHasCar(siemensS7Net.getByteTransform().TransInt16(result1.Content, 6) == 1);
//褰撳墠妤煎眰
liftProtocol.setLev((int) siemensS7Net.getByteTransform().TransInt16(result1.Content, 8));
- //宸ヤ綔鍙�
- liftProtocol.setTaskNo(siemensS7Net.getByteTransform().TransInt32(result1.Content, 12));
+// //宸ヤ綔鍙�
+// liftProtocol.setTaskNo(siemensS7Net.getByteTransform().TransInt32(result1.Content, 12));
//璁惧鏁呴殰
liftProtocol.setError(siemensS7Net.getByteTransform().TransInt16(result1.Content, 16) == 1);
//鏁呴殰鐮�
@@ -126,6 +125,12 @@
//閿佸畾
liftExtend.setLock(siemensS7Net.getByteTransform().TransInt16(result1.Content, 10) == 1);
liftProtocol.setExtend(liftExtend);
+
+ boolean ready = true;
+ if (!liftProtocol.getModel() || liftProtocol.getRun()) {
+ ready = false;
+ }
+ liftProtocol.setReady(ready);//灏辩华鐘舵��
}else {
@@ -191,53 +196,70 @@
}
@Override
- public boolean move(LiftCommand command) {
+ public CommandResponse move(LiftCommand command) {
return write(command);
}
@Override
- public boolean palletInOut(LiftCommand command) {
+ public CommandResponse palletInOut(LiftCommand command) {
return write(command);
}
- private boolean write(LiftCommand command) {
+ private CommandResponse write(LiftCommand command) {
+ CommandResponse response = new CommandResponse(false);
if (null == command) {
News.error("鎻愬崌鏈哄啓鍏ュ懡浠や负绌�");
- return false;
+ response.setMessage("鎻愬崌鏈哄啓鍏ュ懡浠や负绌�");
+ return response;
}
- List<Short> shorts = JSON.parseArray(command.getBody(), Short.class);
- short[] array = new short[shorts.size()];//鑾峰彇鍛戒护鎶ユ枃
- for (int i = 0; i < shorts.size(); i++) {
- array[i] = shorts.get(i);
+ List<Integer> list = JSON.parseArray(command.getBody(), Integer.class);
+ int[] array = new int[list.size()];//鑾峰彇鍛戒护鎶ユ枃
+ for (int i = 0; i < list.size(); i++) {
+ array[i] = list.get(i);
}
- OperateResult result = siemensS7Net.Write("DB83.0", array);
+ OperateResult result = null;
+ if (command.getMode() == LiftCommandModeType.MOVE.id) {
+ //绉诲姩
+ result = siemensS7Net.Write("DB101.2", (short) array[0]);
+ result = siemensS7Net.Write("DB101.4", (int) array[1]);
+ } else if (command.getMode() == LiftCommandModeType.PALLET_INOUT.id) {
+ //鎵樼洏鍑哄叆
+ result = siemensS7Net.Write("DB101.8", array);
+ } else if (command.getMode() == LiftCommandModeType.LOCK.id || command.getMode() == LiftCommandModeType.UNLOCK.id) {
+ //鎻愬崌鏈洪攣瀹�/瑙ｉ攣
+ result = siemensS7Net.Write("DB101.0", (short) array[0]);
+ }
+
if (result != null && result.IsSuccess) {
liftProtocol.setSendTime(System.currentTimeMillis());//鎸囦护涓嬪彂鏃堕棿
News.info("鎻愬崌鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", device.getId(), JSON.toJSON(command));
OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), device.getId(), JSON.toJSON(command)));
- return true;
+ response.setMessage(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), device.getId(), JSON.toJSON(command)));
+ response.setResult(true);
+ return response;
} else {
- OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戝啓鍏ユ彁鍗囨満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}],娆℃暟锛歿}", DateUtils.convert(new Date()), device.getId(), device.getIp(), device.getPort()));
+ OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戝啓鍏ユ彁鍗囨満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), device.getId(), device.getIp(), device.getPort()));
News.error("鍐欏叆鎻愬崌鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", device.getId(), device.getIp(), device.getPort());
- return false;
+ response.setMessage(MessageFormat.format("銆恵0}銆戝啓鍏ユ彁鍗囨満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), device.getId(), device.getIp(), device.getPort()));
+ return response;
}
}
@Override
- public boolean lock(LiftCommand command) {
- return true;
+ public CommandResponse lock(LiftCommand command) {
+ return write(command);
}
@Override
- public boolean unlock(LiftCommand command) {
- return true;
+ public CommandResponse unlock(LiftCommand command) {
+ return write(command);
}
@Override
- public boolean reset(LiftCommand command) {
- return false;
+ public CommandResponse reset(LiftCommand command) {
+ return new CommandResponse(true);
}
@Override
@@ -302,37 +324,31 @@
@Override
public boolean isLock(ExecuteSupport support) {
- if (support != null) {
- return support.judgement();
+ InnerLiftExtend extend = (InnerLiftExtend) this.liftProtocol.getExtend();
+ return extend.getLock();
+ }
+
+ @Override
+ public int generateDeviceTaskNo(int taskNo, MotionCtgType motionCtgType) {
+ int deviceTaskNo = taskNo;
+ try {
+ deviceTaskNo = Utils.getTaskNo("LIFT_TASK_NO");
+ } catch (Exception e) {
+ return taskNo;
}
- return true;
+ return deviceTaskNo;
}
@Override
public List<LiftCommand> getMoveCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode) {
- /**
- * 浠诲姟绫诲瀷
- * 1=绉绘墭鐩橈紱鍗囬檷鏈哄皢婧愮珯鍙版墭鐩樼Щ鍒扮洰鏍囩珯鍙�
- * 2=绉诲皬杞︼紝鍗囬檷鏈虹Щ鍒扮洰鏍囧眰锛岀瓑寰�
- */
- short taskMode = 2;
- if (mode.equals(LiftCommandModeType.PALLET_INOUT)) {
- taskMode = 1;
- }
-
// 寮�濮嬩换鍔�
- short[] array = new short[4];
- //浠诲姟绫诲瀷
- array[0] = taskMode;
- //婧愮珯鍙扮紪鍙�
- array[1] = sourceLev.shortValue();
- //鐩爣绔欏彴缂栧彿
- array[2] = targetLev.shortValue();
- //浠诲姟鍙�
- array[3] = taskNo.shortValue();
+ short[] array = new short[2];
+ array[0] = targetLev.shortValue();//鐩爣灞�
+ array[1] = taskNo.shortValue();//宸ヤ綔鍙�
LiftCommand command = new LiftCommand();
command.setLiftNo(Integer.valueOf(this.device.getDeviceNo()));
+ command.setTaskNo(taskNo);
command.setBody(JSON.toJSONString(array));
command.setMode(LiftCommandModeType.MOVE.id);
command.setOriginLev(sourceLev);
@@ -350,12 +366,40 @@
@Override
public List<LiftCommand> getPalletInOutCommand(Integer taskNo, Integer sourceLev, Integer targetLev, Integer originSta, Integer targetSta, LiftCommandModeType mode) {
- return getMoveCommand(taskNo, sourceLev, targetLev, mode);
+ // 寮�濮嬩换鍔�
+ short[] array = new short[3];
+ array[0] = originSta.shortValue();//璧峰绔�
+ array[1] = targetSta.shortValue();//鐩爣绔�
+ array[2] = taskNo.shortValue();//宸ヤ綔鍙�
+
+ LiftCommand command = new LiftCommand();
+ command.setLiftNo(Integer.valueOf(this.device.getDeviceNo()));
+ command.setTaskNo(taskNo);
+ command.setBody(JSON.toJSONString(array));
+ command.setMode(LiftCommandModeType.PALLET_INOUT.id);
+ command.setOriginLev(sourceLev);
+ command.setTargetLev(targetLev);
+
+ ArrayList<LiftCommand> list = new ArrayList<>();
+ list.add(command);
+ return list;
}
@Override
public List<LiftCommand> getLockCommand(Integer taskNo, Boolean lock) {
- return null;
+ // 寮�濮嬩换鍔�
+ short[] array = new short[2];
+ array[0] = lock ? (short) 1 : (short) 0;
+
+ LiftCommand command = new LiftCommand();
+ command.setLiftNo(Integer.valueOf(this.device.getDeviceNo()));
+ command.setTaskNo(taskNo);
+ command.setBody(JSON.toJSONString(array));
+ command.setMode(lock ? LiftCommandModeType.LOCK.id : LiftCommandModeType.UNLOCK.id);
+
+ ArrayList<LiftCommand> list = new ArrayList<>();
+ list.add(command);
+ return list;
}
@Override
@@ -367,7 +411,7 @@
public boolean connect() {
boolean result = false;
//-------------------------鎻愬崌鏈鸿繛鎺ユ柟娉�------------------------//
- siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, device.getIp());
+ siemensS7Net = new SiemensS7Net(SiemensPLCS.S1500, device.getIp());
OperateResult connect = siemensS7Net.ConnectServer();
if(connect.IsSuccess){
result = true;
--
Gitblit v1.9.1