From 629959675a97b4d41c1c36eaa60ee1671c224e93 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 13 八月 2025 09:12:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ForkLiftController.java | 62 +++++++++++++++----------------
1 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ForkLiftController.java b/src/main/java/com/zy/asrs/controller/ForkLiftController.java
index 17c02b2..a292931 100644
--- a/src/main/java/com/zy/asrs/controller/ForkLiftController.java
+++ b/src/main/java/com/zy/asrs/controller/ForkLiftController.java
@@ -20,11 +20,9 @@
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.*;
-import com.zy.core.model.ForkLiftSlave;
import com.zy.core.model.command.*;
import com.zy.core.model.protocol.ForkLiftProtocol;
import com.zy.core.model.protocol.ForkLiftStaProtocol;
-import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.ForkLiftThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +59,7 @@
for (DeviceConfig device : forkliftList) {
// 琛ㄦ牸琛�
JSONObject baseObj = new JSONObject();
- baseObj.put("shuttleNo", device.getDeviceNo());
+ baseObj.put("liftNo", device.getDeviceNo());
list.add(baseObj);
// 鑾峰彇鎻愬崌鏈轰俊鎭�
ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, device.getDeviceNo());
@@ -83,12 +81,12 @@
@PostMapping("/table/lift/msg")
@ManagerAuth(memo = "鎻愬崌鏈烘暟鎹〃")
public R liftMsgTable(){
- List<LiftMsgTableVo> list = new ArrayList<>();
+ List<ForkLiftMsgTableVo> list = new ArrayList<>();
List<DeviceConfig> forkliftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.ForkLift)));
for (DeviceConfig device : forkliftList) {
// 琛ㄦ牸琛�
- LiftMsgTableVo vo = new LiftMsgTableVo();
+ ForkLiftMsgTableVo vo = new ForkLiftMsgTableVo();
vo.setLiftNo(device.getDeviceNo()); // 鎻愬崌鏈哄彿
list.add(vo);
// 鑾峰彇鎻愬崌鏈轰俊鎭�
@@ -114,7 +112,7 @@
StringBuilder str = new StringBuilder();
String s;
int i = 0;
- while((s = OutputQueue.LIFT.poll()) != null && i <=10) {
+ while((s = OutputQueue.FORKLIFT.poll()) != null && i <=10) {
str.append("\n").append(s);
i++;
}
@@ -188,7 +186,7 @@
if (o == null) {
return R.error();
}
- LiftRedisCommand redisCommand = JSON.parseObject(o.toString(), LiftRedisCommand.class);
+ ForkLiftRedisCommand redisCommand = JSON.parseObject(o.toString(), ForkLiftRedisCommand.class);
return R.ok().add(redisCommand);
}
@@ -200,7 +198,7 @@
if (o == null) {
return R.error();
}
- LiftRedisCommand redisCommand = JSON.parseObject(o.toString(), LiftRedisCommand.class);
+ ForkLiftRedisCommand redisCommand = JSON.parseObject(o.toString(), ForkLiftRedisCommand.class);
redisCommand.setCommandStep(commandStep);
redisUtil.set(RedisKeyType.FORK_LIFT_WORK_FLAG.key + wrkNo, JSON.toJSONString(redisCommand));
return R.ok();
@@ -215,8 +213,8 @@
if (o == null) {
return R.error();
}
- LiftRedisCommand redisCommand = JSON.parseObject(o.toString(), LiftRedisCommand.class);
- LiftAssignCommand assignCommand = redisCommand.getAssignCommand();
+ ForkLiftRedisCommand redisCommand = JSON.parseObject(o.toString(), ForkLiftRedisCommand.class);
+ ForkLiftAssignCommand assignCommand = redisCommand.getAssignCommand();
List<ForkLiftCommand> commands = assignCommand.getCommands();
ForkLiftCommand command = commands.get(commandStep);
command.setComplete(complete != 0);
@@ -231,9 +229,9 @@
if (o == null) {
return R.error();
}
- LiftRedisCommand redisCommand = JSON.parseObject(o.toString(), LiftRedisCommand.class);
- Short liftNo = redisCommand.getLiftNo();
- ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, liftNo.intValue());
+ ForkLiftRedisCommand redisCommand = JSON.parseObject(o.toString(), ForkLiftRedisCommand.class);
+ Integer liftNo = redisCommand.getLiftNo();
+ ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, liftNo);
if (forkLiftThread == null) {
return R.error();
}
@@ -245,7 +243,7 @@
return R.error();
}
//鎻愬崌鏈哄浜庣┖闂茬姸鎬侊紝杩涜浠诲姟鐨勬仮澶�
- forkLiftThread.setSyncTaskNo(redisCommand.getWrkNo().intValue());//灏嗘彁鍗囨満绾跨▼鍒嗛厤浠诲姟鍙�
+ forkLiftThread.setSyncTaskNo(redisCommand.getWrkNo());//灏嗘彁鍗囨満绾跨▼鍒嗛厤浠诲姟鍙�
return R.ok();
}
@@ -288,17 +286,17 @@
Integer targetSta = param.getStaNo();
//鑾峰彇鎻愬崌鏈哄懡浠�
- List<ForkLiftCommand> liftCommand = forkLiftThread.getShuttleSwitchCommand(workNo, startSta, targetSta);
+ ForkLiftCommand liftCommand = forkLiftThread.getShuttleSwitchCommand(workNo, startSta, targetSta);
ArrayList<ForkLiftCommand> commands = new ArrayList<>();
- commands.addAll(liftCommand);
+ commands.add(liftCommand);
//鎻愪氦鍒扮嚎绋嬪幓宸ヤ綔
- LiftAssignCommand assignCommand = new LiftAssignCommand();
+ ForkLiftAssignCommand assignCommand = new ForkLiftAssignCommand();
assignCommand.setCommands(commands);
- assignCommand.setLiftNo(forkLiftProtocol.getLiftNo().shortValue());
- assignCommand.setTaskNo((short) workNo);
+ assignCommand.setLiftNo(forkLiftProtocol.getLiftNo());
+ assignCommand.setTaskNo(workNo);
assignCommand.setAuto(false);//鎵嬪姩妯″紡
- assignCommand.setTaskMode(ForkLiftTaskModeType.SHUTTLE_SWITCH.id.shortValue());
+ assignCommand.setTaskMode(ForkLiftTaskModeType.SHUTTLE_SWITCH.id);
forkLiftAction.assignWork(forkLiftProtocol.getLiftNo(), assignCommand);
return R.ok();
@@ -310,17 +308,17 @@
Integer targetSta = param.getStaNo();
//鑾峰彇鎻愬崌鏈哄懡浠�
- List<ForkLiftCommand> liftCommand = forkLiftThread.getPickAndPutCommand(workNo, startSta, targetSta);
+ ForkLiftCommand liftCommand = forkLiftThread.getPickAndPutCommand(workNo, startSta, targetSta);
ArrayList<ForkLiftCommand> commands = new ArrayList<>();
- commands.addAll(liftCommand);
+ commands.add(liftCommand);
//鎻愪氦鍒扮嚎绋嬪幓宸ヤ綔
- LiftAssignCommand assignCommand = new LiftAssignCommand();
+ ForkLiftAssignCommand assignCommand = new ForkLiftAssignCommand();
assignCommand.setCommands(commands);
- assignCommand.setLiftNo(forkLiftProtocol.getLiftNo().shortValue());
- assignCommand.setTaskNo((short) workNo);
+ assignCommand.setLiftNo(forkLiftProtocol.getLiftNo());
+ assignCommand.setTaskNo(workNo);
assignCommand.setAuto(false);//鎵嬪姩妯″紡
- assignCommand.setTaskMode(ForkLiftTaskModeType.PICK_PUT.id.shortValue());
+ assignCommand.setTaskMode(ForkLiftTaskModeType.PICK_PUT.id);
forkLiftAction.assignWork(forkLiftProtocol.getLiftNo(), assignCommand);
return R.ok();
@@ -332,17 +330,17 @@
Integer targetSta = param.getStaNo();
//鑾峰彇鎻愬崌鏈哄懡浠�
- List<ForkLiftCommand> liftCommand = forkLiftThread.getMoveCommand(workNo, startSta, targetSta);
+ ForkLiftCommand liftCommand = forkLiftThread.getMoveCommand(workNo, startSta, targetSta);
ArrayList<ForkLiftCommand> commands = new ArrayList<>();
- commands.addAll(liftCommand);
+ commands.add(liftCommand);
//鎻愪氦鍒扮嚎绋嬪幓宸ヤ綔
- LiftAssignCommand assignCommand = new LiftAssignCommand();
+ ForkLiftAssignCommand assignCommand = new ForkLiftAssignCommand();
assignCommand.setCommands(commands);
- assignCommand.setLiftNo(forkLiftProtocol.getLiftNo().shortValue());
- assignCommand.setTaskNo((short) workNo);
+ assignCommand.setLiftNo(forkLiftProtocol.getLiftNo());
+ assignCommand.setTaskNo(workNo);
assignCommand.setAuto(false);//鎵嬪姩妯″紡
- assignCommand.setTaskMode(ForkLiftTaskModeType.MOVE.id.shortValue());
+ assignCommand.setTaskMode(ForkLiftTaskModeType.MOVE.id);
forkLiftAction.assignWork(forkLiftProtocol.getLiftNo(), assignCommand);
return R.ok();
--
Gitblit v1.9.1