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

Your Name

2023-07-03 2b919980a8c70554a64cb3d03cc95679af4d817f

 service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/VisitMachineTranslateBMOImpl.java

old mode 100644
new mode 100755
@@ -2,12 +2,11 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.machineTranslate.IVisitMachineTranslateBMO;
import com.java110.api.listener.machineTranslate.MachineQueryUserInfoListener;
import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.core.smo.common.IFileInnerServiceSMO;
import com.java110.core.smo.common.IFileRelInnerServiceSMO;
import com.java110.core.smo.common.IMachineTranslateInnerServiceSMO;
import com.java110.core.smo.community.IVisitInnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.common.IMachineTranslateInnerServiceSMO;
import com.java110.intf.community.IVisitInnerServiceSMO;
import com.java110.dto.file.FileDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.machine.MachineTranslateDto;
@@ -68,7 +67,7 @@
            return null;
        }
        FileDto fileDto = new FileDto();
        fileDto.setFileId(fileRelDtos.get(0).getFileSaveName());
        fileDto.setFileSaveName(fileRelDtos.get(0).getFileSaveName());
        fileDto.setCommunityId(communityId);
        List<FileDto> fileDtos = fileInnerServiceSMOImpl.queryFiles(fileDto);
        if (fileDtos == null || fileDtos.size() != 1) {
@@ -93,7 +92,7 @@
        }
        machineUserResultDto.setRemarks("HC小区管理系统");
        machineUserResultDto.setReserved(visitDto.getvId());
        machineUserResultDto.setUserType(MachineQueryUserInfoListener.TYPE_VISIT);
        machineUserResultDto.setUserType("MachineQueryUserInfoListener.TYPE_VISIT");

        //将 设备 待同步 改为同步中
        MachineTranslateDto tmpMtDto = new MachineTranslateDto();