|
@@ -365,7 +365,6 @@ public class CommonServiceImpl implements CommonService {
|
|
|
TruckSimCard truckSimCard = truckSimCardService.getOne(queryWrapper);
|
|
TruckSimCard truckSimCard = truckSimCardService.getOne(queryWrapper);
|
|
|
if (truckSimCard == null || StringUtils.isBlank(truckSimCard.getSimCard())) {
|
|
if (truckSimCard == null || StringUtils.isBlank(truckSimCard.getSimCard())) {
|
|
|
log.error("绑定信息不存在 truckId:{}", truckId);
|
|
log.error("绑定信息不存在 truckId:{}", truckId);
|
|
|
- clientIds.add(null);
|
|
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
clientIds.add(truckSimCard.getSimCard());
|
|
clientIds.add(truckSimCard.getSimCard());
|
|
@@ -416,7 +415,7 @@ public class CommonServiceImpl implements CommonService {
|
|
|
Map<String, LocationVO> result = new HashMap();
|
|
Map<String, LocationVO> result = new HashMap();
|
|
|
for (TmsMongoDoc doc : tmsMongoDocs) {
|
|
for (TmsMongoDoc doc : tmsMongoDocs) {
|
|
|
for (int i=0;i<clientIds.size();i++) {
|
|
for (int i=0;i<clientIds.size();i++) {
|
|
|
- if (StringUtils.isNotBlank(doc.getClientId()) && clientIds.get(i).equals(doc.getClientId())) {
|
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(doc.getClientId()) && doc.getClientId().equals(clientIds.get(i))) {
|
|
|
LocationVO location = new LocationVO();
|
|
LocationVO location = new LocationVO();
|
|
|
location.setLatitude(doc.getLatitude() + "");
|
|
location.setLatitude(doc.getLatitude() + "");
|
|
|
location.setLongitude(doc.getLongitude() + "");
|
|
location.setLongitude(doc.getLongitude() + "");
|