huanghongfa
2021-05-31 040808d853f800a657168b0576320b5420be6a58
网格化地图模块开发
3个文件已修改
1个文件已添加
34 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapTrajectoryVO.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapTrajectoryVO.java
New file
@@ -0,0 +1,15 @@
package com.panzhihua.common.model.vos.grid;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
 * 地图模块-网格员运动轨迹返回参数
 */
@Data
@ApiModel("地图模块-网格员运动轨迹返回参数")
public class EventMapTrajectoryVO {
    private String lngLat;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -579,4 +579,11 @@
     */
    @PostMapping("/map/getGridDetail")
    R getGridDetail(@RequestParam("gridId") Long gridId);
    /**
     * 地图模块-根据网格员id查询今日运动轨迹
     * @param userId    网格员id
     * @return  运动轨迹
     */
    R getTrajectoryByApp(@RequestParam("userId") Long userId);
}
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java
@@ -34,6 +34,16 @@
        return gridService.getGridDetail(gridId);
    }
    @ApiOperation(value = "查询网格员今日运动轨迹-lyq",response = ComMapGridDetailVO.class)
    @PostMapping("getTrajectory")
    public R getTrajectory(){
        LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
        if(userInfoVO == null || userInfoVO.getUserId() == null){
            return R.fail("请先登录");
        }
        return gridService.getTrajectoryByApp(userInfoVO.getUserId());
    }
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
@@ -229,7 +229,7 @@
            AND event_process_status = 1
            AND event_status = 2
            AND grid_id = #{gridId}
            AND process_type = 1 UNION
            AND process_type = 1 UNION ALL
        SELECT
            id,
            IFNULL( NULL, 7 ) AS type,