Merge branch 'master' of https://github.com/java110/MicroCommunity

shiyj

2019-07-07 348c483d9e8cf81c485289a44c717fe1c23f4065

 CommunityService/src/main/java/com/java110/community/smo/impl/CommunityInnerServiceSMOImpl.java

@@ -6,12 +6,16 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.dto.CommunityMemberDto;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.community.CommunityDto;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.List;
import java.util.Map;

@@ -32,17 +36,54 @@

        logger.debug("communityMemberDto：{}", JSONObject.toJSONString(communityMemberDto));

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

        int page = communityMemberDto.getPage();

        if (page != PageDto.DEFAULT_PAGE) {
            communityMemberDto.setPage((page - 1) * communityMemberDto.getRow());
            communityMemberDto.setRow(page * communityMemberDto.getRow());
        }

        List<Map> communityMembers = communityServiceDaoImpl.getCommunityMembers(BeanConvertUtil.beanCovertMap(communityMemberDto));
        return BeanConvertUtil.covertBeanList(communityMembers, CommunityMemberDto.class);
    }

    @Override
    public int getCommunityMemberCount(CommunityMemberDto communityMemberDto) {
    public int getCommunityMemberCount(@RequestBody CommunityMemberDto communityMemberDto) {
         logger.debug("getCommunityMemberCount：{}", JSONObject.toJSONString(communityMemberDto));

        return communityServiceDaoImpl.getCommunityMemberCount(BeanConvertUtil.beanCovertMap(communityMemberDto));
    }

    @Override
    public List<CommunityDto> queryCommunitys(@RequestBody  CommunityDto communityDto) {

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

        int page = communityDto.getPage();

        if (page != PageDto.DEFAULT_PAGE) {
            communityDto.setPage((page - 1) * communityDto.getRow());
            communityDto.setRow(page * communityDto.getRow());
        }

        List<CommunityDto> communitys = BeanConvertUtil.covertBeanList(communityServiceDaoImpl.getCommunityInfoNew(BeanConvertUtil.beanCovertMap(communityDto)), CommunityDto.class);



        return communitys;
    }





    @Override
    public int queryCommunitysCount(@RequestBody CommunityDto communityDto) {
        return communityServiceDaoImpl.queryCommunitysCount(BeanConvertUtil.beanCovertMap(communityDto));
    }

    public ICommunityServiceDao getCommunityServiceDaoImpl() {
        return communityServiceDaoImpl;
    }