Subversion Repositories SmartDukaan

Rev

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

Rev 28303 Rev 28449
Line 35... Line 35...
35 
	@Autowired
 35 
	@Autowired
36 
	ResponseSender<?> responseSender;
 36 
	ResponseSender<?> responseSender;
37 
 
 37 
 
38 
	@Autowired
 38 
	@Autowired
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(DevicesController.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 = "")
50 
	public ResponseEntity<?> devicesInfo1(HttpServletRequest request, @RequestBody AddDevicesRequest addDevicesRequest) {
 50 
	public ResponseEntity<?> devicesInfo1(HttpServletRequest request,
- 
 
 51 
			@RequestBody AddDevicesRequest addDevicesRequest) {
51 
		Device device = this.deviceInfo(request, addDevicesRequest);
 52 
		Device device = this.deviceInfo(request, addDevicesRequest);
- 
 
 53 
		LOGGER.info("devices1" + device.getId());
52 
		return responseSender.ok(device.getId());
 54 
		return responseSender.ok(device.getId());
53 
	}
 55 
	}
- 
 
 56 
 
54 
	@RequestMapping(value = "/devices/add", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
 57 
	@RequestMapping(value = "/devices/add", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
55 
	@ApiImplicitParams({
 58 
	@ApiImplicitParams({
56 
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 59 
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
57 
	@ApiOperation(value = "")
 60 
	@ApiOperation(value = "")
58 
	public ResponseEntity<?> devicesInfo(HttpServletRequest request, @RequestBody AddDevicesRequest addDevicesRequest)
 61 
	public ResponseEntity<?> devicesInfo(HttpServletRequest request, @RequestBody AddDevicesRequest addDevicesRequest)
59 
			throws ProfitMandiBusinessException {
 62 
			throws ProfitMandiBusinessException {
60 
		this.deviceInfo(request, addDevicesRequest);
 63 
		Device device = this.deviceInfo(request, addDevicesRequest);
- 
 
 64 
		LOGGER.info("devices2" + device.getId());
61 
		return responseSender.ok(true);
 65 
		return responseSender.ok(true);
62 
	}
 66 
	}
63
67 
 
64 
	private Device deviceInfo(HttpServletRequest request, AddDevicesRequest addDevicesRequest) {
 68 
	private Device deviceInfo(HttpServletRequest request, AddDevicesRequest addDevicesRequest) {
65 
		Device device = deviceRepository.selectByImeiNumber(addDevicesRequest.getImeinumber());
 69 
		Device device = deviceRepository.selectByImeiNumber(addDevicesRequest.getImeinumber());
66 
		LOGGER.info("devices" + device);
 70 
		LOGGER.info("devices" + device);
67 
		if (device == null) {
 71 
		if (device == null) {
68 
			device = new Device();
 72 
			device = new Device();
Line 75... Line 79...
75 
		device.setModel(addDevicesRequest.getModel());
 79 
		device.setModel(addDevicesRequest.getModel());
76 
		device.setOsVersion(addDevicesRequest.getOsversion());
 80 
		device.setOsVersion(addDevicesRequest.getOsversion());
77 
		device.setVersionCode(addDevicesRequest.getVersioncode());
 81 
		device.setVersionCode(addDevicesRequest.getVersioncode());
78 
		device.setVersionName(addDevicesRequest.getVersionname());
 82 
		device.setVersionName(addDevicesRequest.getVersionname());
79 
		device.setAndroidId(addDevicesRequest.getAndroidid());
 83 
		device.setAndroidId(addDevicesRequest.getAndroidid());
80 
        if(addDevicesRequest.getGcm_regid() == null)
 84 
		if (addDevicesRequest.getGcm_regid() == null)
81 
		LOGGER.info("gcm" + addDevicesRequest.getGcm_regid());
 85 
			LOGGER.info("gcm" + addDevicesRequest.getGcm_regid());
82 
        else {
 86 
		else {
83 
        	device.setFcmId(addDevicesRequest.getGcm_regid());
 87 
			device.setFcmId(addDevicesRequest.getGcm_regid());
84 
        }
 88 
		}
85 
		device.setModified(LocalDateTime.now());
 89 
		device.setModified(LocalDateTime.now());
86 
		return device;
 90 
		return device;
87 
	}
 91 
	}
88
- 
 
89 
 
 92 
 
90 
	@RequestMapping(value = "/devices/location", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
 93 
	@RequestMapping(value = "/devices/location", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
91 
	public ResponseEntity<?> deviceLocation(HttpServletRequest request, @RequestBody GpsLocationModel locationModel) {
 94 
	public ResponseEntity<?> deviceLocation(HttpServletRequest request, @RequestBody GpsLocationModel locationModel) {
92 
		GpsLocation gpsLocation = new GpsLocation();
 95 
		GpsLocation gpsLocation = new GpsLocation();
93 
		gpsLocation.setGps(locationModel.isGps());
 96 
		gpsLocation.setGps(locationModel.isGps());