From f8d5a58c5536b72117c342e5a22bd44aa6320c23 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 四月 2022 19:10:02 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
index c55a2c4..7a2cb09 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -54,6 +54,18 @@
* 妯＄硦鏌ヨ
*/
public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
+ List<String> list;
+ list = monitorMapper.listMonitorDeviceSerial();
+
+ MonitorParam monitorParam1;
+ for (String devices_serial : list) {
+ monitorParam1 = new MonitorParam();
+ monitorParam1.setAccessToken(getAccessToken());
+ monitorParam1.setDeviceSerial(devices_serial);
+ getYSYMonitorInfoAndaddMonitorToTable(monitorParam1);
+ }
+
+
Long clientId = SecurityUtils.getClientId();
if (baseConditionVO != null) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
@@ -69,11 +81,33 @@
monitorParam.setEquipmentState(2);
}
- monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), monitorParam.getBindingState(), monitorParam.getEquipmentState(), clientId);
+ monitorList = monitorMapper.listMonitorByIds(list, monitorParam.getKeyword(), monitorParam.getBindingState(), monitorParam.getEquipmentState(), clientId);
return monitorList;
}
+ public Monitor getYSYMonitorInfoAndaddMonitorToTable(MonitorParam monitorParam) {
+ YSY_MonitorDto getMonitorDto = getYSYMonitorInfo(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 monitor;
+ } else {
+ throw new BusinessException(getMonitorDto.getMsg());
+ }
+ }
+
/**
* 鍒犻櫎鎽勫儚澶�
*
--
Gitblit v1.9.3