From 486428358c6a2252a48630df300873cb4c71a93c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 30 Jan 2018 22:37:45 +0800
Subject: [PATCH] updated

---
 src/main/java/com/moral/service/impl/DeviceServiceImpl.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 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 ded40ee..d834311 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -57,11 +57,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");
@@ -136,4 +131,27 @@
 		}
 	}
 
+	@Override
+	public void addOrModify(Device device){
+		try{
+			if(device.getId()==null){
+				device.setIsDelete(Constants.IS_DELETE_FALSE);
+				deviceMapper.insertSelective(device);
+			}else{
+				deviceMapper.updateByPrimaryKeySelective(device);
+			}
+		}
+		catch (Exception ex){
+			throw  ex;
+		}
+	}
+
+	@Override
+	public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {
+		Device device = new Device();
+		device.setMonitorPointId(monitorPointId);
+		device.setIsDelete(Constants.IS_DELETE_FALSE);
+		return deviceMapper.select(device);
+	}
+
 }

--
Gitblit v1.8.0