From da0abda12d95d701f8873db506136898e66fef8e Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 02 Dec 2020 11:10:33 +0800
Subject: [PATCH] aqi首要污染物算法更新
---
src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java | 73 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
index 0d68e94..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;
@@ -275,6 +276,11 @@
}
@Override
+ public List<MonitorPoint> getMonitorPointsByOrganizationIds(Set<Integer> orgIds) {
+ return monitorPointMapper.getMonitorPointsByOrganizationIds(orgIds);
+ }
+
+ @Override
public List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters) {
Example example = new Example(MonitorPoint.class);
Criteria criteria = example.createCriteria();
@@ -298,45 +304,42 @@
public List<MonitorPoint> getMonitorPointsAndDevicesByRegion(Map<String, Object> parameters) {
//������������
Object organizationId = parameters.remove("organizationId");
+ //���������������������null������������null���������������������������msgKey���������������
ValidateUtil.notNull(organizationId, "param.is.null");
ValidateUtil.notNull(parameters.get("regionCode"), "param.is.null");
//������������������
ParameterUtils.getRegionType4RegionCode(parameters);
+ //������������code���������������
Example example = new Example(MonitorPoint.class);
Criteria criteria = example.createCriteria();
criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
+
+ //������������������������������������������������������������orgid������������������������
if (Constants.isNotSpecialOrgId(Integer.valueOf(organizationId.toString()))) {
- //criteria.andEqualTo("organizationId", organizationId);
Set<Integer> organizationIds = organizationService.getChildOrganizationIds(Integer.valueOf(organizationId.toString()));
criteria.andIn("organizationId", organizationIds);
}
criteria.andEqualTo(parameters.get("regionType") + "Code", parameters.remove("regionCode"));
-
- //���������������������
List<MonitorPoint> monitorPoints = monitorPointMapper.selectByExample(example);
- //���������������������������������
- Iterator<MonitorPoint> iterator = monitorPoints.iterator();
- /*while (iterator.hasNext()) {
- MonitorPoint monitorPoint = iterator.next();
- List<Device> devices = deviceService.getDevicesByMonitorPointId(monitorPoint.getId());
- if (ObjectUtils.isEmpty(devices)) {
- iterator.remove();
- } else {
- monitorPoint.setDevices(devices);
- }
-
- }*/
- Example deviceExample = new Example(Device.class);//���������
+
+ //������������������������
+ Example deviceExample = new Example(Device.class);
Criteria deviceCriteria = deviceExample.createCriteria();
deviceCriteria.orEqualTo("isDelete", Constants.IS_DELETE_FALSE);
List<Device> devicesInfo = deviceMapper.selectByExample(deviceExample);
- Example monitorExample = new Example(MonitorPoint.class);//���������
+
+ //������������������������
+ Example monitorExample = new Example(MonitorPoint.class);
Criteria monitorCriteria = monitorExample.createCriteria();
monitorCriteria.orEqualTo("isDelete", Constants.IS_DELETE_FALSE);
List<MonitorPoint> monitorPointInfo = monitorPointMapper.selectByExample(monitorExample);
+
+ //������������������������������
List<DeviceProperty> devicePropertyList = devicePropertyMapper.selectAll();
+
+ //������������������������������������������
for (Device d : devicesInfo) {
for (DeviceProperty dp : devicePropertyList) {
if (dp.getId().equals(d.getId())) {
@@ -344,6 +347,8 @@
}
}
}
+
+ //������������������������������������������
Map<Integer, List<Device>> monitorDeviceMap = new HashMap();
for (MonitorPoint m : monitorPointInfo) {
List<Device> monitorDevices = new ArrayList<>();
@@ -354,6 +359,9 @@
}
monitorDeviceMap.put(m.getId(), monitorDevices);
}
+
+ //������������Code���������������������������������������������
+ Iterator<MonitorPoint> iterator = monitorPoints.iterator();
while (iterator.hasNext()) {
MonitorPoint monitorPoint = iterator.next();
for (Map.Entry<Integer, List<Device>> entry : monitorDeviceMap.entrySet()) {
@@ -796,5 +804,36 @@
return params;
}
+ @Override
+ public JSONObject getMacList(int monitPointId) {
+ JSONObject params = new JSONObject();
+ MonitorPoint monitorPoint = monitorPointMapper.getMonitorPointById(monitPointId);
+
+ //������������������������
+ 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);
+ return params;
+ }
+
+ @Override
+ public List<MonitorPoint> getMonitorPointListByAccountId(int id) {
+ return monitorPointMapper.getMonitorPointListByAccountId(id);
+ }
+
+ @Override
+ public MonitorPoint byIdGetMonitorPoint(int id) {
+ return monitorPointMapper.byIdGetMonitorPoint(id);
+ }
+
+ @Override
+ public String getOrgIdByMac(String mac) {
+ return monitorPointMapper.getOrgIdByMac(mac);
+ }
+
}
--
Gitblit v1.8.0