爱牵挂

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/endpoint/DeviceController.java

@@ -36,18 +36,53 @@ public class DeviceController {
        return deviceService.getCookie();
    }
    @ApiOperation("爱牵挂设备数据接收")
    @RequestMapping(value = "pushdata", produces = "application/x-www-form-urlencoded;charset=UTF-8", method = RequestMethod.POST)
    public String pushdata(
    @ApiOperation("爱牵挂设备sos数据接收")
    @RequestMapping(value = "aqgsos", produces = "application/x-www-form-urlencoded;charset=UTF-8", method = RequestMethod.POST)
    public String aqgsos(
            @ApiParam(name="imei",required = false,value="15位设备唯一序号",defaultValue = "")
            @RequestParam(value = "imei",required = false) String imei,
            @ApiParam(name="label_mac",required = false,value="只有主机下有绑定标贴才会发送这个参数，按哪个标贴就报哪个标贴Mac，按主机报警则不会发送",defaultValue = "")
            @RequestParam(value = "label_mac",required = false) String label_mac,
            @ApiParam(name="time_begin",required = false,value="发生时间YYYY-MM-DD HH:mm:SS",defaultValue = "1")
            @RequestParam(value = "time_begin",required = false) String time_begin) {
        try {
            logger.info(",imei="+imei+",label_mac="+label_mac+",time_begin="+time_begin);
            deviceService.aqgsos(imei, label_mac, time_begin);
            return success();
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1,"Device data incoming failure");
        }
    }
    @ApiOperation("爱牵挂设备开关机数据接收")
    @RequestMapping(value = "aqgSwitch", produces = "application/x-www-form-urlencoded;charset=UTF-8", method = RequestMethod.POST)
    public String aqgSwitch(
            @ApiParam(name="imei",required = false,value="15位设备唯一序号",defaultValue = "")
            @RequestParam(value = "imei",required = false) String imei,
            @ApiParam(name="time_begin",required = false,value="发生时间YYYY-MM-DD HH:mm:SS",defaultValue = "1")
            @RequestParam(value = "time_begin",required = false) String time_begin,
            @ApiParam(name="remaining_power",required = false,value="剩余电量(%） ",defaultValue = "")
            @RequestParam(value = "remaining_power",required = false) String remaining_power,
            @ApiParam(name="type",required = false,value="根据type来定义给用户推送提示  type=1 SOS，type=5 设备低电， 其他类型非本机型所有  开/关机类型  0开机 2普通  3低电 ",defaultValue = "")
            @ApiParam(name="type",required = false,value=" 开/关机类型  0开机 2普通  3低电 ",defaultValue = "")
            @RequestParam(value = "type",required = false) String type) {
        try {
            logger.info(",imei="+imei+",time_begin="+time_begin
                    +",remaining_power="+remaining_power+",type="+type);
            deviceService.aqgSwitch(imei, time_begin, remaining_power, type);
            return success();
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1,"Device data incoming failure");
        }
    }
    @ApiOperation("爱牵挂设备消息通知数据接收")
    @RequestMapping(value = "pushdata", produces = "application/x-www-form-urlencoded;charset=UTF-8", method = RequestMethod.POST)
    public String pushdata(
            @ApiParam(name="type",required = false,value="根据type来定义给用户推送提示  type=1 SOS，type=5 设备低电， 其他类型非本机型所有",defaultValue = "")
            @RequestParam(value = "type",required = false) String type,
            @ApiParam(name="deviceid",required = false,value="15位设备唯一序号",defaultValue = "")
            @RequestParam(value = "deviceid",required = false) String deviceid,
@@ -55,7 +90,9 @@ public class DeviceController {
            @RequestParam(value = "communityid",required = false) String communityid,
            HttpServletRequest request) {
        try {
            deviceService.pushdata(imei, label_mac, time_begin, remaining_power, type, deviceid, communityid, request);
            logger.info("type="+type+",deviceid="+deviceid+",communityid="+communityid);
            deviceService.pushdata(type, deviceid, communityid, request);
            return success();
        } catch (Exception e) {
            e.printStackTrace();

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/service/DeviceService.java

@@ -69,24 +69,49 @@ public class DeviceService {
    }
    /**
     * 爱牵挂设备数据接收
     * 爱牵挂设备SOS数据接收
     * @param imei 15位设备唯一序号
     * @param label_mac 只有主机下有绑定标贴才会发送这个参数，按哪个标贴就报哪个标贴Mac，按主机报警则不会发送
     * @param time_begin 发生时间YYYY-MM-DD HH:mm:SS
     */
    @Async
    public void aqgsos(String imei,String label_mac,String time_begin) {
        try {
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
    /**
     * 爱牵挂设备数据接收
     * @param imei 15位设备唯一序号
     * @param time_begin 发生时间YYYY-MM-DD HH:mm:SS
     * @param remaining_power 剩余电量(%）
     * @param type 开/关机类型  0开机 2普通  3低电
     */
    @Async
    public void aqgSwitch(String imei,String time_begin,String remaining_power,String type) {
        try {
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
    /**
     * 爱牵挂设备数据接收
     * @param type 根据type来定义给用户推送提示  type=1 SOS，type=5 设备低电， 其他类型非本机型所有
     *             开/关机类型  0开机 2普通  3低电
     *
     * @param deviceid 5位设备唯一序号
     * @param communityid 机构ID
     *
     *  如果deviceid有值 则为消息通知
     *  如果deviceid没值 type 有值 则为开关机通知
     *  否则为 SOS数据
     */
    @Async
    public void pushdata(String imei,String label_mac,String time_begin,String remaining_power,String type,
                         String deviceid,String communityid,HttpServletRequest request) {
    public void pushdata(String type,String deviceid,String communityid,HttpServletRequest request) {
        try {
            if(StringUtils.isNotBlank(deviceid)){