Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

huanghongfa

2021-05-31 faa40222f2e15b68a89d2180b57d444de5b67709

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java

@@ -2,6 +2,8 @@

import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_grid.service.EventGridDataService;
import com.panzhihua.service_grid.service.EventGridMemberGpsLogService;
import com.panzhihua.service_grid.service.EventGridMemberRelationService;
import com.panzhihua.service_grid.service.EventService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
@@ -23,6 +25,10 @@
    private EventService eventService;
    @Resource
    private EventGridDataService eventGridDataService;
    @Resource
    private EventGridMemberGpsLogService eventGridMemberGpsLogService;
    @Resource
    private EventGridMemberRelationService eventGridMemberRelationService;

    /**
     * 地图模块-根据网格id查询网格详细信息
@@ -34,4 +40,24 @@
        return eventGridDataService.getMapGridDetail(gridId);
    }

    /**
     * 根据网格员id查询今日轨迹
     * @param userId    网格员id
     * @return  网格员今日轨迹
     */
    @PostMapping("/getTrajectoryByApp")
    public R getTrajectoryByApp(@RequestParam("userId") Long userId){
        return eventGridMemberGpsLogService.getTrajectoryByApp(userId);
    }

    /**
     * 根据网格员id查询关联网格列表
     * @param userId    网格员id
     * @return  网格列表
     */
    @PostMapping("getMapGridListByApp")
    public R getMapGridListByApp(@RequestParam("userId") Long userId){
        return eventGridMemberRelationService.getMapGridListByApp(userId);
    }

}