| Line 45... |
Line 45... |
| 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,
|
50 |
public ResponseEntity<?> devicesInfo1(HttpServletRequest request, @RequestBody AddDevicesRequest addDevicesRequest) {
|
| 51 |
@RequestBody AddDevicesRequest addDevicesRequest) {
|
- |
|
| 52 |
Device device = this.deviceInfo(request, addDevicesRequest);
|
51 |
Device device = this.deviceInfo(request, addDevicesRequest);
|
| 53 |
LOGGER.info("devices1" + device.getId());
|
52 |
LOGGER.info("devices1" + device.getId());
|
| 54 |
return responseSender.ok(device.getId());
|
53 |
return responseSender.ok(device.getId());
|
| 55 |
}
|
54 |
}
|
| 56 |
|
55 |
|
| Line 69... |
Line 68... |
| 69 |
Device device = deviceRepository.selectByImeiNumber(addDevicesRequest.getImeinumber());
|
68 |
Device device = deviceRepository.selectByImeiNumber(addDevicesRequest.getImeinumber());
|
| 70 |
// Web sends null IMEI — fallback to FCM token lookup to avoid duplicate rows
|
69 |
// Web sends null IMEI — fallback to FCM token lookup to avoid duplicate rows
|
| 71 |
if (device == null && addDevicesRequest.getImeinumber() == null && addDevicesRequest.getGcm_regid() != null) {
|
70 |
if (device == null && addDevicesRequest.getImeinumber() == null && addDevicesRequest.getGcm_regid() != null) {
|
| 72 |
device = deviceRepository.selectByFcmId(addDevicesRequest.getGcm_regid());
|
71 |
device = deviceRepository.selectByFcmId(addDevicesRequest.getGcm_regid());
|
| 73 |
}
|
72 |
}
|
| - |
|
73 |
LOGGER.info("addDevicesRequest: {}", addDevicesRequest);
|
| 74 |
LOGGER.info("devices" + device);
|
74 |
LOGGER.info("devices: {}", device);
|
| 75 |
if (device == null) {
|
75 |
if (device == null) {
|
| 76 |
device = new Device();
|
76 |
device = new Device();
|
| 77 |
device.setImeiNumber(addDevicesRequest.getImeinumber());
|
77 |
device.setImeiNumber(addDevicesRequest.getImeinumber());
|
| 78 |
}
|
78 |
}
|
| 79 |
device.setUser_id(addDevicesRequest.getUser_id());
|
79 |
device.setUser_id(addDevicesRequest.getUser_id());
|