Subversion Repositories SmartDukaan

Rev

Rev 27350 | Rev 28449 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 27350 Rev 28303
Line 39... Line 39...
39
	private DeviceRepository deviceRepository;
39
	private DeviceRepository deviceRepository;
40
	
40
	
41
	@Autowired
41
	@Autowired
42
	private GpsLocationRepository gpsLocationRepository;
42
	private GpsLocationRepository gpsLocationRepository;
43
 
43
 
44
	private static final Logger LOGGER = LogManager.getLogger(RetailerController.class);
44
	private static final Logger LOGGER = LogManager.getLogger(DevicesController.class);
45
 
45
 
46
	@RequestMapping(value = "/devices/add-new", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
46
	@RequestMapping(value = "/devices/add-new", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
47
	@ApiImplicitParams({
47
	@ApiImplicitParams({
48
		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
48
		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
49
	@ApiOperation(value = "")
49
	@ApiOperation(value = "")
Line 65... Line 65...
65
		Device device = deviceRepository.selectByImeiNumber(addDevicesRequest.getImeinumber());
65
		Device device = deviceRepository.selectByImeiNumber(addDevicesRequest.getImeinumber());
66
		LOGGER.info("devices" + device);
66
		LOGGER.info("devices" + device);
67
		if (device == null) {
67
		if (device == null) {
68
			device = new Device();
68
			device = new Device();
69
			device.setImeiNumber(addDevicesRequest.getImeinumber());
69
			device.setImeiNumber(addDevicesRequest.getImeinumber());
-
 
70
			deviceRepository.persist(device);
70
		}
71
		}
71
		device.setUser_id(addDevicesRequest.getUser_id());
72
		device.setUser_id(addDevicesRequest.getUser_id());
72
		device.setBrand(addDevicesRequest.getBrand());
73
		device.setBrand(addDevicesRequest.getBrand());
73
		device.setManufacturer(addDevicesRequest.getManufacturer());
74
		device.setManufacturer(addDevicesRequest.getManufacturer());
74
		device.setModel(addDevicesRequest.getModel());
75
		device.setModel(addDevicesRequest.getModel());
Line 80... Line 81...
80
		LOGGER.info("gcm" + addDevicesRequest.getGcm_regid());
81
		LOGGER.info("gcm" + addDevicesRequest.getGcm_regid());
81
        else {
82
        else {
82
        	device.setFcmId(addDevicesRequest.getGcm_regid());
83
        	device.setFcmId(addDevicesRequest.getGcm_regid());
83
        }
84
        }
84
		device.setModified(LocalDateTime.now());
85
		device.setModified(LocalDateTime.now());
85
		deviceRepository.persist(device);
-
 
86
		return device;
86
		return device;
87
	}
87
	}
88
	
88
	
89
 
89
 
90
	@RequestMapping(value = "/devices/location", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
90
	@RequestMapping(value = "/devices/location", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
Line 97... Line 97...
97
		gpsLocation.setUserId(locationModel.getUserId());
97
		gpsLocation.setUserId(locationModel.getUserId());
98
		gpsLocation.setCreateTime(LocalDateTime.now());
98
		gpsLocation.setCreateTime(LocalDateTime.now());
99
		gpsLocationRepository.persist(gpsLocation);
99
		gpsLocationRepository.persist(gpsLocation);
100
		return responseSender.ok(true);
100
		return responseSender.ok(true);
101
	}
101
	}
102
}
102
}
103
103