Merge branch 'test' into 'yuyue_dev'

罗元桥

2021-08-30 eda58e0e6d4abdd2b060e28867d103045845aa69

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberGpsLogMapper.java

@@ -1,18 +1,18 @@
package com.panzhihua.service_grid.dao;

import java.util.List;

import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

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.EventGridMemberWorkTrajectoryDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberGpsLogDTO;
import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO;
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
@@ -31,10 +31,12 @@
     * @param pageEventGridMemberGpsLogDTO
     * @return
     */
    IPage<EventGridMemberGpsLogVO> findByPage(Page page, @Param("pageEventGridMemberGpsLogDTO") PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO);
    IPage<EventGridMemberGpsLogVO> findByPage(Page page,
        @Param("pageEventGridMemberGpsLogDTO") PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO);

    List<EventMapTrajectoryVO> getTrajectoryByApp(@Param("userId") Long userId);

    List<String> gridMemberWorkTrajectory(@Param("workTrajectoryDTO") EventGridMemberWorkTrajectoryDTO workTrajectoryDTO);
    List<String>
        gridMemberWorkTrajectory(@Param("workTrajectoryDTO") EventGridMemberWorkTrajectoryDTO workTrajectoryDTO);

}