合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-community/src/main/java/com/java110/community/smo/impl/ParkingAreaInnerServiceSMOImpl.java

@@ -1,18 +1,23 @@
package com.java110.community.smo.impl;


import com.java110.community.dao.IParkingAreaAttrServiceDao;
import com.java110.community.dao.IParkingAreaServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.intf.community.IParkingAreaInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.parking.ParkingAreaDto;
import com.java110.dto.parkingAreaAttr.ParkingAreaAttrDto;
import com.java110.intf.community.IParkingAreaInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @ClassName FloorInnerServiceSMOImpl
@@ -27,6 +32,8 @@

    @Autowired
    private IParkingAreaServiceDao parkingAreaServiceDaoImpl;
    @Autowired
    private IParkingAreaAttrServiceDao parkingAreaAttrServiceDaoImpl;

    @Autowired
    private IUserInnerServiceSMO userInnerServiceSMOImpl;
@@ -44,10 +51,38 @@

        List<ParkingAreaDto> parkingAreas = BeanConvertUtil.covertBeanList(parkingAreaServiceDaoImpl.getParkingAreaInfo(BeanConvertUtil.beanCovertMap(parkingAreaDto)), ParkingAreaDto.class);

        freshParkingAreas(parkingAreas);
        return parkingAreas;
    }

    private void freshParkingAreas(List<ParkingAreaDto> parkingAreas) {

        List<String> paIds = new ArrayList<>();

        if (parkingAreas == null || parkingAreas.size() < 1) {
            return;
        }
        for (ParkingAreaDto parkingArea : parkingAreas) {
            paIds.add(parkingArea.getPaId());
        }

        Map info = new HashMap();
        info.put("paIds", paIds.toArray(new String[paIds.size()]));
        List<ParkingAreaAttrDto> parkingAreaAttrDtos = BeanConvertUtil.covertBeanList(parkingAreaAttrServiceDaoImpl.getParkingAreaAttrInfo(info), ParkingAreaAttrDto.class);

        if (parkingAreaAttrDtos == null || parkingAreaAttrDtos.size() < 1) {
            return;
        }
        for (ParkingAreaDto parkingArea : parkingAreas) {
            List<ParkingAreaAttrDto> tmpParkingAreaAttrDtos = new ArrayList<>();
            for (ParkingAreaAttrDto parkingAreaAttrDto : parkingAreaAttrDtos) {
                if (parkingArea.getPaId().equals(parkingAreaAttrDto.getPaId())) {
                    tmpParkingAreaAttrDtos.add(parkingAreaAttrDto);
                }
            }
            parkingArea.setAttrs(tmpParkingAreaAttrDtos);
        }
    }


    @Override