From ed8f0aeffb619c0540b16420320973207c55f015 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 08:52:49 +0800
Subject: [PATCH] 地图点击关闭弹窗

---
 src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
index beed2e6..6e8c2c3 100644
--- a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
@@ -8,18 +8,22 @@
 
 import javax.annotation.Resource;
 
-import com.github.pagehelper.PageHelper;
-import com.moral.common.bean.Constants;
-import com.moral.common.bean.PageBean;
-import com.moral.common.util.*;
-import com.moral.entity.Device;
-import com.moral.mapper.DeviceMapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 
+import com.github.pagehelper.PageHelper;
+import com.moral.common.bean.Constants;
+import com.moral.common.bean.PageBean;
+import com.moral.common.util.ExampleUtil;
+import com.moral.common.util.RedisUtils;
+import com.moral.common.util.StringUtils;
+import com.moral.common.util.ValidateUtil;
+import com.moral.entity.Device;
 import com.moral.entity.MonitorPoint;
+import com.moral.mapper.DeviceMapper;
 import com.moral.mapper.MonitorPointMapper;
 import com.moral.service.MonitorPointService;
+
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.entity.Example.Criteria;
 
@@ -171,4 +175,17 @@
         }).collect(Collectors.toList());
         return list;
     }
+
+    @Override
+	public List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId) {
+		Example example = new Example(MonitorPoint.class);
+		Criteria criteria = example.createCriteria();
+		
+		criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
+		if (Constants.isNotSpecialOrgId(orgId)) {
+			criteria.andEqualTo("organizationId", orgId);
+		}
+		example.orderBy("name").asc();
+		return monitorPointMapper.selectByExample(example);
+	}
 }

--
Gitblit v1.8.0