From bd0d3a69bc5a38c11af4aa7222806bacdea97318 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 13 十二月 2023 09:05:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LiftController.java | 39 +++++++++++----------------------------
1 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index 244cb3c..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;
@@ -260,26 +261,8 @@
}
} else if (param.getLiftTaskMode() == 0) {
//鎻愬崌鏈哄浣�
- int workNo = commonService.getWorkNo(3);//鑾峰彇浠诲姟鍙�
-
- //鑾峰彇鎻愬崌鏈哄懡浠�
- NyLiftCommand liftCommand = NyLiftUtils.getLiftResetCommand(liftProtocol.getLiftNo().intValue());
- ArrayList<NyLiftCommand> commands = new ArrayList<>();
- commands.add(liftCommand);
-
- //鎻愪氦鍒扮嚎绋嬪幓宸ヤ綔
- LiftAssignCommand assignCommand = new LiftAssignCommand();
- assignCommand.setCommands(commands);
- assignCommand.setLiftNo(liftProtocol.getLiftNo());
- assignCommand.setTaskNo((short) workNo);
- assignCommand.setAuto(false);//鎵嬪姩妯″紡
- assignCommand.setTaskMode(NyLiftTaskModelType.RESET.id.shortValue());
-
- if (MessageQueue.offer(SlaveType.Lift, liftSlave.getId(), new Task(3, assignCommand))) {
- return R.ok();
- } else {
- throw new CoolException("鍛戒护涓嬪彂澶辫触");
- }
+ liftProtocol.setToken(0);
+ liftProtocol.setProtocolStatusType(LiftProtocolStatusType.IDLE);
} else {
throw new CoolException("鏈煡鍛戒护");
}
@@ -317,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();
}
@@ -329,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();
}
@@ -344,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();
}
@@ -353,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();
}
@@ -386,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