From 6daf900a09adcca981f620744bf89851654d88e0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 05 八月 2025 09:58:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ForkLiftController.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ForkLiftController.java b/src/main/java/com/zy/asrs/controller/ForkLiftController.java
index 3344deb..a292931 100644
--- a/src/main/java/com/zy/asrs/controller/ForkLiftController.java
+++ b/src/main/java/com/zy/asrs/controller/ForkLiftController.java
@@ -81,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);
// 鑾峰彇鎻愬崌鏈轰俊鎭�
@@ -186,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);
}
@@ -198,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();
@@ -213,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);
@@ -229,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();
}
@@ -243,7 +243,7 @@
return R.error();
}
//鎻愬崌鏈哄浜庣┖闂茬姸鎬侊紝杩涜浠诲姟鐨勬仮澶�
- forkLiftThread.setSyncTaskNo(redisCommand.getWrkNo().intValue());//灏嗘彁鍗囨満绾跨▼鍒嗛厤浠诲姟鍙�
+ forkLiftThread.setSyncTaskNo(redisCommand.getWrkNo());//灏嗘彁鍗囨満绾跨▼鍒嗛厤浠诲姟鍙�
return R.ok();
}
@@ -291,12 +291,12 @@
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();
@@ -313,12 +313,12 @@
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();
@@ -335,12 +335,12 @@
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