From 56a777ac578a88e480783cd9dc0580abf3358c21 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 14 十二月 2021 10:41:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/west_bigscreen_dev' into west_bigscreen_dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java |   61 +++++++++++++++++++++---------
 1 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java
index 549fe4b..fb33e25 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java
@@ -1,15 +1,18 @@
 package com.panzhihua.service_grid.api;
 
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.model.dtos.grid.EventGridCascadeListDTO;
 import com.panzhihua.common.model.dtos.grid.EventGridMemberWainDTO;
 import com.panzhihua.common.model.dtos.grid.EventGridMemberWorkTrajectoryDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.utlis.DateUtils;
 import com.panzhihua.common.utlis.StringUtils;
 import com.panzhihua.service_grid.service.*;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * 地图模块api
@@ -32,42 +35,50 @@
 
     /**
      * 地图模块-根据网格id查询网格详细信息
-     * @param gridId    网格id
-     * @return  网格详细信息
+     * 
+     * @param gridId
+     *            网格id
+     * @return 网格详细信息
      */
     @PostMapping("getGridDetail")
-    public R getGridDetail(@RequestParam("gridId") Long gridId){
+    public R getGridDetail(@RequestParam("gridId") Long gridId) {
         return eventGridDataService.getMapGridDetail(gridId);
     }
 
     /**
      * 根据网格员id查询今日轨迹
-     * @param userId    网格员id
-     * @return  网格员今日轨迹
+     * 
+     * @param userId
+     *            网格员id
+     * @return 网格员今日轨迹
      */
     @PostMapping("/getTrajectoryByApp")
-    public R getTrajectoryByApp(@RequestParam("userId") Long userId){
+    public R getTrajectoryByApp(@RequestParam("userId") Long userId) {
         return eventGridMemberGpsLogService.getTrajectoryByApp(userId);
     }
 
     /**
      * 根据网格员id查询关联网格列表
-     * @param userId    网格员id
-     * @return  网格列表
+     * 
+     * @param userId
+     *            网格员id
+     * @return 网格列表
      */
     @PostMapping("getMapGridListByApp")
-    public R getMapGridListByApp(@RequestParam("userId") Long userId){
+    public R getMapGridListByApp(@RequestParam("userId") Long userId) {
         return eventGridMemberRelationService.getMapGridListByApp(userId);
     }
 
     /**
      * 后台获取网格员运动轨迹
-     * @param workTrajectoryDTO 请求参数
-     * @return  运动轨迹
+     * 
+     * @param workTrajectoryDTO
+     *            请求参数
+     * @return 运动轨迹
      */
     @PostMapping("gridMemberWorkTrajectory")
-    public R gridMemberWorkTrajectory(@RequestBody EventGridMemberWorkTrajectoryDTO workTrajectoryDTO){
-        if(StringUtils.isEmpty(workTrajectoryDTO.getTime())){
+    public R gridMemberWorkTrajectory(@RequestBody EventGridMemberWorkTrajectoryDTO workTrajectoryDTO) {
+        if (StringUtils.isEmpty(workTrajectoryDTO.getTime())) {
             workTrajectoryDTO.setTime(DateUtils.getCurrentDateStrymd());
         }
         return eventGridMemberGpsLogService.gridMemberWorkTrajectory(workTrajectoryDTO);
@@ -75,12 +86,24 @@
 
     /**
      * 后台获取网格员预警记录
-     * @param gridMemberWainDTO 请求参数
-     * @return  预警记录
+     * 
+     * @param gridMemberWainDTO
+     *            请求参数
+     * @return 预警记录
      */
     @PostMapping("gridMemberWorkWarning")
-    public R gridMemberWorkWarning(@RequestBody EventGridMemberWainDTO gridMemberWainDTO){
+    public R gridMemberWorkWarning(@RequestBody EventGridMemberWainDTO gridMemberWainDTO) {
         return eventGridMemberWarnLogService.gridMemberWorkWarning(gridMemberWainDTO);
     }
 
+    @PostMapping("getMapGridListsByApp")
+    public R getMapGridListsByApp(@RequestBody EventGridCascadeListDTO cascadeListDTO) {
+        return eventGridMemberRelationService.getMapGridListsByApp(cascadeListDTO);
+    }
+
+    @PostMapping("getMapGridsListsByApp")
+    public R getMapGridsListsByApp(@RequestParam("userId") Long userId) {
+        return eventGridMemberRelationService.getMapGridsListsByApp(userId);
+    }
+
 }

--
Gitblit v1.7.1