|
@@ -195,6 +195,7 @@ public class IotController { |
|
|
byte[] nid = { 0x36, 0x14}; |
|
|
byte[] nid = { 0x36, 0x14}; |
|
|
cdma.setNID(nid); |
|
|
cdma.setNID(nid); |
|
|
GZDeviceStatus deviceStatus = new GZDeviceStatus(); |
|
|
GZDeviceStatus deviceStatus = new GZDeviceStatus(); |
|
|
|
|
|
deviceStatus.setSOS(gps.getIdType() == 1); |
|
|
// deviceStatus.setOpenFirst(true); |
|
|
// deviceStatus.setOpenFirst(true); |
|
|
GpsDeviceStatus gpsDeviceStatus = gpsDeviceStatusMapper.selectByImei(gps.getImei()); |
|
|
GpsDeviceStatus gpsDeviceStatus = gpsDeviceStatusMapper.selectByImei(gps.getImei()); |
|
|
IOTDeviceStatus iotDeviceStatus = IOTDeviceStatus.build(gpsDeviceStatus.getDeviceStatus()); |
|
|
IOTDeviceStatus iotDeviceStatus = IOTDeviceStatus.build(gpsDeviceStatus.getDeviceStatus()); |
|
@@ -247,6 +248,7 @@ public class IotController { |
|
|
power.setCharge(false); |
|
|
power.setCharge(false); |
|
|
power.setPower(iotDeviceStatus.getBattery()); |
|
|
power.setPower(iotDeviceStatus.getBattery()); |
|
|
GZDeviceStatus deviceStatus = new GZDeviceStatus(); |
|
|
GZDeviceStatus deviceStatus = new GZDeviceStatus(); |
|
|
|
|
|
deviceStatus.setSOS(lbs.getIdType() == 1); |
|
|
LocalDateTime time = LocalDateTime.now(); |
|
|
LocalDateTime time = LocalDateTime.now(); |
|
|
GZLocationExtend extend = new GZLocationExtend(); |
|
|
GZLocationExtend extend = new GZLocationExtend(); |
|
|
GZLocation location; |
|
|
GZLocation location; |
|
@@ -306,6 +308,7 @@ public class IotController { |
|
|
power.setCharge(false); |
|
|
power.setCharge(false); |
|
|
power.setPower(batty); |
|
|
power.setPower(batty); |
|
|
GZDeviceStatus deviceStatus = new GZDeviceStatus(); |
|
|
GZDeviceStatus deviceStatus = new GZDeviceStatus(); |
|
|
|
|
|
deviceStatus.setSOS(wifi.getIdType() == 1); |
|
|
LocalDateTime time = LocalDateTime.now(); |
|
|
LocalDateTime time = LocalDateTime.now(); |
|
|
GZLocationExtend extend = new GZLocationExtend(); |
|
|
GZLocationExtend extend = new GZLocationExtend(); |
|
|
List<GZLocationWIFIItem> itemList = new ArrayList<>(); |
|
|
List<GZLocationWIFIItem> itemList = new ArrayList<>(); |
|
|