|  |  |  | 
|---|
|  |  |  | @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); | 
|---|
|  |  |  | } | 
|---|
|  |  |  | } | 
|---|
|  |  |  |  | 
|---|
|  |  |  | /** | 
|---|