From 503135f1f8a7cfed29cac1786a6a7c8758eed8d3 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 16 七月 2021 10:13:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 116bbb3..d664f11 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,18 +1,17 @@
package com.panzhihua.grid_app.api;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.grid.EventGridCascadeListDTO;
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.EventMapGridCascadeVO;
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 org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -56,4 +55,28 @@
return gridService.getMapGridListByApp(userInfoVO.getUserId());
}
+ @ApiOperation(value = "查询网格员关联网格列表级联-lyq",response = EventMapGridVO.class)
+ @PostMapping("getGridLists")
+ public R getGridLists(@RequestBody EventGridCascadeListDTO cascadeListDTO){
+ LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
+ if(userInfoVO == null || userInfoVO.getUserId() == null){
+ return R.fail("请先登录");
+ }
+ if(cascadeListDTO.getType() == null){
+ return R.fail("参数错误");
+ }
+ cascadeListDTO.setUserId(userInfoVO.getUserId());
+ return gridService.getMapGridListsByApp(cascadeListDTO);
+ }
+
+ @ApiOperation(value = "查询网格员关联网格列表级联2-lyq",response = EventMapGridCascadeVO.class)
+ @PostMapping("getGridsLists")
+ public R getGridsLists(){
+ LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
+ if(userInfoVO == null || userInfoVO.getUserId() == null){
+ return R.fail("请先登录");
+ }
+ return gridService.getMapGridsListsByApp(userInfoVO.getUserId());
+ }
+
}
--
Gitblit v1.7.1