From 44bddde6414f5c7565c21ef510c6c63dbc0971c3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 一月 2021 15:12:50 +0800
Subject: [PATCH] #test

---
 src/main/java/com/zy/asrs/controller/CrnController.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 4b5edf5..6cfaab7 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -216,6 +216,7 @@
         return R.ok().add(str.toString());
     }
 
+
     @PostMapping("/demo/switch")
     @ManagerAuth(memo = "鍫嗗灈鏈烘紨绀�")
     public R crnDemo(CrnDemoParam param) throws InterruptedException {
@@ -229,11 +230,17 @@
             return R.error("鍙d护閿欒");
         }
         Thread.sleep(200L);
-        mainService.crnDemoOfLocMove(param.getCrnId());
+        for (CrnSlave crnSlave : slaveProperties.getCrn()) {
+            if (crnSlave.getId().equals(param.getCrnId())) {
+                crnSlave.setDemo(param.getOpt());
+            }
+        }
+//        mainService.crnDemoOfLocMove(param.getCrnId());
         return R.ok();
     }
 
 
+
     /****************************************************************/
     /************************** 鎵嬪姩鎿嶄綔 ******************************/
     /****************************************************************/

--
Gitblit v1.9.1