From 77edfb324184d304ae7763aae3ab609f2b495da4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 七月 2022 17:31:47 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 57 ++++++++++++++++++++++-----------------------------------
1 files changed, 22 insertions(+), 35 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 1576f94..4b162fe 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
@@ -57,9 +57,9 @@
private final PoleBindingService poleBindingService;
/**
- * 妯＄硦鏌ヨ
+ * 鎽勫儚澶村垪琛ㄦā绯婃煡璇�
*/
- public CommonPage listMonitorByKeyword(BaseConditionVO baseConditionVO,Integer order,Integer seq, MonitorParam monitorParam) {
+ public CommonPage listMonitorByKeyword(BaseConditionVO baseConditionVO, Integer order, Integer seq, MonitorParam monitorParam) {
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
if (monitorParam.getBindingState() == null) {
//鍏ㄩ儴
@@ -68,7 +68,7 @@
//鎺掑簭瀛楁
String orderByResult = "id";
//姝ｅ簭銆佸�掑彊
- String orderBySeq =OrderByEnums.ASC.getCode();
+ String orderBySeq = OrderByEnums.ASC.getCode();
if (order != null) {
switch (order) {
case 1:
@@ -97,9 +97,9 @@
List<MonitorBo> list;
if (SecurityUtils.getClientId() == null) {
- list = monitorMapper.listMonitorDeviceSerial1(null, monitorParam.getKeyword(), monitorParam.getBindingState(),orderBy);
+ list = monitorMapper.listMonitorDeviceSerial1(null, monitorParam.getKeyword(), monitorParam.getBindingState(), orderBy);
} else {
- list = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), monitorParam.getKeyword(), monitorParam.getBindingState(),orderBy);
+ list = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), monitorParam.getKeyword(), monitorParam.getBindingState(), orderBy);
}
//娌℃湁鏁版嵁鏃跺�欑洿鎺ヨ繑鍥炵┖鏁扮粍
@@ -143,39 +143,26 @@
return commonPage;
}
- public Monitor getYSYMonitorInfoAndaddMonitorToTable(String deviceSerial) {
- YSY_MonitorDto getMonitorDto = getYSYMonitorInfo(getAccessToken(), deviceSerial);
+ /**
+ * 鎽勫儚澶村垪琛ㄥ湴锛堢敤浜庨椤垫暟鎹粺璁★級
+ *
+ * @return
+ */
+ public List<MonitorBo> listMonitorOnHome() {
- if ("200".equals(getMonitorDto.getCode())) {
- Monitor monitor = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceSerial));
- if (monitor != null) {
- monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
-
- 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());
- //鏇存柊鎽勫儚澶寸姸鎬�
- updateById(monitor);
- } else {
- monitor = new Monitor();
- monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
- 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());
- //鏇存柊鎽勫儚澶寸姸鎬�
- save(monitor);
- }
-
- return monitor;
+ List<MonitorBo> list;
+ if (SecurityUtils.getClientId() == null) {
+ list = monitorMapper.listMonitorDeviceSerial1(null, null, 2, null);
} else {
- return null;
+ list = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), null, 2, null);
}
+
+ //娌℃湁鏁版嵁鏃跺�欑洿鎺ヨ繑鍥炵┖鏁扮粍
+ if (list == null) {
+ return new ArrayList<>();
+ }
+
+ return list;
}
/**
--
Gitblit v1.9.3