springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapGridVO.java
New file @@ -0,0 +1,20 @@ package com.panzhihua.common.model.vos.grid; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * 地图模块-网格员绑定的网格信息 */ @Data @ApiModel("地图模块-网格员绑定的网格信息") public class EventMapGridVO { @ApiModelProperty("网格id") private Long gridId; @ApiModelProperty("网格名字") private String gridName; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapTrajectoryVO.java
@@ -1,6 +1,7 @@ package com.panzhihua.common.model.vos.grid; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,6 +11,10 @@ @ApiModel("地图模块-网格员运动轨迹返回参数") public class EventMapTrajectoryVO { @ApiModelProperty("运动轨迹id") private Long id; @ApiModelProperty("运动轨迹经纬度") private String lngLat; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -585,5 +585,14 @@ * @param userId 网格员id * @return 运动轨迹 */ @PostMapping("/map/getTrajectoryByApp") R getTrajectoryByApp(@RequestParam("userId") Long userId); /** * 地图模块-根据网格员id查询关联网格列表 * @param userId 网格员id * @return 网格列表 */ @PostMapping("/map/getMapGridListByApp") R getMapGridListByApp(@RequestParam("userId") Long userId); } 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()); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java
@@ -2,6 +2,8 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.service_grid.service.EventGridDataService; import com.panzhihua.service_grid.service.EventGridMemberGpsLogService; import com.panzhihua.service_grid.service.EventGridMemberRelationService; import com.panzhihua.service_grid.service.EventService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; @@ -23,6 +25,10 @@ private EventService eventService; @Resource private EventGridDataService eventGridDataService; @Resource private EventGridMemberGpsLogService eventGridMemberGpsLogService; @Resource private EventGridMemberRelationService eventGridMemberRelationService; /** * 地图模块-根据网格id查询网格详细信息 @@ -34,4 +40,24 @@ return eventGridDataService.getMapGridDetail(gridId); } /** * 根据网格员id查询今日轨迹 * @param userId 网格员id * @return 网格员今日轨迹 */ @PostMapping("/getTrajectoryByApp") public R getTrajectoryByApp(@RequestParam("userId") Long userId){ return eventGridMemberGpsLogService.getTrajectoryByApp(userId); } /** * 根据网格员id查询关联网格列表 * @param userId 网格员id * @return 网格列表 */ @PostMapping("getMapGridListByApp") public R getMapGridListByApp(@RequestParam("userId") Long userId){ return eventGridMemberRelationService.getMapGridListByApp(userId); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberGpsLogMapper.java
@@ -1,32 +1,37 @@ 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.PageEventGridMemberGpsLogDTO; import com.panzhihua.common.model.vos.grid.EventMapTrajectoryVO; import com.panzhihua.service_grid.model.dos.EventGridMemberGpsLogDO; import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO; 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 EventGridMemberGpsLogMapper extends BaseMapper<EventGridMemberGpsLogDO> { /** * 分页查询 * @param pageEventGridMemberGpsLogDTO * @return */ IPage<EventGridMemberGpsLogVO> findByPage(Page page, @Param("pageEventGridMemberGpsLogDTO")PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO); /** * 分页查询 * * @param pageEventGridMemberGpsLogDTO * @return */ IPage<EventGridMemberGpsLogVO> findByPage(Page page, @Param("pageEventGridMemberGpsLogDTO") PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO); List<EventMapTrajectoryVO> getTrajectoryByApp(@Param("userId") Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberRelationMapper.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.PageEventGridMemberRelationDTO; import com.panzhihua.common.model.vos.grid.EventMapGridVO; import com.panzhihua.service_grid.model.dos.EventGridMemberRelationDO; import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO; 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 EventGridMemberRelationMapper extends BaseMapper<EventGridMemberRelationDO> { /** * 分页查询 * @param pageEventGridMemberRelationDTO * @return */ IPage<EventGridMemberRelationVO> findByPage(Page page, @Param("pageEventGridMemberRelationDTO")PageEventGridMemberRelationDTO pageEventGridMemberRelationDTO); /** * 分页查询 * * @param pageEventGridMemberRelationDTO * @return */ IPage<EventGridMemberRelationVO> findByPage(Page page, @Param("pageEventGridMemberRelationDTO") PageEventGridMemberRelationDTO pageEventGridMemberRelationDTO); /** * 根据网格员id查询关联网格列表 * @param userId 网格员id * @return 网格列表 */ List<EventMapGridVO> getMapGridListByApp(@Param("userId") Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberGpsLogService.java
@@ -56,5 +56,12 @@ */ R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(Long id); /** * 根据网格员id查询今日轨迹 * @param userId 网格员id * @return 网格员今日轨迹 */ R getTrajectoryByApp(Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java
@@ -56,5 +56,12 @@ */ R<EventGridMemberRelationDetailsVO> eventGridMemberRelationDetails(Long id); /** * 根据网格员id查询关联网格列表 * @param userId 网格员id * @return 网格列表 */ R getMapGridListByApp(Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberGpsLogServiceImpl.java
@@ -101,4 +101,14 @@ return R.fail(); } /** * 根据网格员id查询今日轨迹 * @param userId 网格员id * @return 网格员今日轨迹 */ @Override public R getTrajectoryByApp(Long userId){ return R.ok(this.baseMapper.getTrajectoryByApp(userId)); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
@@ -101,4 +101,14 @@ return R.fail(); } /** * 根据网格员id查询关联网格列表 * @param userId 网格员id * @return 网格列表 */ @Override public R getMapGridListByApp(Long userId){ return R.ok(this.baseMapper.getMapGridListByApp(userId)); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberGpsLogMapper.xml
@@ -68,4 +68,18 @@ </if> </select> <select id="getTrajectoryByApp" resultType="com.panzhihua.common.model.vos.grid.EventMapTrajectoryVO"> SELECT id, lng_lat FROM event_grid_member_gps_log WHERE create_at BETWEEN DATE_FORMAT( CURDATE(), '%Y-%m-%d %H:%i:%s' ) AND NOW() AND grid_member_id = #{userId} ORDER BY create_at ASC </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml
@@ -60,4 +60,14 @@ </if> </select> <select id="getMapGridListByApp" resultType="com.panzhihua.common.model.vos.grid.EventMapGridVO"> SELECT grid_id, grid_name FROM event_grid_member_relation WHERE grid_member_id = #{userId} </select> </mapper>
