From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 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 d664f11..e72098f 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
@@ -1,5 +1,9 @@
package com.panzhihua.grid_app.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.grid.EventGridCascadeListDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -9,11 +13,9 @@
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.*;
-
-import javax.annotation.Resource;
/**
* @author lyq
@@ -26,54 +28,54 @@
@Resource
private GridService gridService;
- @ApiOperation(value = "根据网格id查询网格详细信息-lyq",response = ComMapGridDetailVO.class)
+ @ApiOperation(value = "根据网格id查询网格详细信息-lyq", response = ComMapGridDetailVO.class)
@PostMapping("getGridDetail")
- public R getGridDetail(@RequestParam("gridId") Long gridId){
- if(gridId == null){
+ public R getGridDetail(@RequestParam("gridId") Long gridId) {
+ if (gridId == null) {
return R.fail("参数错误");
}
return gridService.getGridDetail(gridId);
}
- @ApiOperation(value = "查询网格员今日运动轨迹-lyq",response = EventMapTrajectoryVO.class)
+ @ApiOperation(value = "查询网格员今日运动轨迹-lyq", response = EventMapTrajectoryVO.class)
@PostMapping("getTrajectory")
- public R getTrajectory(){
+ public R getTrajectory() {
LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
- if(userInfoVO == null || userInfoVO.getUserId() == null){
+ if (userInfoVO == null || userInfoVO.getUserId() == null) {
return R.fail("请先登录");
}
return gridService.getTrajectoryByApp(userInfoVO.getUserId());
}
- @ApiOperation(value = "查询网格员关联网格列表-lyq",response = EventMapGridVO.class)
+ @ApiOperation(value = "查询网格员关联网格列表-lyq", response = EventMapGridVO.class)
@PostMapping("getGridList")
- public R getGridList(){
+ public R getGridList() {
LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
- if(userInfoVO == null || userInfoVO.getUserId() == null){
+ if (userInfoVO == null || userInfoVO.getUserId() == null) {
return R.fail("请先登录");
}
return gridService.getMapGridListByApp(userInfoVO.getUserId());
}
- @ApiOperation(value = "查询网格员关联网格列表级联-lyq",response = EventMapGridVO.class)
+ @ApiOperation(value = "查询网格员关联网格列表级联-lyq", response = EventMapGridVO.class)
@PostMapping("getGridLists")
- public R getGridLists(@RequestBody EventGridCascadeListDTO cascadeListDTO){
+ public R getGridLists(@RequestBody EventGridCascadeListDTO cascadeListDTO) {
LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
- if(userInfoVO == null || userInfoVO.getUserId() == null){
+ if (userInfoVO == null || userInfoVO.getUserId() == null) {
return R.fail("请先登录");
}
- if(cascadeListDTO.getType() == null){
+ if (cascadeListDTO.getType() == null) {
return R.fail("参数错误");
}
cascadeListDTO.setUserId(userInfoVO.getUserId());
return gridService.getMapGridListsByApp(cascadeListDTO);
}
- @ApiOperation(value = "查询网格员关联网格列表级联2-lyq",response = EventMapGridCascadeVO.class)
+ @ApiOperation(value = "查询网格员关联网格列表级联2-lyq", response = EventMapGridCascadeVO.class)
@PostMapping("getGridsLists")
- public R getGridsLists(){
+ public R getGridsLists() {
LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
- if(userInfoVO == null || userInfoVO.getUserId() == null){
+ if (userInfoVO == null || userInfoVO.getUserId() == null) {
return R.fail("请先登录");
}
return gridService.getMapGridsListsByApp(userInfoVO.getUserId());
--
Gitblit v1.7.1