Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

Your Name

2023-02-21 e23023b93f34286f5a807b0b85e9a0619a297ed7

 service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java

@@ -10,12 +10,16 @@
import com.java110.doc.annotation.*;
import com.java110.dto.accessControlWhite.AccessControlWhiteDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.visit.VisitDto;
import com.java110.dto.visitSetting.VisitSettingDto;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IVisitInnerServiceSMO;
import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
import com.java110.intf.community.IVisitV1InnerServiceSMO;
import com.java110.intf.user.IOwnerV1InnerServiceSMO;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -68,13 +72,16 @@
public class ListVisitsCmd extends Cmd {

    @Autowired
    private IVisitInnerServiceSMO visitInnerServiceSMOImpl;
    private IVisitV1InnerServiceSMO visitV1InnerServiceSMO;

    @Autowired
    private IVisitSettingV1InnerServiceSMO visitSettingV1InnerServiceSMOImpl;

    @Autowired
    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;

    @Autowired
    private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl;

    //键
    public static final String CAR_FREE_TIME = "CAR_FREE_TIME";
@@ -113,12 +120,12 @@
            VisitDto visitDto = BeanConvertUtil.covertBean(reqJson, VisitDto.class);
            if (reqJson.containsKey("channel") && !StringUtil.isEmpty(reqJson.getString("channel"))
                    && "PC".equals(reqJson.getString("channel"))) {
                visitDto.setUserId("");
                visitDto.setCreateUserId("");
            }
            int count = visitInnerServiceSMOImpl.queryVisitsCount(visitDto);
            int count = visitV1InnerServiceSMO.queryVisitsCount(visitDto);
            List<ApiVisitDataVo> visits = new ArrayList<>();
            if (count > 0) {
                List<VisitDto> visitDtos = visitInnerServiceSMOImpl.queryVisits(visitDto);
                List<VisitDto> visitDtos = visitV1InnerServiceSMO.queryVisits(visitDto);
                for (VisitDto visit : visitDtos) {
                    ApiVisitDataVo apiVisitDataVo = BeanConvertUtil.covertBean(visit, ApiVisitDataVo.class);
                    if (!StringUtil.isEmpty(visit.getFileSaveName())) {
@@ -129,6 +136,9 @@
            } else {
                visits = new ArrayList<>();
            }

            //刷入流程ID
            refreshOwners(visits, reqJson);

            //刷入流程ID
            refreshSetting(visits, reqJson);
@@ -147,6 +157,38 @@

    }

    private void refreshOwners(List<ApiVisitDataVo> visits, JSONObject reqJson) {

        if(visits == null || visits.size() < 1){
            return ;
        }

        List<String> ownerIds = new ArrayList<>();
        for(ApiVisitDataVo apiVisitDataVo: visits){
            ownerIds.add(apiVisitDataVo.getOwnerId());
        }

        OwnerDto ownerDto = new OwnerDto();
        ownerDto.setOwnerIds(ownerIds.toArray(new String[ownerIds.size()]));
        ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
        ownerDto.setCommunityId(reqJson.getString("communityId"));
       List<OwnerDto> ownerDtos =  ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);

        for(ApiVisitDataVo apiVisitDataVo: visits){
            for(OwnerDto tmpOwnerDto : ownerDtos){
                if(StringUtil.isEmpty(apiVisitDataVo.getOwnerId())){
                    continue;
                }
                if(!apiVisitDataVo.getOwnerId().equals(tmpOwnerDto.getOwnerId())){
                    continue;
                }
                apiVisitDataVo.setOwnerName(tmpOwnerDto.getName());
                apiVisitDataVo.setOwnerTel(tmpOwnerDto.getLink());
            }
        }

    }

    private void refreshPhoto(List<ApiVisitDataVo> visits, JSONObject reqJson) {

        List<String> vIds = new ArrayList<>();
@@ -161,7 +203,7 @@
        if(fileRelDtos == null || fileRelDtos.size() < 1){
            return ;
        }
        String imgUrl = MappingCache.getValue("IMG_PATH");
        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN,"IMG_PATH");
        for(ApiVisitDataVo apiVisitDataVo: visits){
            for(FileRelDto tmpFileRelDto : fileRelDtos){
                if(!apiVisitDataVo.getvId().equals(tmpFileRelDto.getObjId())){