From 8d2d5103aea98fab6ad94acd1c8421c05d1108fa Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 18 Jul 2018 09:26:39 +0800
Subject: [PATCH] 优化

---
 src/main/java/com/moral/service/impl/DeviceServiceImpl.java |   15 ++++++++++-----
 1 files changed, 10 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 bbac004..264ed65 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -316,8 +316,7 @@
 	private void refreshDeviceInRedis(String mac){
 	     if(!StringUtils.isBlank(mac)){
 	     	 Device device = deviceMapper.selectWithOrgIdsByMac(mac);
-             String key = "device_"+mac;
-			 setDeviceToRedis(key,device);
+			 setDeviceToRedis(mac,device);
          }else
 		 {
 		 	log.warn("param mac is null in method [refreshDeviceInRedis]");
@@ -347,12 +346,12 @@
 	@Override
 	public PageBean queryByPageBean(PageBean pageBean) {
 		Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);
-		addDeletesToExample(example);
+//		addDeletesToExample(example);
 		if(pageBean.getPageSize()>0){
 			PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
 		}
-		List<Device> organizationList = deviceMapper.selectWithRelationData(example);
-		return new PageBean(organizationList);
+		List<Device> deviceList = deviceMapper.selectWithRelationData(example);
+		return new PageBean(deviceList);
 	}
 
 	@Override
@@ -475,4 +474,10 @@
 		return deviceMapper.getDevicesByProfession(parameters);
 	}
 
+	@Override
+	public List<Device> getDevicesByOrganizationId(Map<String, Object> parameters) {
+		ValidateUtil.notNull(parameters.get("organizationId"), "param.is.null");
+		return deviceMapper.getDevicesByOrganizationId(parameters);
+	}
+
 }

--
Gitblit v1.8.0