From fbb28c01b08e0f7c61ce20b9c2428c79d7799b9b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 09 May 2018 10:13:26 +0800
Subject: [PATCH] 设备分页 修复
---
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