From dbc664b7b328809818bd070e152248249ff2f939 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 16:04:13 +0800
Subject: [PATCH] 获取用户信息添加站点id
---
src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
index 2df2138..9c8e26e 100644
--- a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
@@ -42,6 +42,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
import tk.mybatis.mapper.entity.Example;
import tk.mybatis.mapper.entity.Example.Criteria;
@@ -272,6 +273,11 @@
}
example.orderBy("name").asc();
return monitorPointMapper.selectByExample(example);
+ }
+
+ @Override
+ public List<MonitorPoint> getMonitorPointsByOrganizationIds(Set<Integer> orgIds) {
+ return monitorPointMapper.getMonitorPointsByOrganizationIds(orgIds);
}
@Override
@@ -806,11 +812,11 @@
//������������������������
List<Device> deviceList = deviceService.getDeviceById2(monitPointId);
- params.put("longitudeCompany",monitorPoint.getLongitude());
- params.put("latitudeCompany",monitorPoint.getLatitude());
- params.put("latitudeCompany",monitorPoint.getLatitude());
- params.put("monitPointId",monitPointId);
- params.put("deviceList",deviceList);
+ params.put("longitudeCompany", monitorPoint.getLongitude());
+ params.put("latitudeCompany", monitorPoint.getLatitude());
+ params.put("latitudeCompany", monitorPoint.getLatitude());
+ params.put("monitPointId", monitPointId);
+ params.put("deviceList", deviceList);
return params;
}
@@ -824,5 +830,10 @@
return monitorPointMapper.byIdGetMonitorPoint(id);
}
+ @Override
+ public String getOrgIdByMac(String mac) {
+ return monitorPointMapper.getOrgIdByMac(mac);
+ }
+
}
--
Gitblit v1.8.0