From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +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/MapApi.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java
index b5ba894..116bbb3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java
@@ -4,6 +4,8 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.ComMapGridDetailVO;
+import com.panzhihua.common.model.vos.grid.EventMapGridVO;
+import com.panzhihua.common.model.vos.grid.EventMapTrajectoryVO;
import com.panzhihua.common.service.grid.GridService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -19,7 +21,7 @@
*/
@RestController
@RequestMapping("/map/")
-@Api(tags = {"网格综治APP地图模块"})
+@Api(tags = {"网格综治APP地图模块@lyq"})
public class MapApi extends BaseController {
@Resource
@@ -34,8 +36,24 @@
return gridService.getGridDetail(gridId);
}
+ @ApiOperation(value = "查询网格员今日运动轨迹-lyq",response = EventMapTrajectoryVO.class)
+ @PostMapping("getTrajectory")
+ public R getTrajectory(){
+ LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
+ if(userInfoVO == null || userInfoVO.getUserId() == null){
+ return R.fail("请先登录");
+ }
+ return gridService.getTrajectoryByApp(userInfoVO.getUserId());
+ }
-
-
+ @ApiOperation(value = "查询网格员关联网格列表-lyq",response = EventMapGridVO.class)
+ @PostMapping("getGridList")
+ public R getGridList(){
+ LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
+ if(userInfoVO == null || userInfoVO.getUserId() == null){
+ return R.fail("请先登录");
+ }
+ return gridService.getMapGridListByApp(userInfoVO.getUserId());
+ }
}
--
Gitblit v1.7.1