From 90b327d8609b08ae03ead6294244d5fc841d199a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 20 八月 2020 11:13:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/ConsoleController.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 835f7be..ef9a2c0 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -9,6 +9,7 @@
 import com.zy.asrs.domain.vo.*;
 import com.zy.asrs.entity.BasDevp;
 import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.LocMastMapper;
 import com.zy.asrs.service.BasDevpService;
 import com.zy.asrs.service.WrkMastService;
 import com.zy.common.CodeRes;
@@ -49,6 +50,8 @@
     private WrkMastService wrkMastService;
     @Autowired
     private BasDevpService basDevpService;
+    @Autowired
+    private LocMastMapper locMastMapper;
 
     @PostMapping("/system/running/status")
     @ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -119,7 +122,11 @@
             }
             CrnLatestDataVo vo = new CrnLatestDataVo();
             vo.setCrnId(crn.getId());   //  鍫嗗灈鏈虹紪鍙�
+
+//            Short totalBay = locMastMapper.selectTotalBay();
+
             vo.setOffset((double) new Random().nextInt(560));     //  鍫嗗灈鏈哄亸绉婚噺
+            vo.setBay(crnProtocol.getBay());    //  褰撳墠鍒�
             /**
              * 鍫嗗灈鏈虹姸鎬佸垽鏂�
              */

--
Gitblit v1.9.1