From fd5d26ae0d1dbf71f90b99ef84d09a34e2d10d83 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 07 一月 2025 10:45:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 4e03ad6..30d15d4 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -81,7 +81,7 @@
shuttleData.put("moveAdvancePath", null);//绌挎杞﹂璁¤矾寰�
if (shuttleProtocol.getTaskNo() != 0) {
//瀛樺湪浠诲姟锛岃幏鍙栨寚浠�
- Object object = redisUtil.get(RedisKeyType.SHUTTLE.key + shuttleProtocol.getTaskNo());
+ Object object = redisUtil.get(RedisKeyType.SHUTTLE_WORK_FLAG.key + shuttleProtocol.getTaskNo());
if (object != null) {
ShuttleRedisCommand redisCommand = JSON.parseObject(object.toString(), ShuttleRedisCommand.class);
shuttleData.put("moveAdvancePath", redisCommand.getAssignCommand().getNodes());//绌挎杞﹂璁¤矾寰�
@@ -165,7 +165,7 @@
@RequestMapping(value = "/command/query")
public R shuttleCommandQuery(@RequestParam("wrkNo") Integer wrkNo) {
- Object o = redisUtil.get(RedisKeyType.SHUTTLE.key + wrkNo);
+ Object o = redisUtil.get(RedisKeyType.SHUTTLE_WORK_FLAG.key + wrkNo);
if (o == null) {
return R.error();
}
@@ -177,13 +177,13 @@
@RequestMapping(value = "/command/rollback")
public R shuttleCommandRollback(@RequestParam("wrkNo") Integer wrkNo
, @RequestParam("commandStep") Integer commandStep) {
- Object o = redisUtil.get(RedisKeyType.SHUTTLE.key + wrkNo);
+ Object o = redisUtil.get(RedisKeyType.SHUTTLE_WORK_FLAG.key + wrkNo);
if (o == null) {
return R.error();
}
ShuttleRedisCommand redisCommand = JSON.parseObject(o.toString(), ShuttleRedisCommand.class);
redisCommand.setCommandStep(commandStep);
- redisUtil.set(RedisKeyType.SHUTTLE.key + wrkNo, JSON.toJSONString(redisCommand));
+ redisUtil.set(RedisKeyType.SHUTTLE_WORK_FLAG.key + wrkNo, JSON.toJSONString(redisCommand));
return R.ok();
}
@@ -192,7 +192,7 @@
public R shuttleCommandCompleteSwitch(@RequestParam("wrkNo") Integer wrkNo
, @RequestParam("commandStep") Integer commandStep
, @RequestParam("complete") Integer complete) {
- Object o = redisUtil.get(RedisKeyType.SHUTTLE.key + wrkNo);
+ Object o = redisUtil.get(RedisKeyType.SHUTTLE_WORK_FLAG.key + wrkNo);
if (o == null) {
return R.error();
}
@@ -201,14 +201,14 @@
List<ShuttleCommand> commands = assignCommand.getCommands();
ShuttleCommand command = commands.get(commandStep);
command.setComplete(complete != 0);
- redisUtil.set(RedisKeyType.SHUTTLE.key + wrkNo, JSON.toJSONString(redisCommand));
+ redisUtil.set(RedisKeyType.SHUTTLE_WORK_FLAG.key + wrkNo, JSON.toJSONString(redisCommand));
return R.ok();
}
//閲嶅惎浠诲姟(鍛戒护)
@RequestMapping(value = "/command/restart")
public R shuttleCommandCompleteSwitch(@RequestParam("wrkNo") Integer wrkNo) {
- Object o = redisUtil.get(RedisKeyType.SHUTTLE.key + wrkNo);
+ Object o = redisUtil.get(RedisKeyType.SHUTTLE_WORK_FLAG.key + wrkNo);
if (o == null) {
return R.error();
}
@@ -230,11 +230,11 @@
//鍒犻櫎浠诲姟(鍛戒护)
@RequestMapping(value = "/command/del")
public R liftCommandDel(@RequestParam("wrkNo") Integer wrkNo) {
- Object o = redisUtil.get(RedisKeyType.SHUTTLE.key + wrkNo);
+ Object o = redisUtil.get(RedisKeyType.SHUTTLE_WORK_FLAG.key + wrkNo);
if (o == null) {
return R.error();
}
- redisUtil.del(RedisKeyType.SHUTTLE.key + wrkNo);
+ redisUtil.del(RedisKeyType.SHUTTLE_WORK_FLAG.key + wrkNo);
return R.ok();
}
--
Gitblit v1.9.1