From cd16757f2cd963749850d6f8897381a8b7a849ef Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 01 Feb 2018 15:09:43 +0800
Subject: [PATCH] 安全模块

---
 src/main/java/com/moral/service/impl/DeviceServiceImpl.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 152970a..eefb269 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -4,8 +4,10 @@
 
 import javax.annotation.Resource;
 
+import com.github.pagehelper.Page;
 import com.moral.common.bean.Constants;
 import com.moral.common.bean.PageBean;
+import com.moral.common.bean.PageResult;
 import com.moral.common.util.ExampleUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -102,6 +104,18 @@
 	}
 
 	@Override
+	public PageResult query(Integer orgId, String deviceName, Integer pageSize, Integer pageNo) {
+		if(!ObjectUtils.isEmpty(pageSize)&&!ObjectUtils.isEmpty(pageNo)){
+			PageHelper.startPage(pageNo,pageSize);
+		}
+		List list = deviceMapper.selectByOrgIdAndDevName(orgId,deviceName);
+		if(list instanceof Page){
+			return new PageResult(((Page) list).getTotal(),list);
+		}
+		return new PageResult(null,list);
+	}
+
+	@Override
 	public PageBean queryByPageBean(PageBean pageBean) {
 		Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);
 		List<Example.Criteria> criteriaList = example.getOredCriteria();
@@ -151,5 +165,12 @@
 		}
 	}
 
+	@Override
+	public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {
+		Device device = new Device();
+		device.setMonitorPointId(monitorPointId);
+		device.setIsDelete(Constants.IS_DELETE_FALSE);
+		return deviceMapper.select(device);
+	}
 
 }

--
Gitblit v1.8.0