java/Robotaxi.git

			@@ -5,11 +5,9 @@
			import com.xiaopeng.operation.repository.XpGeoQueryEntityRepository;
			import com.xiaopeng.operation.service.IXpGeoQueryEntityService;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.data.geo.Distance;
			import org.springframework.data.geo.GeoResults;
			import org.springframework.data.geo.Metrics;
			import org.springframework.data.geo.Point;
			import org.springframework.data.geo.*;
			import org.springframework.data.mongodb.core.MongoTemplate;
			import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
			import org.springframework.data.mongodb.core.query.Criteria;
			import org.springframework.data.mongodb.core.query.NearQuery;
			import org.springframework.data.mongodb.core.query.Query;
			@@ -42,7 +40,7 @@
			*/
			@Override
			public List<XpGeoQueryEntity> findByLocationWithin500MetersAndLastWeekAndStatusGreater(
			double longitude,
			double longitude,
			double latitude,
			String time
			) {
			@@ -52,37 +50,48 @@
			calendar.add(Calendar.DAY_OF_YEAR, -7);
			Long startTime = calendar.getTime().getTime();

			// 1. 创建查询点
			Point referencePoint = new Point(longitude, latitude);

			// 2. 构建 NearQuery - 完全使用 NearQuery 的 API
			NearQuery nearQuery = NearQuery.near(referencePoint, Metrics.KILOMETERS)
			.maxDistance(0.5) // 转成公里
			.spherical(true);


			// 3.时间>startTime time = time参数
			// 3. 创建额外的查询条件
			Query query = new Query();
			// // 1. 创建查询点
			// Point referencePoint = new Point(longitude, latitude);
			//
			// // 2. 构建 NearQuery - 完全使用 NearQuery 的 API
			// NearQuery nearQuery = NearQuery.near(referencePoint, Metrics.KILOMETERS)
			// .maxDistance(0.5) // 转成公里
			// .spherical(true);
			//
			//
			// // 3.时间>startTime time = time参数
			// // 3. 创建额外的查询条件
			// Query query = new Query();
			// query.addCriteria(Criteria.where("timestamp").gte(startTime));
			// query.addCriteria(Criteria.where("time").is(time));
			//
			// // 将 NearQuery 和额外的查询条件合并
			// nearQuery.query(query);
			//
			//
			// // 4. 执行查询 - 明确指定集合名
			// GeoResults<XpGeoQueryEntity> geoResults = mongoTemplate.geoNear(
			// nearQuery,
			// XpGeoQueryEntity.class,
			// "xp_geo_query_entity" // 明确指定集合名，避免映射错误
			// );
			//
			// // 5. 提取结果
			// return geoResults.getContent().stream()
			// .map(geoResult -> geoResult.getContent())
			// .collect(Collectors.toList());
			//找到中心点
			GeoJsonPoint geoJsonPoint = new GeoJsonPoint(longitude, latitude);
			//构造半径
			Distance distanceR = new Distance(0.5, Metrics.KILOMETERS);
			//画圆
			Circle circle = new Circle(geoJsonPoint, distanceR);
			// 构造query对象
			Query query = Query.query(Criteria.where("location").withinSphere(circle));
			query.addCriteria(Criteria.where("timestamp").gte(startTime));
			query.addCriteria(Criteria.where("time").is(time));

			// 将 NearQuery 和额外的查询条件合并
			nearQuery.query(query);


			// 4. 执行查询 - 明确指定集合名
			GeoResults<XpGeoQueryEntity> geoResults = mongoTemplate.geoNear(
			nearQuery,
			XpGeoQueryEntity.class,
			"xp_geo_query_entity" // 明确指定集合名，避免映射错误
			);

			// 5. 提取结果
			return geoResults.getContent().stream()
			.map(geoResult -> geoResult.getContent())
			.collect(Collectors.toList());

			List<XpGeoQueryEntity> xpGeoQueryEntities = mongoTemplate.find(query, XpGeoQueryEntity.class);
			return xpGeoQueryEntities;
			}

			/**
			@@ -96,7 +105,6 @@
			}



			@Override
			public XpGeoQueryEntity updateByOrderId(String orderId) {
			Query query = new Query(Criteria.where("orderId").is(orderId));
			@@ -105,9 +113,9 @@
			Long timestamp = xpGeoQueryEntity.getTimestamp();
			long time = new Date().getTime();
			// 计算2个时间的秒数差
			long seconds = (time- timestamp) / 1000;
			long seconds = (time - timestamp) / 1000;
			Update update = new Update().set("seconds", seconds).set("status", 1);
			if(xpGeoQueryEntity.getStatus()==0){
			if (xpGeoQueryEntity.getStatus() == 0) {
			mongoTemplate.findAndModify(query, update, XpGeoQueryEntity.class);
			}
			return null;
			@@ -141,4 +149,11 @@
			public List<XpGeoQueryEntity> findAll() {
			return repository.findAll();
			}

			@Override
			public void deleteXpGeoQueryEntity(String orderId) {
			Query query = new Query(Criteria.where("orderId").is(orderId));
			Update update = new Update().set("status", 2);
			mongoTemplate.findAndModify(query, update, XpGeoQueryEntity.class);
			}
			}