Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberGpsLogServiceImpl.java

@@ -1,24 +1,30 @@
package com.panzhihua.service_grid.service.impl;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogEditDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberWorkTrajectoryDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberGpsLogDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO;
import com.panzhihua.common.model.vos.grid.GridMemberPositionDTO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.dao.EventGridMemberGpsLogMapper;
import com.panzhihua.service_grid.model.dos.EventGridMemberGpsLogDO;
import com.panzhihua.service_grid.service.EventGridMemberGpsLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import lombok.extern.slf4j.Slf4j;

/**
 * @auther lyq
@@ -27,13 +33,17 @@
 */
@Slf4j
@Service
public class EventGridMemberGpsLogServiceImpl extends ServiceImpl<EventGridMemberGpsLogMapper, EventGridMemberGpsLogDO> implements EventGridMemberGpsLogService {
public class EventGridMemberGpsLogServiceImpl extends ServiceImpl<EventGridMemberGpsLogMapper, EventGridMemberGpsLogDO>
    implements EventGridMemberGpsLogService {

    @Resource
    private EventGridMemberGpsLogMapper eventGridMemberGpsLogMapper;

    /**
     * 新增网格员定时上报地理信息
     * @param memberPositionDTO 请求参数
     * 
     * @param memberPositionDTO
     *            请求参数
     * @return 新增结果
     */
    public R add(GridMemberPositionDTO memberPositionDTO){
@@ -49,6 +59,7 @@

    /**
     * 修改网格员定时上报地理信息
     * 
     * @param eventGridMemberGpsLogEditDTO
     * @return 维护结果
     */
@@ -64,6 +75,7 @@

    /**
     * 分页查找网格员定时上报地理信息
     * 
     * @param pageEventGridMemberGpsLogDTO
     * @return 维护结果
     */
@@ -80,6 +92,7 @@

    /**
     * 删除网格员定时上报地理信息
     * 
     * @param EventGridMemberGpsLogDeleteDTO
     * @return 平台用户信息
     */
@@ -89,7 +102,9 @@

    /**
     * 查询网格员定时上报地理信息详细信息
     * @param id 网格员定时上报地理信息 id
     * 
     * @param id
     *            网格员定时上报地理信息 id
     * @return 查找结果
     */
    public R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(Long id){
@@ -104,7 +119,9 @@

    /**
     * 根据网格员id查询今日轨迹
     * @param userId    网格员id
     * 
     * @param userId
     *            网格员id
     * @return  网格员今日轨迹
     */
    @Override
@@ -114,7 +131,9 @@

    /**
     * 后台获取网格员运动轨迹
     * @param workTrajectoryDTO 请求参数
     * 
     * @param workTrajectoryDTO
     *            请求参数
     * @return  运动轨迹
     */
    @Override