From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberGpsLogService.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberGpsLogService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberGpsLogService.java
index 2590a91..5cbfd48 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberGpsLogService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberGpsLogService.java
@@ -2,13 +2,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridMemberGpsLogDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO;
+import com.panzhihua.common.model.vos.grid.GridMemberPositionDTO;
import com.panzhihua.service_grid.model.dos.EventGridMemberGpsLogDO;
/**
@@ -23,10 +21,10 @@
/**
* 新增网格员定时上报地理信息
- * @param eventGridMemberGpsLogAddDTO
+ * @param memberPositionDTO 请求参数
* @return 新增结果
*/
- R add(EventGridMemberGpsLogAddDTO eventGridMemberGpsLogAddDTO);
+ R add(GridMemberPositionDTO memberPositionDTO);
/**
* 修改网格员定时上报地理信息
@@ -63,5 +61,12 @@
*/
R getTrajectoryByApp(Long userId);
+ /**
+ * 后台获取网格员运动轨迹
+ * @param workTrajectoryDTO 请求参数
+ * @return 运动轨迹
+ */
+ R gridMemberWorkTrajectory(EventGridMemberWorkTrajectoryDTO workTrajectoryDTO);
+
}
--
Gitblit v1.7.1