From a3626ea0955f393d454c012745961263b443b00b Mon Sep 17 00:00:00 2001
From: lyd <1419499670@qq.com>
Date: Wed, 17 Aug 2022 16:01:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=88=9E=E5=8F=B0=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rest/DeviceStageMonitorController.java    | 29 +++++++++++++------
 .../src/api/acs/monitor/deviceStageMonitor.js |  9 ++++++
 .../views/system/logicflow/monitor/index.vue  |  3 +-
 3 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 acs/qd/src/api/acs/monitor/deviceStageMonitor.js

diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java
index 233c892..e4eaf06 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java
@@ -1,27 +1,38 @@
 package org.nl.acs.monitor.rest;
 
 import com.alibaba.fastjson.JSONArray;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.monitor.service.DeviceStageMonitorService;
 import org.nl.annotation.Log;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Author: lyd
- * @Description:
+ * @Description: 设备信息
  * @Date: 2022-08-17
  */
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "设备信息")
+@RequestMapping("/api/deviceInfo")
 public class DeviceStageMonitorController {
 
+    private final DeviceStageMonitorService deviceStageMonitorService;
 
-
-//    @PostMapping("/getDeviceByCodes")
-//    @Log("获取舞台设备信息")
-//    @ApiOperation("获取舞台设备信息")
-//    public ResponseEntity<Object> getDeviceByCodes(@RequestBody String json) throws Exception{
-//        JSONArray jsonArray = JSONArray.parseArray(json);
-//        return new ResponseEntity<>(stageService.getDeviceByCodes(jsonArray), HttpStatus.OK);
-//    }
+    @Log("获取舞台设备信息")
+    @ApiOperation("获取舞台设备信息")
+    @PostMapping("/getDeviceByCodes")
+    public ResponseEntity<Object> getDeviceByCodes(@RequestBody String json) {
+        JSONArray jsonArray = JSONArray.parseArray(json);
+        return new ResponseEntity<>(deviceStageMonitorService.getData(jsonArray), HttpStatus.OK);
+    }
 }
diff --git a/acs/qd/src/api/acs/monitor/deviceStageMonitor.js b/acs/qd/src/api/acs/monitor/deviceStageMonitor.js
new file mode 100644
index 0000000..00d7228
--- /dev/null
+++ b/acs/qd/src/api/acs/monitor/deviceStageMonitor.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function getDeviceByCodes(data) { // 获取舞台上设备信息
+  return request({
+    url: 'api/deviceInfo/getDeviceByCodes',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/acs/qd/src/views/system/logicflow/monitor/index.vue b/acs/qd/src/views/system/logicflow/monitor/index.vue
index 91a504d..2a1f834 100644
--- a/acs/qd/src/views/system/logicflow/monitor/index.vue
+++ b/acs/qd/src/views/system/logicflow/monitor/index.vue
@@ -121,6 +121,7 @@
 import crudStage from '@/api/logicflow/stage'
 import paramCrud from '@/api/system/param'
 import deviceCrud from '@/api/acs/device/device'
+import { getDeviceByCodes } from '@/api/acs/monitor/deviceStageMonitor'
 import '@logicflow/core/dist/style/index.css'
 import '@logicflow/extension/lib/style/index.css'
 
@@ -469,7 +470,7 @@ export default {
     initStatus() { // 初始化所有节点的设备信息，通过节点id对应设备编号
       let resion = {}
       resion = lf.getGraphData().nodes.map(item => ({ id: item.id, device_code: item.properties.device }))
-      crudStage.getDeviceByCodes(resion).then(res => {
+      getDeviceByCodes(resion).then(res => {
         this.allDeviceMsg = res // 拿到所有节点的设备数据
         console.log('initStatus-res', res)
         for (var item of res) { // 循环并且设置属性值