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,21 +33,25 @@
 */
@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){
    public R add(GridMemberPositionDTO memberPositionDTO) {
        EventGridMemberGpsLogDO eventGridMemberGpsLogDO = new EventGridMemberGpsLogDO();
        BeanUtils.copyProperties(memberPositionDTO, eventGridMemberGpsLogDO);
        eventGridMemberGpsLogDO.setCreateAt(new Date());
        eventGridMemberGpsLogDO.setCreateBy(memberPositionDTO.getGridMemberId());
        if(eventGridMemberGpsLogMapper.insert(eventGridMemberGpsLogDO)>0){
        if (eventGridMemberGpsLogMapper.insert(eventGridMemberGpsLogDO) > 0) {
            return R.ok();
        }
        return R.fail();
@@ -49,14 +59,15 @@

    /**
     * 修改网格员定时上报地理信息
     * 
     * @param eventGridMemberGpsLogEditDTO
     * @return 维护结果
     */
    public R edit(EventGridMemberGpsLogEditDTO eventGridMemberGpsLogEditDTO){
    public R edit(EventGridMemberGpsLogEditDTO eventGridMemberGpsLogEditDTO) {
        EventGridMemberGpsLogDO eventGridMemberGpsLogDO = new EventGridMemberGpsLogDO();
        BeanUtils.copyProperties(eventGridMemberGpsLogEditDTO, eventGridMemberGpsLogDO);
        //eventGridMemberGpsLogDO.setUpdateAt(new Date());
        if(eventGridMemberGpsLogMapper.updateById(eventGridMemberGpsLogDO)>0){
        // eventGridMemberGpsLogDO.setUpdateAt(new Date());
        if (eventGridMemberGpsLogMapper.updateById(eventGridMemberGpsLogDO) > 0) {
            return R.ok();
        }
        return R.fail();
@@ -64,15 +75,16 @@

    /**
     * 分页查找网格员定时上报地理信息
     * 
     * @param pageEventGridMemberGpsLogDTO
     * @return 维护结果
     */
    public R<IPage<EventGridMemberGpsLogVO>> query(PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO){
        Page page = new Page(1,10);
        if(pageEventGridMemberGpsLogDTO.getPageNum()!=null) {
    public R<IPage<EventGridMemberGpsLogVO>> query(PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO) {
        Page page = new Page(1, 10);
        if (pageEventGridMemberGpsLogDTO.getPageNum() != null) {
            page.setCurrent(pageEventGridMemberGpsLogDTO.getPageNum());
        }
        if(pageEventGridMemberGpsLogDTO.getPageSize()!=null) {
        if (pageEventGridMemberGpsLogDTO.getPageSize() != null) {
            page.setSize(pageEventGridMemberGpsLogDTO.getPageSize());
        }
        return R.ok(eventGridMemberGpsLogMapper.findByPage(page, pageEventGridMemberGpsLogDTO));
@@ -80,21 +92,24 @@

    /**
     * 删除网格员定时上报地理信息
     * 
     * @param EventGridMemberGpsLogDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EventGridMemberGpsLogDeleteDTO EventGridMemberGpsLogDeleteDTO){
    public R delete(EventGridMemberGpsLogDeleteDTO EventGridMemberGpsLogDeleteDTO) {
        return R.fail();
    }

    /**
     * 查询网格员定时上报地理信息详细信息
     * @param id 网格员定时上报地理信息 id
     * 
     * @param id
     *            网格员定时上报地理信息 id
     * @return 查找结果
     */
    public R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(Long id){
    public R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(Long id) {
        EventGridMemberGpsLogDO eventGridMemberGpsLogDO = eventGridMemberGpsLogMapper.selectById(id);
        if(eventGridMemberGpsLogDO!=null) {
        if (eventGridMemberGpsLogDO != null) {
            EventGridMemberGpsLogDetailsVO eventGridMemberGpsLogDetailsVO = new EventGridMemberGpsLogDetailsVO();
            BeanUtils.copyProperties(eventGridMemberGpsLogDO, eventGridMemberGpsLogDetailsVO);
            return R.ok(eventGridMemberGpsLogDetailsVO);
@@ -104,21 +119,25 @@

    /**
     * 根据网格员id查询今日轨迹
     * @param userId    网格员id
     * @return  网格员今日轨迹
     * 
     * @param userId
     *            网格员id
     * @return 网格员今日轨迹
     */
    @Override
    public R getTrajectoryByApp(Long userId){
    public R getTrajectoryByApp(Long userId) {
        return R.ok(this.baseMapper.getTrajectoryByApp(userId));
    }

    /**
     * 后台获取网格员运动轨迹
     * @param workTrajectoryDTO 请求参数
     * @return  运动轨迹
     * 
     * @param workTrajectoryDTO
     *            请求参数
     * @return 运动轨迹
     */
    @Override
    public R gridMemberWorkTrajectory(EventGridMemberWorkTrajectoryDTO workTrajectoryDTO){
    public R gridMemberWorkTrajectory(EventGridMemberWorkTrajectoryDTO workTrajectoryDTO) {
        List<String> workTrajectorys = new ArrayList<>();
        workTrajectorys = this.baseMapper.gridMemberWorkTrajectory(workTrajectoryDTO);
        return R.ok(workTrajectorys);