From ebea64fcbd2b7881863755ec38e5cf37cdb60658 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 31 五月 2021 14:49:18 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test

---
 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 59 insertions(+), 0 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
new file mode 100644
index 0000000..5c8f5ca
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java
@@ -0,0 +1,59 @@
+package com.panzhihua.grid_app.api;
+
+import com.panzhihua.common.controller.BaseController;
+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;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author lyq
+ */
+@RestController
+@RequestMapping("/map/")
+@Api(tags = {"网格综治APP地图模块"})
+public class MapApi extends BaseController {
+
+    @Resource
+    private GridService gridService;
+
+    @ApiOperation(value = "根据网格id查询网格详细信息-lyq",response = ComMapGridDetailVO.class)
+    @PostMapping("getGridDetail")
+    public R getGridDetail(@RequestParam("gridId") Long gridId){
+        if(gridId == null){
+            return R.fail("参数错误");
+        }
+        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