From ecb88714f8e92f7989e69da0f5e6215e6f65cb4c Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期日, 24 四月 2022 10:25:44 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 42 +++++++++++++-----------------------------
1 files changed, 13 insertions(+), 29 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 bc3fae9..9c49166 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
@@ -47,16 +47,16 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- List<String> list;
- list = monitorMapper.listMonitorDeviceSerial();
-
- MonitorParam monitorParam1;
- for (String devices_serial : list) {
- monitorParam1 = new MonitorParam();
- monitorParam1.setAccessToken(monitorService.getAccessToken());
- monitorParam1.setDeviceSerial(devices_serial);
- getYSYMonitorInfoAndaddMonitorToTable(monitorParam1);
- }
+// List<String> list;
+// list = monitorMapper.listMonitorDeviceSerial();
+//
+// MonitorParam monitorParam1;
+// for (String devices_serial : list) {
+// monitorParam1 = new MonitorParam();
+// monitorParam1.setAccessToken(monitorService.getAccessToken());
+// monitorParam1.setDeviceSerial(devices_serial);
+// getYSYMonitorInfoAndaddMonitorToTable(monitorParam1);
+// }
//杩斿洖鏌ヨ鐨勬憚鍍忓ご淇℃伅鍒楄〃
List<MonitorBo> listresult;
if (monitorParam == null) {
@@ -121,6 +121,7 @@
// YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
if ("200".equals(addMonitorDto.getCode())) {
+ getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
return ResponseUtil.success(addMonitorDto);
} else if ("20017".equals(addMonitorDto.getCode())) {
//宸茬粡琚嚜宸辨坊鍔犵殑鎽勫儚澶撮渶瑕佹坊鍔犲埌鏁版嵁搴�
@@ -188,25 +189,8 @@
*/
@PostMapping("/getYSYMonitorInfoAndaddMonitorToTable")
public boolean getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
- YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorService.getAccessToken(), monitorParam.getDeviceSerial());
-
- if ("200".equals(getMonitorDto.getCode())) {
- Monitor monitor = new Monitor();
- monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
- if (monitorParam.getValidateCode() != null) {
- monitor.setDevicesCode(monitorParam.getValidateCode());
- }
- monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
- monitor.setDeviceType(getMonitorDto.getData().getModel());
- monitor.setEquipmentState(getMonitorDto.getData().getStatus());
- monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
- monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
- monitor.setNetAddress(getMonitorDto.getData().getNetAddress());
-
- return monitorService.addMonitorInfoToTable(monitor);
- } else {
- throw new BusinessException(getMonitorDto.getMsg());
- }
+ Monitor monitor = monitorService.getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
+ return monitorService.addMonitorInfoToTable(monitor);
}
/**
--
Gitblit v1.9.3