From bea70a46a56bf17497cdce897fd6892bc4597035 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 09 May 2018 09:13:32 +0800
Subject: [PATCH] getEquInfoByMac 提示改成中文的

---
 src/main/java/com/moral/controller/MobileController.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index 1e290e6..abe5d9b 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -110,10 +110,14 @@
 	@RequestMapping("getEquInfoByMac")
 	public AppData<Map> getDeviceByMac(@RequestParam(value="mac", required=true)String mac) {
 		Device device = deviceService.getDeviceByMac(mac,false);//���������������
-		Map<String,Object> deviceMap = new HashMap<>(BeanMap.create(device));
-		deviceMap.put("monitorpointDetail",deviceMap.get("monitorPoint"));
-		deviceMap.remove("monitorPoint");
-		return new AppData<Map>(deviceMap);
+		if(device!=null){
+			Map<String,Object> deviceMap = new HashMap<>(BeanMap.create(device));
+			deviceMap.put("monitorpointDetail",deviceMap.get("monitorPoint"));
+			deviceMap.remove("monitorPoint");
+			return new AppData<Map>(deviceMap);
+		}else{
+			return  new AppData("mac���������������",AppData.FAIL);
+		}
 	}
 
 	/**

--
Gitblit v1.8.0