From 0a35a244f60da0d01a3a9142ed154fa9a83c4ad4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 03 六月 2021 18:25:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 01c0a5d..5c8f5ca 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;
@@ -34,7 +36,7 @@
return gridService.getGridDetail(gridId);
}
- @ApiOperation(value = "查询网格员今日运动轨迹-lyq",response = ComMapGridDetailVO.class)
+ @ApiOperation(value = "查询网格员今日运动轨迹-lyq",response = EventMapTrajectoryVO.class)
@PostMapping("getTrajectory")
public R getTrajectory(){
LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
@@ -44,8 +46,14 @@
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