From cdd72249b457b83e425584c3fd9bdf82577179ea Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 09 May 2018 14:10:03 +0800
Subject: [PATCH] 三级警报 优化
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 69 +++++++++++++++++++++++++++++-----
1 files changed, 58 insertions(+), 11 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..d68aa2e 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������
@@ -101,6 +104,8 @@
device.setId(queryDevice.getId());
deviceMapper.updateByPrimaryKeySelective(device);
}
+ //������redis������������
+ refreshDeviceInRedis(device);
}
@Override
@@ -108,21 +113,36 @@
ValidateUtil.notNull(uid, "param.is.null");
Device device = new Device();
device.setOperateUserId(uid);
- PageHelper.startPage(pageIndex, pageSize);
+ PageHelper.startPage(pageIndex, pageSize,false);
List<Device> devices = deviceMapper.select(device);
return devices;
}
+ @Override
+ public Device getDeviceByMac (String mac ,boolean fromCache){
+ if(fromCache){
+ Device device = getDeviceFromRedis(mac);
+ if(device==null) {
+ device = deviceMapper.selectWithOrgIdsByMac(mac);
+ if(device!=null){
+ setDeviceToRedis(mac,device);
+ }
+ }
+ return device;
+ }else {
+ return deviceMapper.selectWithOrgIdsByMac(mac);
+ }
+ }
+
+ /**
+ * ���������������������
+ * @param mac
+ * @return
+ */
@Override
public Device getDeviceByMac(String mac) {
- Device device = getDeviceFromRedis(mac);
- if(device==null) {
- device = deviceMapper.selectWithOrgIdsByMac(mac);
- if(device!=null){
- setDeviceToRedis(mac,device);
- }
- }
- return device;
+
+ return getDeviceByMac(mac,true);
}
/*
* ���������������������redis������key
@@ -268,8 +288,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 +307,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 +357,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();
@@ -364,4 +405,10 @@
}).collect(Collectors.toList());
return list;
}
+
+ @Override
+ public Device queryById(Integer id) {
+ return deviceMapper.selectByPrimaryKey(id);
+ }
+
}
--
Gitblit v1.8.0