Merge branch 'test_future_wangge' into test

CeDo

2021-06-03 b44fa8f69b986a76c687da53b78f6611f6dc53c0

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

@@ -3,13 +3,9 @@
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.EventGridDataAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridDataDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridDataEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventGridDataService;
@@ -18,7 +14,9 @@
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
 * @auther lyq
@@ -31,6 +29,8 @@

    @Resource
    private EventGridDataMapper eventGridDataMapper;
    @Resource
    private EventMapper eventMapper;
    /**
     * 新增区县/街道/社区/网格员网格数据管理
     * @param eventGridDataAddDTO
@@ -101,4 +101,45 @@
        return R.fail();
    }

    @Override
    public R getUserGrid(PageEventGridDataDTO pageEventGridDataDTO) {
        Page page = new Page(1,10);
        if(pageEventGridDataDTO.getPageNum()!=null) {
            page.setCurrent(pageEventGridDataDTO.getPageNum());
        }
        if(pageEventGridDataDTO.getPageSize()!=null) {
            page.setSize(pageEventGridDataDTO.getPageSize());
        }

        return R.ok(eventGridDataMapper.selectUserGrid(page, pageEventGridDataDTO));
    }

    /**
     * 地图模块-根据网格id查询网格详细信息
     * @param gridId    网格id
     * @return  网格详细信息
     */
    @Override
    public R getMapGridDetail(Long gridId){
        ComMapGridDetailVO gridDetailVO = new ComMapGridDetailVO();
        //查询网格信息
        EventGridDataDO eventGridDataDO = this.baseMapper.selectById(gridId);
        if(eventGridDataDO == null){
            return R.fail("未查询到网格信息");
        }
        BeanUtils.copyProperties(eventGridDataDO,gridDetailVO);
        //查询网格待办事件
        List<ComMapGridEventVO> gridEventList = eventMapper.getEventByGridId(gridId);
        if(!gridEventList.isEmpty()){
            gridDetailVO.setGridEventList(gridEventList);
        }
        return R.ok(gridDetailVO);
    }

    @Override
    public R getGridTodoData(EventGridTodoDataDTO eventGridTodoDataDTO) {
        List<UserEventGridDataVO> userEventGridDataVO = eventGridDataMapper.getGridTodoData(eventGridTodoDataDTO);
        return R.ok(userEventGridDataVO);
    }

}