From c0d88c1f82394c0374d2d592f4d2bca951d6334e Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 14 May 2018 15:58:07 +0800
Subject: [PATCH] 报表展示 增加行业筛选
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 93fad37..f6b20ef 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -113,10 +113,17 @@
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;
}
+
+ /**
+ *
+ * @param mac
+ * @param fromCache
+ * @return ������������������
+ */
@Override
public Device getDeviceByMac (String mac ,boolean fromCache){
if(fromCache){
@@ -271,20 +278,20 @@
*/
private void refreshDeviceInRedis(Device device){
if(!StringUtils.isBlank(device.getMac())){
- Device simpleDevice = new Device();
- simpleDevice.setId(device.getId());// id
- simpleDevice.setName(device.getName());// name
- simpleDevice.setAddress(device.getAddress());// address
- simpleDevice.setDeviceVersionId(device.getDeviceVersionId());// version
- simpleDevice.setMac(device.getMac()); // mac
- simpleDevice.setMonitorPointId(device.getMonitorPointId());// ���������id
- simpleDevice.setOrganizationIds(device.getOrganizationIds());// ������������
+// Device simpleDevice = new Device();
+// simpleDevice.setId(device.getId());// id
+// simpleDevice.setName(device.getName());// name
+// simpleDevice.setAddress(device.getAddress());// address
+// simpleDevice.setDeviceVersionId(device.getDeviceVersionId());// version
+// simpleDevice.setMac(device.getMac()); // mac
+// simpleDevice.setMonitorPointId(device.getMonitorPointId());// ���������id
+// simpleDevice.setOrganizationIds(device.getOrganizationIds());// ������������
if(device.getMonitorPointId()!=null){
List<Integer> orgIds = monitorPointMapper.selectOrganizationIds(device.getMonitorPointId());
- simpleDevice.setOrganizationIds(orgIds);
+ device.setOrganizationIds(orgIds);
}
String key = "device_"+device.getMac();
- redisUtils.set(key,simpleDevice);
+ redisUtils.set(key,device);
}
}
@Override
@@ -340,7 +347,7 @@
public void addOrModify(Device device){
try{
//mac ���������
- if(StringUtils.isBlank(device.getMac())){
+ if(!StringUtils.isBlank(device.getMac())){
device.setMac(device.getMac().toLowerCase());
}
if(device.getId()==null){
@@ -349,9 +356,9 @@
deviceMapper.insertSelective(device);
}else{
deviceMapper.updateByPrimaryKeySelective(device);
- //������redis���������������
- refreshDeviceInRedis(device);
}
+ //������redis���������������
+ refreshDeviceInRedis(device);
}
catch (Exception ex){
throw ex;
@@ -405,4 +412,16 @@
}).collect(Collectors.toList());
return list;
}
+
+ @Override
+ public Device queryById(Integer id) {
+ return deviceMapper.selectByPrimaryKey(id);
+ }
+
+ @Override
+ public List<Device> getDevicesByProfessionId(Map<String, Object> parameters) {
+
+ return deviceMapper.getDevicesByProfession(parameters);
+ }
+
}
--
Gitblit v1.8.0