From f1e25082a58c8cb57dd45d226d3a94f4af4a0677 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Feb 2018 15:07:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 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 78cbbd7..0462992 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;
@@ -57,11 +59,6 @@
}
@Override
- public List<Map<String, Object>> getSensorsByDevice(String mac) {
- return deviceMapper.getSensorsByDevice(mac);
- }
-
- @Override
@Transactional
public void saveOrUpdateDevice(Device device) {
ValidateUtil.notNull(device, "param.is.null");
@@ -102,6 +99,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();
--
Gitblit v1.8.0