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/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java
index 96ec53c..de3fc67 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java
@@ -7,16 +7,19 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.grid.GridMemberPositionDTO;
import com.panzhihua.common.service.auth.TokenService;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.grid.GridService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -110,4 +113,15 @@
return gridService.editionUpdate();
}
+ @ApiOperation(value = "网格员定时上报地理位置-lyq")
+ @PostMapping("/report")
+ public R gridReportPosition(@RequestBody @Validated(AddGroup.class)GridMemberPositionDTO memberPositionDTO){
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if(loginUserInfo == null){
+ return R.fail("请先登录");
+ }
+ memberPositionDTO.setGridMemberId(loginUserInfo.getUserId());
+ return gridService.gridReportPosition(memberPositionDTO);
+ }
+
}
--
Gitblit v1.7.1