From a8c6cd0061792347f46e6777b5897c785f954210 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 20 Sep 2018 11:41:38 +0800
Subject: [PATCH] 优化
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 8aa95dc..345dceb 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -4,6 +4,7 @@
import java.util.stream.Collectors;
import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.Page;
@@ -14,9 +15,7 @@
import com.moral.common.util.ExampleUtil;
import com.moral.common.util.RedisUtils;
import com.moral.entity.DeviceVersion;
-import com.moral.mapper.DeviceVersionMapper;
-import com.moral.mapper.MonitorPointMapper;
-import com.moral.mapper.OrganizationMapper;
+import com.moral.mapper.*;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
@@ -28,7 +27,6 @@
import com.github.pagehelper.PageHelper;
import com.moral.common.util.ValidateUtil;
import com.moral.entity.Device;
-import com.moral.mapper.DeviceMapper;
import com.moral.service.AccountService;
import com.moral.service.DeviceService;
import tk.mybatis.mapper.entity.Example;
@@ -64,6 +62,10 @@
DeviceVersionMapper deviceVersionMapper;
@Resource
RedisUtils redisUtils;
+ @Resource
+ OrganizationMapper organizationMapper;
+ @Resource
+ DictionaryDataMapper dictionaryDataMapper;
@Override
public Map<String, Object> getDeviceStatesByAccount(Map<String, Object> parameters) {
ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
@@ -476,7 +478,37 @@
@Override
public List<Device> getDevicesByOrganizationId(Map<String, Object> parameters) {
+ ValidateUtil.notNull(parameters.get("organizationId"), "param.is.null");
return deviceMapper.getDevicesByOrganizationId(parameters);
}
-
+ @Override
+ public Map<String,Long> queryDeviceStateSummary(@NotNull Integer orgId){
+ Map<String,Object> params = new HashMap<>();
+ if(!dictionaryDataMapper.isSupperOrgId(orgId)){
+ List<Integer> orgIds = organizationMapper.selectLowerOrgIds(orgId);
+ params.put("orgIds",orgIds);
+ }
+ List<Map<String, Object>> list = deviceMapper.getDeviceStatesByAccount(params);
+ Long all = 0L, normal = 0L, abnormal = 0L, stop = 0L;
+ for (Map<String, Object> map : list) {
+ Long count = (Long) map.get("count");
+ all += count;
+ switch (Integer.valueOf((String) map.get("state"))) {
+ case 0:
+ normal = count;
+ break;
+ case 4:
+ stop = count;
+ break;
+ default:
+ abnormal += count;
+ }
+ }
+ Map<String,Long> result = new HashMap<>();
+ result.put("all", all);
+ result.put("normal", normal);
+ result.put("abnormal", abnormal);
+ result.put("stop", stop);
+ return result;
+ }
}
--
Gitblit v1.8.0