From 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 14 一月 2022 13:15:59 +0800
Subject: [PATCH] Merge branch 'renhequ' into dev
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java
index 4729f3d..a5190b1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java
@@ -2,6 +2,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.grid.GridMemberPositionDTO;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -80,7 +81,16 @@
commonEventAddDTO.setUserId(loginUserInfoVO.getUserId());
commonEventAddDTO.setUserName(loginUserInfoVO.getNickName());
commonEventAddDTO.setPhone(loginUserInfoVO.getPhone());
- return gridService.addCommon(commonEventAddDTO);
+ R r = gridService.addCommon(commonEventAddDTO);
+ if(R.isOk(r)){
+ GridMemberPositionDTO memberPositionDTO = new GridMemberPositionDTO();
+ memberPositionDTO.setGridMemberId(loginUserInfoVO.getUserId());
+ memberPositionDTO.setPositionAddress(commonEventAddDTO.getHappenAddress());
+ String []lngLatString = commonEventAddDTO.getHappentLatLng().split(",");
+ memberPositionDTO.setLngLat(lngLatString[1] + "," + lngLatString[0]);
+ gridService.gridReportPosition(memberPositionDTO);
+ }
+ return r;
}
/**
--
Gitblit v1.7.1