From 67b9a654ef3dc38366962e8ea867fc291dcdcdd0 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 07 六月 2021 17:33:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberGpsLogServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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 91ee9b5..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
@@ -7,6 +7,7 @@
 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;
@@ -32,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();
         }

--
Gitblit v1.7.1