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

huanghongfa

2021-05-31 faa40222f2e15b68a89d2180b57d444de5b67709

 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());
    }

}