Subversion Repositories SmartDukaan

Rev

Rev 28449 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 28449 Rev 28450
Line 69... Line 69...
69
		Device device = deviceRepository.selectByImeiNumber(addDevicesRequest.getImeinumber());
69
		Device device = deviceRepository.selectByImeiNumber(addDevicesRequest.getImeinumber());
70
		LOGGER.info("devices" + device);
70
		LOGGER.info("devices" + device);
71
		if (device == null) {
71
		if (device == null) {
72
			device = new Device();
72
			device = new Device();
73
			device.setImeiNumber(addDevicesRequest.getImeinumber());
73
			device.setImeiNumber(addDevicesRequest.getImeinumber());
74
			deviceRepository.persist(device);
-
 
-
 
74
 
75
		}
75
		}
76
		device.setUser_id(addDevicesRequest.getUser_id());
76
		device.setUser_id(addDevicesRequest.getUser_id());
77
		device.setBrand(addDevicesRequest.getBrand());
77
		device.setBrand(addDevicesRequest.getBrand());
78
		device.setManufacturer(addDevicesRequest.getManufacturer());
78
		device.setManufacturer(addDevicesRequest.getManufacturer());
79
		device.setModel(addDevicesRequest.getModel());
79
		device.setModel(addDevicesRequest.getModel());
Line 85... Line 85...
85
			LOGGER.info("gcm" + addDevicesRequest.getGcm_regid());
85
			LOGGER.info("gcm" + addDevicesRequest.getGcm_regid());
86
		else {
86
		else {
87
			device.setFcmId(addDevicesRequest.getGcm_regid());
87
			device.setFcmId(addDevicesRequest.getGcm_regid());
88
		}
88
		}
89
		device.setModified(LocalDateTime.now());
89
		device.setModified(LocalDateTime.now());
-
 
90
		deviceRepository.persist(device);
90
		return device;
91
		return device;
91
	}
92
	}
92
 
93
 
93
	@RequestMapping(value = "/devices/location", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
94
	@RequestMapping(value = "/devices/location", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
94
	public ResponseEntity<?> deviceLocation(HttpServletRequest request, @RequestBody GpsLocationModel locationModel) {
95
	public ResponseEntity<?> deviceLocation(HttpServletRequest request, @RequestBody GpsLocationModel locationModel) {