From 1cc868492b79774b8103ce5589fbe6a2c7ad1fd9 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 04 May 2018 15:15:18 +0800
Subject: [PATCH] 修改ftp服务器
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index a3c7ea1..58b7dc2 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -10,12 +10,14 @@
import com.moral.common.bean.Constants;
import com.moral.common.bean.PageBean;
import com.moral.common.bean.PageResult;
+import com.moral.common.exception.BusinessException;
import com.moral.common.util.ExampleUtil;
import com.moral.common.util.RedisUtils;
import com.moral.mapper.MonitorPointMapper;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -30,6 +32,7 @@
@Service
public class DeviceServiceImpl implements DeviceService {
+ Logger log = Logger.getLogger(DeviceServiceImpl.class);
//-----------------------redis key������-������---------------------------------
private static String AlARM = "alarm";//������������������key������
private static String ADJUST="adjust";//���������������key������
@@ -268,8 +271,17 @@
}
}
@Override
- public PageBean queryByPageBean(PageBean pageBean) {
+ public int countByExample(PageBean pageBean){
Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);
+ addDeletesToExample(example);
+ return deviceMapper.selectCountByExample(example);
+ }
+
+ /**
+ * ������������������������
+ * @param example
+ */
+ private void addDeletesToExample(Example example){
List<Example.Criteria> criteriaList = example.getOredCriteria();
if(criteriaList!=null&&criteriaList.size()>0){
for(Example.Criteria cri : criteriaList){
@@ -278,6 +290,11 @@
}else {
example.or().andNotEqualTo("isDelete",Constants.IS_DELETE_TRUE);
}
+ }
+ @Override
+ public PageBean queryByPageBean(PageBean pageBean) {
+ Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);
+ addDeletesToExample(example);
if(pageBean.getPageSize()>0){
PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
}
@@ -323,7 +340,14 @@
throw ex;
}
}
-
+ @Override
+ public List<Map> countByTimes(Date start,Date end,String format){
+ if(start==null||end==null||StringUtils.isBlank(format)){
+ log.error("some params is null");
+ throw new BusinessException("some params is null");
+ }
+ return deviceMapper.countByTimes(start, end, format);
+ }
@Override
public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {
Device device = new Device();
--
Gitblit v1.8.0