|  | @ -226,38 +226,6 @@ public class DeviceController {
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @ApiOperation("柏颐设备sos数据接收")
 | 
	
		
			
				|  |  |     @RequestMapping(value = "bySos", produces = "application/x-www-form-urlencoded;charset=UTF-8", method = {RequestMethod.POST,RequestMethod.GET})
 | 
	
		
			
				|  |  |     public String bySos(
 | 
	
		
			
				|  |  |             @ApiParam(name="imei",required = false,value="15位设备唯一序号",defaultValue = "")
 | 
	
		
			
				|  |  |             @RequestParam(value = "imei",required = true) String imei,
 | 
	
		
			
				|  |  |             @ApiParam(name="time_begin",required = false,value="发生时间YYYY-MM-DD HH:mm:SS")
 | 
	
		
			
				|  |  |             @RequestParam(value = "time_begin",required = false) String time_begin,
 | 
	
		
			
				|  |  |             @ApiParam(name="heartrate",required = false,value="心率")
 | 
	
		
			
				|  |  |             @RequestParam(value = "heartrate",required = false) int heartrate,
 | 
	
		
			
				|  |  |             @ApiParam(name="city",required = false,value="城市")
 | 
	
		
			
				|  |  |             @RequestParam(value = "city",required = false) String city,
 | 
	
		
			
				|  |  |             @ApiParam(name="address",required = false,value="地址")
 | 
	
		
			
				|  |  |             @RequestParam(value = "address",required = false) String address,
 | 
	
		
			
				|  |  |             @ApiParam(name="lon",required = false,value="经度")
 | 
	
		
			
				|  |  |             @RequestParam(value = "lon",required = false) double lon,
 | 
	
		
			
				|  |  |             @ApiParam(name="lat",required = false,value="纬度")
 | 
	
		
			
				|  |  |             @RequestParam(value = "lat",required = false) double lat,
 | 
	
		
			
				|  |  |             @ApiParam(name="type",required = false,value="类型  0:Gps定位; 1:基站定位")
 | 
	
		
			
				|  |  |             @RequestParam(value = "type",required = false) String type,
 | 
	
		
			
				|  |  |             HttpServletRequest request) {
 | 
	
		
			
				|  |  |         try {
 | 
	
		
			
				|  |  |             String paraString = JSON.toJSONString(request.getParameterMap());
 | 
	
		
			
				|  |  |             logger.info("请求参数:"+paraString);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |             deviceService.bySos(imei,time_begin,heartrate,city,address,lon,lat,type);
 | 
	
		
			
				|  |  |             return success();
 | 
	
		
			
				|  |  |         } catch (Exception e) {
 | 
	
		
			
				|  |  |             e.printStackTrace();
 | 
	
		
			
				|  |  |             return error(-1,"Device data incoming failure");
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @ApiOperation("柏颐设备步数接收")
 | 
	
		
			
				|  |  |     @RequestMapping(value = "bySteps", produces = "application/x-www-form-urlencoded;charset=UTF-8", method = {RequestMethod.POST,RequestMethod.GET})
 | 
	
		
			
				|  |  |     public String bySteps(
 | 
	
	
		
			
				|  | @ -310,57 +278,6 @@ public class DeviceController {
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @ApiOperation("柏颐设备开关机数据接收")
 | 
	
		
			
				|  |  |     @RequestMapping(value = "bySwitch", produces = "application/x-www-form-urlencoded;charset=UTF-8", method = {RequestMethod.POST,RequestMethod.GET})
 | 
	
		
			
				|  |  |     public String bySwitch(
 | 
	
		
			
				|  |  |             @ApiParam(name="imei",required = false,value="15位设备唯一序号",defaultValue = "")
 | 
	
		
			
				|  |  |             @RequestParam(value = "imei",required = true) String imei,
 | 
	
		
			
				|  |  |             @ApiParam(name="time_begin",required = false,value="发生时间YYYY-MM-DD HH:mm:SS")
 | 
	
		
			
				|  |  |             @RequestParam(value = "time_begin",required = false) String time_begin,
 | 
	
		
			
				|  |  |             @ApiParam(name="type",required = false,value="开/关机类型  0:开机; 1:关机; 2:电量上报; 3:低电通知")
 | 
	
		
			
				|  |  |             @RequestParam(value = "type",required = false) String type,
 | 
	
		
			
				|  |  |             @ApiParam(name="remaining_power",required = false,value="剩余电量(%)")
 | 
	
		
			
				|  |  |             @RequestParam(value = "remaining_power",required = false) int remaining_power,
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |             HttpServletRequest request) {
 | 
	
		
			
				|  |  |         try {
 | 
	
		
			
				|  |  |             String paraString = JSON.toJSONString(request.getParameterMap());
 | 
	
		
			
				|  |  |             logger.info("请求参数:"+paraString);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |             deviceService.bySwitch(imei,time_begin,type,remaining_power);
 | 
	
		
			
				|  |  |             return success();
 | 
	
		
			
				|  |  |         } catch (Exception e) {
 | 
	
		
			
				|  |  |             e.printStackTrace();
 | 
	
		
			
				|  |  |             return error(-1,"Device data incoming failure");
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @ApiOperation("柏颐设备消息通知数据接收")
 | 
	
		
			
				|  |  |     @RequestMapping(value = "byPushData", produces = "application/x-www-form-urlencoded;charset=UTF-8", method = {RequestMethod.POST,RequestMethod.GET})
 | 
	
		
			
				|  |  |     public String byPushData(
 | 
	
		
			
				|  |  |             @ApiParam(name="type",required = false,value="type=1 SOS,type=2 fall,type=3 new 新成员加入 ,type=4 电子围栏触发, type=5 设备低电,type=6 环境音 ",defaultValue = "")
 | 
	
		
			
				|  |  |             @RequestParam(value = "type",required = false) int type,
 | 
	
		
			
				|  |  |             @ApiParam(name="deviceid",required = false,value="15位设备唯一序号",defaultValue = "")
 | 
	
		
			
				|  |  |             @RequestParam(value = "deviceid",required = true) String deviceid,
 | 
	
		
			
				|  |  |             @ApiParam(name="communityid",required = false,value="机构ID")
 | 
	
		
			
				|  |  |             @RequestParam(value = "communityid",required = false) String communityid,
 | 
	
		
			
				|  |  |             @ApiParam(name="url",required = false,value="环境音下载地址 只有环境音(type=6)为必填,其他type都为非必填")
 | 
	
		
			
				|  |  |             @RequestParam(value = "url",required = false) String url,
 | 
	
		
			
				|  |  |             @ApiParam(name="name",required = false,value="设备名称")
 | 
	
		
			
				|  |  |             @RequestParam(value = "name",required = false) String name,
 | 
	
		
			
				|  |  |             HttpServletRequest request) {
 | 
	
		
			
				|  |  |         try {
 | 
	
		
			
				|  |  |             String paraString = JSON.toJSONString(request.getParameterMap());
 | 
	
		
			
				|  |  |             logger.info("请求参数:"+paraString);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |             deviceService.byPushData(type,deviceid,communityid,url,name);
 | 
	
		
			
				|  |  |             return success();
 | 
	
		
			
				|  |  |         } catch (Exception e) {
 | 
	
		
			
				|  |  |             e.printStackTrace();
 | 
	
		
			
				|  |  |             return error(-1,"Device data incoming failure");
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 返回接口处理结果
 |