From 05f8bdf7e09849c1db885b6c996ad18280d130b3 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 18 十二月 2023 16:18:25 +0800
Subject: [PATCH] #map latest test
---
src/main/java/com/zy/asrs/controller/LiftController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index 50f8d46..9249c42 100644
--- a/src/main/java/com/zy/asrs/controller/LiftController.java
+++ b/src/main/java/com/zy/asrs/controller/LiftController.java
@@ -19,6 +19,7 @@
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.LiftProtocolStatusType;
import com.zy.core.enums.NyLiftTaskModelType;
+import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LiftSlave;
import com.zy.core.model.Task;
@@ -299,7 +300,7 @@
@RequestMapping(value = "/command/query")
public R liftCommandQuery(@RequestParam("wrkNo") Integer wrkNo) {
- Object o = redisUtil.get("lift_wrk_no_" + wrkNo);
+ Object o = redisUtil.get(RedisKeyType.LIFT.key + wrkNo);
if (o == null) {
return R.error();
}
@@ -311,13 +312,13 @@
@RequestMapping(value = "/command/rollback")
public R liftCommandRollback(@RequestParam("wrkNo") Integer wrkNo
, @RequestParam("commandStep") Integer commandStep) {
- Object o = redisUtil.get("lift_wrk_no_" + wrkNo);
+ Object o = redisUtil.get(RedisKeyType.LIFT.key + wrkNo);
if (o == null) {
return R.error();
}
LiftRedisCommand redisCommand = JSON.parseObject(o.toString(), LiftRedisCommand.class);
redisCommand.setCommandStep(commandStep);
- redisUtil.set("lift_wrk_no_" + wrkNo, JSON.toJSONString(redisCommand));
+ redisUtil.set(RedisKeyType.LIFT.key + wrkNo, JSON.toJSONString(redisCommand));
return R.ok();
}
@@ -326,7 +327,7 @@
public R liftCommandCompleteSwitch(@RequestParam("wrkNo") Integer wrkNo
, @RequestParam("commandStep") Integer commandStep
, @RequestParam("complete") Integer complete) {
- Object o = redisUtil.get("lift_wrk_no_" + wrkNo);
+ Object o = redisUtil.get(RedisKeyType.LIFT.key + wrkNo);
if (o == null) {
return R.error();
}
@@ -335,14 +336,14 @@
List<NyLiftCommand> commands = assignCommand.getCommands();
NyLiftCommand command = commands.get(commandStep);
command.setComplete(complete != 0);
- redisUtil.set("lift_wrk_no_" + wrkNo, JSON.toJSONString(redisCommand));
+ redisUtil.set(RedisKeyType.LIFT.key + wrkNo, JSON.toJSONString(redisCommand));
return R.ok();
}
//閲嶅惎浠诲姟(鍛戒护)
@RequestMapping(value = "/command/restart")
public R liftCommandCompleteSwitch(@RequestParam("wrkNo") Integer wrkNo) {
- Object o = redisUtil.get("lift_wrk_no_" + wrkNo);
+ Object o = redisUtil.get(RedisKeyType.LIFT.key + wrkNo);
if (o == null) {
return R.error();
}
@@ -368,11 +369,11 @@
//鍒犻櫎浠诲姟(鍛戒护)
@RequestMapping(value = "/command/del")
public R liftCommandDel(@RequestParam("wrkNo") Integer wrkNo) {
- Object o = redisUtil.get("lift_wrk_no_" + wrkNo);
+ Object o = redisUtil.get(RedisKeyType.LIFT.key + wrkNo);
if (o == null) {
return R.error();
}
- redisUtil.del("lift_wrk_no_" + wrkNo);
+ redisUtil.del(RedisKeyType.LIFT.key + wrkNo);
return R.ok();
}
--
Gitblit v1.9.1