From 0359860dbc5de19f3d099ff549af0b4c48a08221 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 10 Dec 2021 14:31:27 +0800
Subject: [PATCH] 经纬度实体类，计算中心点工具类，修改热力图接口经纬度顺序
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 973e952..0691274 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -292,14 +292,9 @@
queryWrapper.eq("monitor_point_id", mpId);
}
- //���������������������
- if (name != null) {
- queryWrapper.like("name", name);
- }
-
- //mac������������
- if (mac != null) {
- queryWrapper.like("mac", mac);
+ //���������������mac������������
+ if (name != null && mac != null) {
+ queryWrapper.like("name", name).or().like("mac", mac);
}
//������������,������create_time������
--
Gitblit v1.8.0