|
|
@@ -255,7 +255,7 @@ public class CommonServiceImpl implements CommonService {
|
|
|
Query query = new Query(Criteria.where("clientId").is(truckSimCard.getSimCard()));
|
|
|
query.with(new Sort(Sort.Direction.DESC, "dateTime"));
|
|
|
TmsMongoDoc tmsMongoDoc = mongoTemplate.findOne(query, TmsMongoDoc.class);
|
|
|
- if (location != null) {
|
|
|
+ if (tmsMongoDoc != null) {
|
|
|
location = new LocationVO();
|
|
|
location.setLatitude(tmsMongoDoc.getLatitude() + "");
|
|
|
location.setLongitude(tmsMongoDoc.getLongitude() + "");
|
|
|
@@ -281,7 +281,7 @@ public class CommonServiceImpl implements CommonService {
|
|
|
Query query = new Query(criteria);
|
|
|
query.with(new Sort(Sort.Direction.ASC, "dateTime"));
|
|
|
TmsMongoDoc tmsMongoDoc = mongoTemplate.findOne(query, TmsMongoDoc.class);
|
|
|
- if (location != null) {
|
|
|
+ if (tmsMongoDoc != null) {
|
|
|
location = new LocationVO();
|
|
|
location.setLatitude(tmsMongoDoc.getLatitude() + "");
|
|
|
location.setLongitude(tmsMongoDoc.getLongitude() + "");
|
|
|
@@ -305,8 +305,7 @@ public class CommonServiceImpl implements CommonService {
|
|
|
return Collections.EMPTY_LIST;
|
|
|
}
|
|
|
Criteria criteria = Criteria.where("clientId").is(truckSimCard.getSimCard());
|
|
|
- criteria.andOperator(Criteria.where("createTime").gt(startDate));
|
|
|
- criteria.andOperator(Criteria.where("createTime").lt(endDate));
|
|
|
+ criteria.andOperator(Criteria.where("createTime").gt(startDate), Criteria.where("createTime").lt(endDate));
|
|
|
Query query = new Query(criteria);
|
|
|
List<TmsMongoDoc> tmsMongoDocs = mongoTemplate.find(query, TmsMongoDoc.class);
|
|
|
List<String> result = new ArrayList<>();
|