From b77f77dae23be890dd98e03a8a9abffec9e3d94c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 28 Jun 2018 14:05:13 +0800
Subject: [PATCH] 展示下级组织数据
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 33ff1b4..e2873c2 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -14,6 +14,7 @@
import com.moral.common.util.ExampleUtil;
import com.moral.common.util.RedisUtils;
import com.moral.mapper.MonitorPointMapper;
+import com.moral.mapper.OrganizationMapper;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
@@ -55,6 +56,8 @@
@Resource
private AccountService accountService;
private Class ENTITY_CLASS = Device.class;
+ @Resource
+ OrganizationMapper orgMapper;
@Resource
RedisUtils redisUtils;
@Override
@@ -179,17 +182,23 @@
/**
*
- * @param map
+ * @param params
* map��� ������ ������id���4������������
* @return ������������������������
*/
@Override
- public List<Device> query(Map<String, Object> map) {
- List <Device> list = deviceMapper.selectByMap(map);
- loadDeviceState(list);
- return list;
+ public List<Device> query(Map<String, Object> params) {
+ Object orgIdObj = params.get("orgId");
+ List<Device> deviceList = null;
+ if(orgIdObj != null) {
+ Integer orgId = Integer.parseInt(orgIdObj.toString());
+ List<Integer> orgIds = orgMapper.selectLowerOrgIds(orgId);
+ params.put("orgIds", orgIds);
+ deviceList = deviceMapper.selectByMap(params);
+ loadDeviceState(deviceList);
+ }
+ return deviceList;
}
-
/**
* ������������id��������������� ������������������
* @param orgId
@@ -200,6 +209,7 @@
*/
@Override
public PageResult query(Integer orgId, String deviceName, Integer pageSize, Integer pageNo) {
+ List<Integer> orgIds = orgMapper.selectLowerOrgIds(orgId);
if(!ObjectUtils.isEmpty(pageSize)&&!ObjectUtils.isEmpty(pageNo)){
PageHelper.startPage(pageNo,pageSize);
}
@@ -221,7 +231,7 @@
state = "4";
deviceName = null;break;
}
- List<Device> list = deviceMapper.selectByOrgIdAndDevName(orgId,state,deviceName);
+ List<Device> list = deviceMapper.selectByOrgIdAndDevName(orgId,orgIds,state,deviceName);
//���redis������������
loadDeviceState(list);
if(list instanceof Page){
@@ -240,10 +250,11 @@
*/
@Override
public PageResult query(Integer orgId, Integer mpId, Integer pageSize, Integer pageNo) {
+ List<Integer> orgIds = orgMapper.selectLowerOrgIds(orgId);
if(!ObjectUtils.isEmpty(pageSize)&&!ObjectUtils.isEmpty(pageNo)){
PageHelper.startPage(pageNo,pageSize);
}
- List<Device> list = deviceMapper.selectByOrgIdAndMpId(orgId,mpId);
+ List<Device> list = deviceMapper.selectByOrgIdAndMpId(orgId,orgIds,mpId);
//���redis������������
loadDeviceState(list);
if(list instanceof Page){
--
Gitblit v1.8.0