From 3ea7e207b7c33edcea6f493baef53928133eecaf Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 19 Jan 2022 13:05:43 +0800
Subject: [PATCH] 服务范围添加边界绑定设备接口
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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 aa34315..d4269f1 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
@@ -1,5 +1,6 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -35,11 +36,7 @@
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
@@ -348,6 +345,9 @@
//������������
deviceInfo.put("extend", device.getExtend());
+ //������������������
+ deviceInfo.put("town", device.getTown());
+
//������
deviceInfo.put("professions", device.getProfessions());
@@ -519,6 +519,28 @@
deviceMapper.update(null, updateWrapper);
}
+ @Override
+ public List<Map<String, Object>> selectMonitorPiontAndDeviceByOrgId(int orgId) {
+ QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
+ monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ monitorPointQueryWrapper.eq("organization_id",orgId);
+ List<MonitorPoint> monitorPointList = monitorPointMapper.selectList(monitorPointQueryWrapper);
+ List<Map<String, Object>> resultList = new ArrayList<>();
+ for (MonitorPoint monitorPoint:monitorPointList) {
+ Map<String,Object> resultMap = new HashMap<>();
+ resultMap = JSON.parseObject(JSON.toJSONString(monitorPoint), Map.class);
+ int mp_id = monitorPoint.getId();
+ QueryWrapper<Device> deviceQueryWrapper = new QueryWrapper<>();
+ deviceQueryWrapper.eq("is_delete", Constants.NOT_DELETE);
+ deviceQueryWrapper.eq("monitor_point_id",mp_id);
+ List<Device> devices = new ArrayList<>();
+ devices = deviceMapper.selectList(deviceQueryWrapper);
+ resultMap.put("devices",devices);
+ resultList.add(resultMap);
+ }
+ return resultList;
+ }
+
//���������������������������
private int judgeState(List<Object> levels, Double data) {
int state = 1;
--
Gitblit v1.8.0