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/EventGridMemberRelationServiceImpl.java

@@ -1,5 +1,13 @@
package com.panzhihua.service_grid.service.impl;

import java.util.ArrayList;
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;
@@ -9,20 +17,13 @@
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
import com.panzhihua.common.model.vos.grid.EventMapGridCascadeVO;
import com.panzhihua.common.model.vos.grid.EventMapGridVO;
import com.panzhihua.common.model.vos.grid.admin.GridMemberCascadeVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.dao.EventGridMemberRelationMapper;
import com.panzhihua.service_grid.model.dos.EventGridMemberRelationDO;
import com.panzhihua.service_grid.service.EventGridMemberRelationService;
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
@@ -31,7 +32,8 @@
 */
@Slf4j
@Service
public class EventGridMemberRelationServiceImpl extends ServiceImpl<EventGridMemberRelationMapper, EventGridMemberRelationDO> implements EventGridMemberRelationService {
public class EventGridMemberRelationServiceImpl extends
    ServiceImpl<EventGridMemberRelationMapper, EventGridMemberRelationDO> implements EventGridMemberRelationService {

    @Resource
    private EventGridMemberRelationMapper eventGridMemberRelationMapper;
@@ -40,14 +42,13 @@

    /**
     * 新增网格和网格员的关联关系
     * 
     * @param eventGridMemberAddDTO
     * @return 新增结果
     */
    public R add(EventGridMemberAddDTO eventGridMemberAddDTO){

        userService.addGridUser(eventGridMemberAddDTO);



        EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO();
        eventGridMemberRelationDO.setCreateBy(eventGridMemberAddDTO.getUserId());
@@ -59,6 +60,7 @@

    /**
     * 修改网格和网格员的关联关系
     * 
     * @param eventGridMemberEditDTO
     * @return 维护结果
     */
@@ -74,6 +76,7 @@

    /**
     * 分页查找网格和网格员的关联关系
     * 
     * @param pageEventGridMemberRelationDTO
     * @return 维护结果
     */
@@ -90,6 +93,7 @@

    /**
     * 删除网格和网格员的关联关系
     * 
     * @param EventGridMemberRelationDeleteDTO
     * @return 平台用户信息
     */
@@ -99,7 +103,9 @@

    /**
     * 查询网格和网格员的关联关系详细信息
     * @param id 网格和网格员的关联关系 id
     * 
     * @param id
     *            网格和网格员的关联关系 id
     * @return 查找结果
     */
    public R<EventGridMemberRelationDetailsVO> eventGridMemberRelationDetails(Long id){
@@ -114,7 +120,9 @@

    /**
     * 根据网格员id查询关联网格列表
     * @param userId    网格员id
     * 
     * @param userId
     *            网格员id
     * @return  网格列表
     */
    @Override
@@ -124,6 +132,7 @@

    /**
     * 查询市平台网格员列表
     * 
     * @return  市平台网格员列表
     */
    @Override
@@ -136,7 +145,8 @@
        if(memberCascadeAddDTO.getType() == null){
            return R.fail("参数错误");
        }
        List<GridMemberCascadeVO> memberCascadeList = this.baseMapper.getGridMemberCascade(memberCascadeAddDTO.getType(),memberCascadeAddDTO.getSuperiorId());
        List<GridMemberCascadeVO> memberCascadeList =
            this.baseMapper.getGridMemberCascade(memberCascadeAddDTO.getType(), memberCascadeAddDTO.getSuperiorId());

        List<GridMemberCascadeVO> result = new ArrayList<>();
        if(!memberCascadeList.isEmpty()){
@@ -173,7 +183,8 @@
        List<EventMapGridCascadeVO> list = this.eventGridMemberRelationMapper.getMapGridsListsByApp(userId,1,null);
        if(!list.isEmpty()){
            list.forEach(gridCascadeVO -> {
                List<EventMapGridCascadeVO> childList = this.eventGridMemberRelationMapper.getMapGridsListsByApp(userId,2,gridCascadeVO.getGridId());
                List<EventMapGridCascadeVO> childList =
                    this.eventGridMemberRelationMapper.getMapGridsListsByApp(userId, 2, gridCascadeVO.getGridId());
                if(!childList.isEmpty()){
                    gridCascadeVO.setChildList(childList);
                    resultList.add(gridCascadeVO);