Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-17 e64197421cf28099935f71f193989a3394d47fe0

 UserService/src/main/java/com/java110/user/smo/impl/OrgInnerServiceSMOImpl.java

@@ -2,13 +2,15 @@


import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.core.smo.org.IOrgInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.org.OrgDto;
import com.java110.user.dao.IOrgServiceDao;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -33,6 +35,10 @@
    @Autowired
    private IUserInnerServiceSMO userInnerServiceSMOImpl;

    @Autowired
    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;


    @Override
    public List<OrgDto> queryOrgs(@RequestBody OrgDto orgDto) {

@@ -46,6 +52,21 @@

        List<OrgDto> orgs = BeanConvertUtil.covertBeanList(orgServiceDaoImpl.getOrgInfo(BeanConvertUtil.beanCovertMap(orgDto)), OrgDto.class);

        String[] communityIds = getCommunityIds(orgs);
        if (communityIds == null || communityIds.length < 1) {
            return orgs;
        }
        CommunityDto communityDto = new CommunityDto();
        communityDto.setCommunityIds(communityIds);
        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);

        for (CommunityDto tmpCommunityDto : communityDtos) {
            for (OrgDto tmpOrgDto : orgs) {
                if (tmpCommunityDto.getCommunityId().equals(tmpOrgDto.getBelongCommunityId())) {
                    tmpOrgDto.setBelongCommunityName(tmpCommunityDto.getName());
                }
            }
        }

        return orgs;
    }
@@ -54,6 +75,50 @@
    @Override
    public int queryOrgsCount(@RequestBody OrgDto orgDto) {
        return orgServiceDaoImpl.queryOrgsCount(BeanConvertUtil.beanCovertMap(orgDto));
    }


    /**
     * <p>查询上级组织信息</p>
     *
     * @param orgDto 数据对象分享
     * @return OrgDto 对象数据
     */
    @Override
    public List<OrgDto> queryParentOrgs(@RequestBody OrgDto orgDto) {

        //校验是否传了 分页信息

        List<OrgDto> orgs = BeanConvertUtil.covertBeanList(orgServiceDaoImpl.getParentOrgInfo(BeanConvertUtil.beanCovertMap(orgDto)), OrgDto.class);

        if (orgs == null) {
            orgs = new ArrayList<>();
        }

        return orgs;
    }


    /**
     * 获取批量userId
     *
     * @param orgDtos 小区楼信息
     * @return 批量userIds 信息
     */
    private String[] getCommunityIds(List<OrgDto> orgDtos) {
        List<String> communityIds = new ArrayList<String>();
        for (OrgDto orgDto : orgDtos) {
            if ("9999".equals(orgDto.getBelongCommunityId())) {
                orgDto.setBelongCommunityName("入驻所有小区");
                continue;
            }
            if (StringUtil.isEmpty(orgDto.getBelongCommunityId())) {
                orgDto.setBelongCommunityName("未知小区");
                continue;
            }
            communityIds.add(orgDto.getBelongCommunityId());
        }
        return communityIds.toArray(new String[communityIds.size()]);
    }

    public IOrgServiceDao getOrgServiceDaoImpl() {
@@ -71,4 +136,12 @@
    public void setUserInnerServiceSMOImpl(IUserInnerServiceSMO userInnerServiceSMOImpl) {
        this.userInnerServiceSMOImpl = userInnerServiceSMOImpl;
    }

    public ICommunityInnerServiceSMO getCommunityInnerServiceSMOImpl() {
        return communityInnerServiceSMOImpl;
    }

    public void setCommunityInnerServiceSMOImpl(ICommunityInnerServiceSMO communityInnerServiceSMOImpl) {
        this.communityInnerServiceSMOImpl = communityInnerServiceSMOImpl;
    }
}