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 |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index 0104c32..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;
@@ -234,14 +235,14 @@
                     //绉诲姩鎵樼洏
                     int workNo = commonService.getWorkNo(3);//鑾峰彇浠诲姟鍙�
 
-                    LiftStaProtocol sourceLiftSta = NyLiftUtils.getLiftStaByStaNo(param.getSourceStaNo());
-                    LiftStaProtocol liftSta = NyLiftUtils.getLiftStaByStaNo(param.getStaNo());
-                    if (sourceLiftSta == null || liftSta == null) {
-                        throw new CoolException("婧愮珯鎴栫洰鏍囩珯涓嶅瓨鍦�");
-                    }
+//                    LiftStaProtocol sourceLiftSta = NyLiftUtils.getLiftStaByStaNo(param.getSourceStaNo());
+//                    LiftStaProtocol liftSta = NyLiftUtils.getLiftStaByStaNo(param.getStaNo());
+//                    if (sourceLiftSta == null || liftSta == null) {
+//                        throw new CoolException("婧愮珯鎴栫洰鏍囩珯涓嶅瓨鍦�");
+//                    }
 
                     //鑾峰彇鎻愬崌鏈哄懡浠�
-                    NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftProtocol.getLiftNo().intValue(), NyLiftTaskModelType.MOVE_TRAY.id, sourceLiftSta.getStaNo(), liftSta.getStaNo(), workNo);
+                    NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftProtocol.getLiftNo().intValue(), NyLiftTaskModelType.MOVE_TRAY.id, param.getSourceStaNo(), param.getStaNo(), workNo);
                     ArrayList<NyLiftCommand> commands = new ArrayList<>();
                     commands.add(liftCommand);
 
@@ -258,6 +259,10 @@
                     } else {
                         throw new CoolException("鍛戒护涓嬪彂澶辫触");
                     }
+                } else if (param.getLiftTaskMode() == 0) {
+                    //鎻愬崌鏈哄浣�
+                    liftProtocol.setToken(0);
+                    liftProtocol.setProtocolStatusType(LiftProtocolStatusType.IDLE);
                 } else {
                     throw new CoolException("鏈煡鍛戒护");
                 }
@@ -295,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();
         }
@@ -307,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();
     }
 
@@ -322,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();
         }
@@ -331,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();
         }
@@ -364,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