From 9d5ca88ac4a73020adbc7d8a63b3de56480c5f6a Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 23 Jul 2021 15:33:14 +0800
Subject: [PATCH] 指令接口修改
---
src/main/java/org/springblade/modules/location/controller/LiveLocationController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/location/controller/LiveLocationController.java b/src/main/java/org/springblade/modules/location/controller/LiveLocationController.java
index 077bb7f..d6c33c2 100644
--- a/src/main/java/org/springblade/modules/location/controller/LiveLocationController.java
+++ b/src/main/java/org/springblade/modules/location/controller/LiveLocationController.java
@@ -64,24 +64,26 @@
@ApiOperation(value = "新增", notes = "传入liveLocation")
public R saveLiveLocationAndLocus(@RequestBody LiveLocation liveLocation) {
//先查询是否已有实时位置信息，如果有，则更新，没有则插入
- LiveLocationVo liveLocationVo = liveLocationService.selectLiveLocationInfo(liveLocation);
+ LiveLocation liveLocationInfo = liveLocationService.getLiveLocationInfo(liveLocation);
boolean status = false;
- if (null == liveLocationVo){
+ if (null == liveLocationInfo){
//新增
liveLocation.setRecordTime(new Date());
status = liveLocationService.save(liveLocation);
}else {
//更新
- liveLocationVo.setRecordTime(new Date());
- status = liveLocationService.updateById(liveLocationVo);
+ liveLocationInfo.setRecordTime(new Date());
+ liveLocationInfo.setLongitude(liveLocation.getLongitude());
+ liveLocationInfo.setLatitude(liveLocation.getLatitude());
+ status = liveLocationService.updateById(liveLocationInfo);
}
if (status){
//新增轨迹
Locus locus = new Locus();
//封装数据
- if (null!=liveLocationVo){
- locus.setLiveLocationId(liveLocationVo.getId());
+ if (null!=liveLocationInfo){
+ locus.setLiveLocationId(liveLocationInfo.getId());
}else {
locus.setLiveLocationId(liveLocation.getId());
}
@@ -149,4 +151,13 @@
return R.data(liveLocationService.getLocusInfoList(liveLocationVo));
}
+ /**
+ * 首页实时定位
+ * @return
+ */
+ @GetMapping("/getLiveLocationVoList")
+ public R<List<LiveLocationVo>> getLiveLocationVoList(LiveLocationVo liveLocationVo){
+ return R.data(liveLocationService.getLiveLocationVoList(liveLocationVo));
+ }
+
}
--
Gitblit v1.9.3