From f3a83f291df05ee8de20fd751e720ac761f8586e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 22 Jun 2020 16:03:36 +0800
Subject: [PATCH] 无人机应用大屏页面update
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 773ce10..cc3ce03 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -1,5 +1,16 @@
package com.moral.service.impl;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+
import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
@@ -29,19 +40,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
-
import tk.mybatis.mapper.entity.Example;
-
-import javax.annotation.Resource;
-import javax.validation.constraints.NotNull;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
@Service
public class DeviceServiceImpl implements DeviceService {
@@ -214,7 +213,7 @@
List<Integer> orgIds = orgMapper.selectLowerOrgIds(orgId);
params.put("orgIds", orgIds);
deviceList = deviceMapper.selectByMap(params);
- loadDeviceState(deviceList);
+ // loadDeviceState(deviceList);
}
return deviceList;
}
@@ -631,4 +630,9 @@
}
return null;
}
+
+ @Override
+ public List<String> getMacsByOrganizationId(List<Object> organizationIdList) {
+ return deviceMapper.getMacsByOrganizationId(organizationIdList);
+ }
}
--
Gitblit v1.8.0