From 2fbc1ba833297236aac6ff68d441ec11522e9f37 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 14 四月 2022 09:45:00 +0800
Subject: [PATCH] 设备汇总
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
index dc1959e..eac56c2 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
@@ -90,6 +90,17 @@
}
/**
+ * 鑾峰彇钀ょ煶浜戞憚鍍忓ご淇℃伅
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/getYSYInfo/{deviceSerial}")
+ public ResponseVO<Object> getMonitorInfo(@PathVariable String deviceSerial) {
+ return ResponseUtil.success(monitorService.getMonitorInfo(deviceSerial));
+ }
+
+ /**
* 娣诲姞钀ょ煶浜戞憚鍍忓ご
*
* @param monitorParam 娣诲姞鎽勫儚澶寸粨鏋�
@@ -98,6 +109,7 @@
@PostMapping("/addYSYMonitor")
public ResponseVO<Object> addYSYMonitor(@RequestBody MonitorParam monitorParam) {
YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
+// YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
if ("200".equals(addMonitorDto.getCode())) {
return ResponseUtil.success(addMonitorDto);
@@ -143,7 +155,7 @@
if ("200".equals(getMonitorDto.getCode())) {
Monitor monitor = new Monitor();
monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
- monitor.setDevicesCode(monitorParam.getValidateCode());
+// monitor.setDevicesCode(monitorParam.getValidateCode());
monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
monitor.setDeviceType(getMonitorDto.getData().getModel());
monitor.setEquipmentState(getMonitorDto.getData().getStatus());
@@ -172,7 +184,7 @@
if ("200".equals(getMonitorDto.getCode())) {
Monitor monitor = new Monitor();
monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
- monitor.setDevicesCode(monitorParam.getValidateCode());
+// monitor.setDevicesCode(monitorParam.getValidateCode());
monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
monitor.setDeviceType(getMonitorDto.getData().getModel());
monitor.setEquipmentState(getMonitorDto.getData().getStatus());
--
Gitblit v1.9.3