springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridEventVO.java
@@ -14,7 +14,7 @@ @ApiModelProperty("事件id") private Long id; @ApiModelProperty("事件类型(1.治安隐患 2.公共服务 3.矛盾纠纷 4.不稳定因素 5.突发事件 6.特殊人员上报 7.宣传教育 8.走访任务)") @ApiModelProperty("事件类型(1.治安隐患 2.公共服务 3.矛盾纠纷 4.不稳定因素 5.突发事件 6.特殊人员上报 7.走访任务)") private String type; @ApiModelProperty("事件标题") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -573,9 +573,9 @@ R easyReport(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO); /** * 根据网格id查询网格详细信息 * 地图模块-根据网格id查询网格详细信息 * @param gridId 网格id * @return * @return 网格详细信息 */ @PostMapping("/map/getGridDetail") R getGridDetail(@RequestParam("gridId") Long gridId); springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java
New file @@ -0,0 +1,37 @@ package com.panzhihua.service_grid.api; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_grid.service.EventGridDataService; import com.panzhihua.service_grid.service.EventService; import lombok.extern.slf4j.Slf4j; 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; /** * 地图模块api */ @Slf4j @RestController @RequestMapping("/map") public class MapApi { @Resource private EventService eventService; @Resource private EventGridDataService eventGridDataService; /** * 地图模块-根据网格id查询网格详细信息 * @param gridId 网格id * @return 网格详细信息 */ @PostMapping("getGridDetail") public R getGridDetail(@RequestParam("gridId") Long gridId){ return eventGridDataService.getMapGridDetail(gridId); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java
@@ -1,32 +1,42 @@ package com.panzhihua.service_grid.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.grid.PageEventDTO; import com.panzhihua.common.model.vos.grid.ComMapGridEventVO; import com.panzhihua.service_grid.model.dos.EventDO; import com.panzhihua.common.model.vos.grid.EventVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; /** * DAO * * @author cedoo email:cedoo(a)qq.com * @version 1.0 * @since 1.0 * @date 2021-05-26 * */ * @since 1.0 */ @Mapper public interface EventMapper extends BaseMapper<EventDO> { /** * 分页查询 * @param pageEventDTO * @return */ IPage<EventVO> findByPage(Page page, @Param("pageEventDTO")PageEventDTO pageEventDTO); /** * 分页查询 * * @param pageEventDTO * @return */ IPage<EventVO> findByPage(Page page, @Param("pageEventDTO") PageEventDTO pageEventDTO); /** * 地图模块-根据网格id查询网格办件事件 * @param gridId 网格id * @return 网格办件事件 */ List<ComMapGridEventVO> getEventByGridId(@Param("gridId") Long gridId); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java
@@ -63,4 +63,11 @@ * @return 查找结果 */ R getUserGrid(PageEventGridDataDTO pageEventGridDataDTO); /** * 地图模块-根据网格id查询网格详细信息 * @param gridId 网格id * @return 网格详细信息 */ R getMapGridDetail(Long gridId); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
@@ -101,4 +101,6 @@ * @return */ R republishEvent(EventRepublicDTO eventRepublicDTO); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
@@ -8,6 +8,8 @@ import com.panzhihua.common.model.dtos.grid.EventGridDataEditDTO; import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.ComMapGridDetailVO; import com.panzhihua.common.model.vos.grid.ComMapGridEventVO; import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO; import com.panzhihua.common.model.vos.grid.EventGridDataVO; import com.panzhihua.service_grid.dao.*; @@ -18,7 +20,9 @@ import org.springframework.beans.BeanUtils; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; /** * @auther lyq @@ -31,6 +35,8 @@ @Resource private EventGridDataMapper eventGridDataMapper; @Resource private EventMapper eventMapper; /** * 新增区县/街道/社区/网格员网格数据管理 * @param eventGridDataAddDTO @@ -114,4 +120,26 @@ return R.ok(eventGridDataMapper.selectUserGrid(page, pageEventGridDataDTO)); } /** * 地图模块-根据网格id查询网格详细信息 * @param gridId 网格id * @return 网格详细信息 */ @Override public R getMapGridDetail(Long gridId){ ComMapGridDetailVO gridDetailVO = new ComMapGridDetailVO(); //查询网格信息 EventGridDataDO eventGridDataDO = this.baseMapper.selectById(gridId); if(eventGridDataDO == null){ return R.fail("未查询到网格信息"); } BeanUtils.copyProperties(eventGridDataDO,gridDetailVO); //查询网格待办事件 List<ComMapGridEventVO> gridEventList = eventMapper.getEventByGridId(gridId); if(!gridEventList.isEmpty()){ gridDetailVO.setGridEventList(gridEventList); } return R.ok(gridDetailVO); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
@@ -215,4 +215,33 @@ </if> </select> <select id="getEventByGridId" resultType="com.panzhihua.common.model.vos.grid.ComMapGridEventVO"> SELECT id, event_type AS type, event_title AS eventTitle, happent_address AS happentAddress, happent_lat_lng AS happentLatLng FROM `event` WHERE ( event_category = 1 OR event_category = 2 ) AND event_process_status = 1 AND event_status = 2 AND grid_id = #{gridId} AND process_type = 1 UNION SELECT id, IFNULL( NULL, 7 ) AS type, event_title AS eventTitle, happent_address AS happentAddress, happent_lat_lng AS happentLatLng FROM event_visiting_tasks WHERE event_status = 1 AND dell_type = 1 AND grid_id = #{gridId} </select> </mapper>
