java110
2023-07-26 20aac4c71d45bc5bc446798aa6aad352af4e2585
service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java
@@ -5,12 +5,11 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.CommunitySettingFactory;
import com.java110.doc.annotation.*;
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.dto.visit.VisitSettingDto;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
import com.java110.intf.community.IVisitV1InnerServiceSMO;
@@ -38,7 +37,9 @@
        url = "http://{ip}:{port}/app/visit.listVisits",
        resource = "communityDoc",
        author = "吴学文",
        serviceCode = "visit.listVisits")
        serviceCode = "visit.listVisits",
        seq = 22
)
@Java110ParamsDoc(params = {
        @Java110ParamDoc(name = "page", type = "int", length = 11, remark = "分页信息"),
@@ -115,8 +116,7 @@
            responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(initAddVisitParameter), HttpStatus.OK);
        } else {
            VisitDto visitDto = BeanConvertUtil.covertBean(reqJson, VisitDto.class);
            if (reqJson.containsKey("channel") && !StringUtil.isEmpty(reqJson.getString("channel"))
                    && "PC".equals(reqJson.getString("channel"))) {
            if ("PC".equals(reqJson.getString("channel"))) {
                visitDto.setCreateUserId("");
            }
            int count = visitV1InnerServiceSMO.queryVisitsCount(visitDto);
@@ -168,10 +168,14 @@
        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 (!apiVisitDataVo.getOwnerId().equals(tmpOwnerDto.getOwnerId())) {
       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());