springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridDetailVO.java
New file @@ -0,0 +1,42 @@ package com.panzhihua.common.model.vos.grid; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; /** * 地图模块-网格详细信息 */ @Data @ApiModel("地图模块-网格详细信息") public class ComMapGridDetailVO { @ApiModelProperty("网格id") private Long id; @ApiModelProperty("网格名称") private String gridName; @ApiModelProperty("网格面积") private String area; @ApiModelProperty("线条颜色") private String lineColor; @ApiModelProperty("线条宽度") private String lineBroadband; @ApiModelProperty("填充颜色") private String fillColor; @ApiModelProperty("备注") private String remarks; @ApiModelProperty("围栏数据") private String data; @ApiModelProperty("网格员待处理事件列表") private List<ComMapGridEventVO> gridEventList; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridEventVO.java
New file @@ -0,0 +1,29 @@ package com.panzhihua.common.model.vos.grid; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * 地图模块-事件信息 */ @Data @ApiModel("地图模块-事件信息") public class ComMapGridEventVO { @ApiModelProperty("事件id") private Long id; @ApiModelProperty("事件类型(1.治安隐患 2.公共服务 3.矛盾纠纷 4.不稳定因素 5.突发事件 6.特殊人员上报 7.宣传教育 8.走访任务)") private String type; @ApiModelProperty("事件标题") private String eventTitle; @ApiModelProperty("发生地点") private String happentAddress; @ApiModelProperty("发生的精度纬度信息(逗号隔开)") private String happentLatLng; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -571,4 +571,12 @@ */ @PostMapping("/easy/report") R easyReport(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO); /** * 根据网格id查询网格详细信息 * @param gridId 网格id * @return */ @PostMapping("/map/getGridDetail") R getGridDetail(@RequestParam("gridId") Long gridId); } springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EasyPhotoApi.java
@@ -17,7 +17,7 @@ * @author lyq */ @RestController @RequestMapping("/easy") @RequestMapping("/easy/") @Api(tags = {"网格综治APP随手拍模块"}) public class EasyPhotoApi extends BaseController { springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java
New file @@ -0,0 +1,41 @@ package com.panzhihua.grid_app.api; import com.panzhihua.common.controller.BaseController; 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.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 javax.annotation.Resource; /** * @author lyq */ @RestController @RequestMapping("/map/") @Api(tags = {"网格综治APP地图模块"}) public class MapApi extends BaseController { @Resource private GridService gridService; @ApiOperation(value = "根据网格id查询网格详细信息-lyq",response = ComMapGridDetailVO.class) @PostMapping("getGridDetail") public R getGridDetail(@RequestParam("gridId") Long gridId){ if(gridId == null){ return R.fail("参数错误"); } return gridService.getGridDetail(gridId); } }