From 4f015b8c624484e0c3b2d88b944163ce43a48d1f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 27 十一月 2021 17:15:28 +0800
Subject: [PATCH] 功能完善
---
app/src/main/java/com/yeshi/location/app/service/impl/location/LocationTravelServiceImpl.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/yeshi/location/app/service/impl/location/LocationTravelServiceImpl.java b/app/src/main/java/com/yeshi/location/app/service/impl/location/LocationTravelServiceImpl.java
index 170c732..f087e98 100644
--- a/app/src/main/java/com/yeshi/location/app/service/impl/location/LocationTravelServiceImpl.java
+++ b/app/src/main/java/com/yeshi/location/app/service/impl/location/LocationTravelServiceImpl.java
@@ -74,9 +74,23 @@
if (locationTravel.getId() == null) {
locationTravel.setId(LocationTravel.createId(locationTravel.getUid(), locationTravel.getCreateTime()));
}
- //淇濆瓨
- locationTravelDao.save(locationTravel);
+
+ //鑾峰彇鏈�鏂扮殑浣嶇疆
+ DaoQuery daoQuery = new DaoQuery();
+ daoQuery.uid = locationTravel.getUid();
+ daoQuery.sortList = Arrays.asList(new Sort.Order[]{Sort.Order.desc("createTime")});
+ daoQuery.count = 1;
+ List<LocationTravel> travelList = locationTravelDao.list(daoQuery);
+ if (travelList != null && travelList.size() > 0) {
+ //鍒ゆ柇璺濈
+ if (GeoUtils.getDistance(travelList.get(0).getLocation(), locationTravel.getLocation()) >= 10) {
+ //淇濆瓨
+ locationTravelDao.save(locationTravel);
+ }
+ } else {
+ locationTravelDao.save(locationTravel);
+ }
UserLatestLocation latest = new UserLatestLocation();
latest.setLocation(locationTravel.getLocation());
@@ -98,18 +112,16 @@
}
@Override
- public List<LocationTravel> getTravelList(Long uid, Date startTime, Date endTime) {
+ public List<LocationTravel> getTravelList(Long uid, Date startTime, Date endTime, int page, int pageSize) {
DaoQuery daoQuery = new DaoQuery();
daoQuery.minCreateTime = startTime;
daoQuery.maxCreateTime = endTime;
daoQuery.uid = uid;
+ daoQuery.start = (page - 1) * pageSize;
+ daoQuery.count = pageSize;
List<LocationTravel> travelList = locationTravelDao.list(daoQuery);
-
-
-
-
- return null;
+ return travelList;
}
@Override
--
Gitblit v1.8.0