From c75655f647c7f702e2e1381a0b568d713be29713 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 07 六月 2021 19:58:54 +0800
Subject: [PATCH] bugfixed
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberGpsLogServiceImpl.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberGpsLogServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberGpsLogServiceImpl.java
index d8a2b84..7cc73a0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberGpsLogServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberGpsLogServiceImpl.java
@@ -3,13 +3,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-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.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventGridMemberGpsLogService;
@@ -18,7 +16,9 @@
import org.springframework.beans.BeanUtils;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
/**
* @auther lyq
@@ -33,13 +33,14 @@
private EventGridMemberGpsLogMapper eventGridMemberGpsLogMapper;
/**
* 新增网格员定时上报地理信息
- * @param eventGridMemberGpsLogAddDTO
+ * @param memberPositionDTO 请求参数
* @return 新增结果
*/
- public R add(EventGridMemberGpsLogAddDTO eventGridMemberGpsLogAddDTO){
+ public R add(GridMemberPositionDTO memberPositionDTO){
EventGridMemberGpsLogDO eventGridMemberGpsLogDO = new EventGridMemberGpsLogDO();
- BeanUtils.copyProperties(eventGridMemberGpsLogAddDTO, eventGridMemberGpsLogDO);
+ BeanUtils.copyProperties(memberPositionDTO, eventGridMemberGpsLogDO);
eventGridMemberGpsLogDO.setCreateAt(new Date());
+ eventGridMemberGpsLogDO.setCreateBy(memberPositionDTO.getGridMemberId());
if(eventGridMemberGpsLogMapper.insert(eventGridMemberGpsLogDO)>0){
return R.ok();
}
@@ -101,4 +102,26 @@
return R.fail();
}
+ /**
+ * 根据网格员id查询今日轨迹
+ * @param userId 网格员id
+ * @return 网格员今日轨迹
+ */
+ @Override
+ public R getTrajectoryByApp(Long userId){
+ return R.ok(this.baseMapper.getTrajectoryByApp(userId));
+ }
+
+ /**
+ * 后台获取网格员运动轨迹
+ * @param workTrajectoryDTO 请求参数
+ * @return 运动轨迹
+ */
+ @Override
+ public R gridMemberWorkTrajectory(EventGridMemberWorkTrajectoryDTO workTrajectoryDTO){
+ List<String> workTrajectorys = new ArrayList<>();
+ workTrajectorys = this.baseMapper.gridMemberWorkTrajectory(workTrajectoryDTO);
+ return R.ok(workTrajectorys);
+ }
+
}
--
Gitblit v1.7.1