优化门禁对接 逻辑调整

java110

2020-06-05 181c04bf7691dc87d6fcf31a5237a66442f68a6a

优化门禁对接 逻辑调整

 java110-bean/src/main/java/com/java110/dto/machine/ApplicationKeyDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/hardwareAdapation/ApplicationKeyDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.hardwareAdapation;
package com.java110.dto.machine;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/machine/CarBlackWhiteDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/hardwareAdapation/CarBlackWhiteDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.hardwareAdapation;
package com.java110.dto.machine;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/machine/CarInoutDetailDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/hardwareAdapation/CarInoutDetailDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.hardwareAdapation;
package com.java110.dto.machine;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/machine/CarInoutDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/hardwareAdapation/CarInoutDto.java
@@ -1,8 +1,6 @@
package com.java110.dto.hardwareAdapation;
package com.java110.dto.machine;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.java110.dto.PageDto;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

 java110-bean/src/main/java/com/java110/dto/machine/MachineAttrDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/hardwareAdapation/MachineAttrDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.hardwareAdapation;
package com.java110.dto.machine;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/hardwareAdapation/MachineDto.java
@@ -1,9 +1,8 @@
package com.java110.dto.hardwareAdapation;
package com.java110.dto.machine;

import com.java110.dto.PageDto;

import java.io.Serializable;
import java.util.Date;

/**
 * @ClassName FloorDto

 java110-bean/src/main/java/com/java110/dto/machine/MachineRecordDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/hardwareAdapation/MachineRecordDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.hardwareAdapation;
package com.java110.dto.machine;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/machine/MachineTranslateDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/hardwareAdapation/MachineTranslateDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.hardwareAdapation;
package com.java110.dto.machine;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/machine/MachineUserResultDto.java

New file
@@ -0,0 +1,122 @@
package com.java110.dto.machine;

/**
 * @ClassName MachineUserResultDto
 * @Description TODO
 * @Author wuxw
 * @Date 2020/6/5 8:33
 * @Version 1.0
 * add by wuxw 2020/6/5
 **/
public class MachineUserResultDto {

    private String userid;

    private String userType;

    private String groupid;

    private String group;

    private String name;

    private String faceBase64;

    private String idNumber;

    private String startTime;

    private String endTime;

    private String remarks;

    private String reserved;

    public String getUserid() {
        return userid;
    }

    public void setUserid(String userid) {
        this.userid = userid;
    }

    public String getGroupid() {
        return groupid;
    }

    public void setGroupid(String groupid) {
        this.groupid = groupid;
    }

    public String getGroup() {
        return group;
    }

    public void setGroup(String group) {
        this.group = group;
    }

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public String getFaceBase64() {
        return faceBase64;
    }

    public void setFaceBase64(String faceBase64) {
        this.faceBase64 = faceBase64;
    }

    public String getIdNumber() {
        return idNumber;
    }

    public void setIdNumber(String idNumber) {
        this.idNumber = idNumber;
    }

    public String getStartTime() {
        return startTime;
    }

    public void setStartTime(String startTime) {
        this.startTime = startTime;
    }

    public String getEndTime() {
        return endTime;
    }

    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }

    public String getRemarks() {
        return remarks;
    }

    public void setRemarks(String remarks) {
        this.remarks = remarks;
    }

    public String getReserved() {
        return reserved;
    }

    public void setReserved(String reserved) {
        this.reserved = reserved;
    }

    public String getUserType() {
        return userType;
    }

    public void setUserType(String userType) {
        this.userType = userType;
    }
}

 java110-core/src/main/java/com/java110/core/smo/hardwareAdapation/IApplicationKeyInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.core.smo.hardwareAdapation;

import com.java110.core.feign.FeignConfiguration;
import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
import com.java110.dto.machine.ApplicationKeyDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 java110-core/src/main/java/com/java110/core/smo/hardwareAdapation/ICarBlackWhiteInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.core.smo.hardwareAdapation;

import com.java110.core.feign.FeignConfiguration;
import com.java110.dto.hardwareAdapation.CarBlackWhiteDto;
import com.java110.dto.machine.CarBlackWhiteDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 java110-core/src/main/java/com/java110/core/smo/hardwareAdapation/ICarInoutDetailInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.core.smo.hardwareAdapation;

import com.java110.core.feign.FeignConfiguration;
import com.java110.dto.hardwareAdapation.CarInoutDetailDto;
import com.java110.dto.machine.CarInoutDetailDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 java110-core/src/main/java/com/java110/core/smo/hardwareAdapation/ICarInoutInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.core.smo.hardwareAdapation;

import com.java110.core.feign.FeignConfiguration;
import com.java110.dto.hardwareAdapation.CarInoutDto;
import com.java110.dto.machine.CarInoutDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 java110-core/src/main/java/com/java110/core/smo/hardwareAdapation/IMachineAttrInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.core.smo.hardwareAdapation;

import com.java110.core.feign.FeignConfiguration;
import com.java110.dto.hardwareAdapation.MachineAttrDto;
import com.java110.dto.machine.MachineAttrDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 java110-core/src/main/java/com/java110/core/smo/hardwareAdapation/IMachineInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.core.smo.hardwareAdapation;

import com.java110.core.feign.FeignConfiguration;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.MachineDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 java110-core/src/main/java/com/java110/core/smo/hardwareAdapation/IMachineRecordInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.core.smo.hardwareAdapation;

import com.java110.core.feign.FeignConfiguration;
import com.java110.dto.hardwareAdapation.MachineRecordDto;
import com.java110.dto.machine.MachineRecordDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 java110-core/src/main/java/com/java110/core/smo/hardwareAdapation/IMachineTranslateInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.core.smo.hardwareAdapation;

import com.java110.core.feign.FeignConfiguration;
import com.java110.dto.hardwareAdapation.MachineTranslateDto;
import com.java110.dto.machine.MachineTranslateDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 service-api/src/main/java/com/java110/api/bmo/applicationKey/impl/ApplicationKeyBMOImpl.java

@@ -11,8 +11,8 @@
import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
import com.java110.core.smo.owner.IOwnerRoomRelInnerServiceSMO;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.ApplicationKeyDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.po.applicationKey.ApplicationKeyPo;
import com.java110.po.file.FileRelPo;

 service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java

@@ -13,7 +13,7 @@
import com.java110.dto.RoomDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.hardwareAdapation.CarInoutDto;
import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.po.car.CarInoutPo;
import com.java110.po.fee.PayFeeConfigPo;

 service-api/src/main/java/com/java110/api/bmo/machine/impl/MachineBMOImpl.java

@@ -5,7 +5,7 @@
import com.java110.api.bmo.machine.IMachineBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.MachineDto;
import com.java110.po.machine.MachinePo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.util.Assert;

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

New file
@@ -0,0 +1,22 @@
package com.java110.api.bmo.machineTranslate;

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.machine.MachineUserResultDto;

/**
 * @ClassName IOwnerMachineTranslateBMO
 * @Description TODO 人脸钥匙同步实现类
 * @Author wuxw
 * @Date 2020/6/5 8:21
 * @Version 1.0
 * add by wuxw 2020/6/5
 **/
public interface IApplicationKeyMachineTranslateBMO {

    /**
     * 查询人脸信息
     *
     * @return
     */
    MachineUserResultDto getPhotoInfo(JSONObject reqJson);
}

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

@@ -3,8 +3,8 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.IApiBaseBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.dto.hardwareAdapation.CarInoutDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.machine.MachineDto;

/**
 * @ClassName IMachineTranslateBMO

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

New file
@@ -0,0 +1,22 @@
package com.java110.api.bmo.machineTranslate;

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.machine.MachineUserResultDto;

/**
 * @ClassName IOwnerMachineTranslateBMO
 * @Description TODO 业主同步实现类
 * @Author wuxw
 * @Date 2020/6/5 8:21
 * @Version 1.0
 * add by wuxw 2020/6/5
 **/
public interface IOwnerMachineTranslateBMO {

    /**
     * 查询人脸信息
     *
     * @return
     */
    MachineUserResultDto getPhotoInfo(JSONObject reqJson);
}

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

New file
@@ -0,0 +1,22 @@
package com.java110.api.bmo.machineTranslate;

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.machine.MachineUserResultDto;

/**
 * @ClassName IOwnerMachineTranslateBMO
 * @Description TODO 访客人脸同步实现类
 * @Author wuxw
 * @Date 2020/6/5 8:21
 * @Version 1.0
 * add by wuxw 2020/6/5
 **/
public interface IVisitMachineTranslateBMO {

    /**
     * 查询人脸信息
     *
     * @return
     */
    MachineUserResultDto getPhotoInfo(JSONObject reqJson);
}

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

New file
@@ -0,0 +1,108 @@
package com.java110.api.bmo.machineTranslate.impl;

import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.machineTranslate.IApplicationKeyMachineTranslateBMO;
import com.java110.api.listener.machineTranslate.MachineQueryUserInfoListener;
import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.core.smo.file.IFileInnerServiceSMO;
import com.java110.core.smo.file.IFileRelInnerServiceSMO;
import com.java110.core.smo.hardwareAdapation.IApplicationKeyInnerServiceSMO;
import com.java110.core.smo.hardwareAdapation.IMachineTranslateInnerServiceSMO;
import com.java110.dto.file.FileDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.machine.ApplicationKeyDto;
import com.java110.dto.machine.MachineTranslateDto;
import com.java110.dto.machine.MachineUserResultDto;
import com.java110.utils.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.text.ParseException;
import java.util.List;

/**
 * @ClassName OwnerMachineTranslateBMOImpl
 * @Description TODO 钥匙信息同步
 * @Author wuxw
 * @Date 2020/6/5 8:30
 * @Version 1.0
 * add by wuxw 2020/6/5
 **/
@Service("applicationKeyMachineTranslateBMOImpl")
public class ApplicationKeyMachineTranslateBMOImpl implements IApplicationKeyMachineTranslateBMO {

    @Autowired
    private IApplicationKeyInnerServiceSMO applicationKeyInnerServiceSMOImpl;

    @Autowired
    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;

    @Autowired
    private IFileInnerServiceSMO fileInnerServiceSMOImpl;

    @Autowired
    private IMachineTranslateInnerServiceSMO machineTranslateInnerServiceSMOImpl;

    @Autowired
    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;

    @Override
    public MachineUserResultDto getPhotoInfo(JSONObject reqJson) {

        String communityId = reqJson.getString("communityId");
        ApplicationKeyDto applicationKeyDto = new ApplicationKeyDto();
        applicationKeyDto.setCommunityId(communityId);
        applicationKeyDto.setApplicationKeyId(reqJson.getString("faceid"));
        List<ApplicationKeyDto> applicationKeyDtos = applicationKeyInnerServiceSMOImpl.queryApplicationKeys(applicationKeyDto);

        if (applicationKeyDtos == null || applicationKeyDtos.size() != 1) {

            return null;
        }

        FileRelDto fileRelDto = new FileRelDto();
        fileRelDto.setObjId(reqJson.getString("faceid"));
        fileRelDto.setRelTypeCd("30000");
        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
        if (fileRelDtos == null || fileRelDtos.size() != 1) {
            return null;
        }
        FileDto fileDto = new FileDto();
        fileDto.setFileId(fileRelDtos.get(0).getFileSaveName());
        fileDto.setCommunityId(communityId);
        List<FileDto> fileDtos = fileInnerServiceSMOImpl.queryFiles(fileDto);
        if (fileDtos == null || fileDtos.size() != 1) {
            return null;
        }

        applicationKeyDto = applicationKeyDtos.get(0);

        MachineUserResultDto machineUserResultDto = new MachineUserResultDto();
        machineUserResultDto.setUserid(applicationKeyDto.getApplicationKeyId());
        machineUserResultDto.setGroupid(communityId);
        machineUserResultDto.setGroup(reqJson.getString("communityName"));
        machineUserResultDto.setName(applicationKeyDto.getName());
        String tmpImg = fileDtos.get(0).getContext();
        machineUserResultDto.setFaceBase64(tmpImg);
        machineUserResultDto.setIdNumber(applicationKeyDto.getIdCard());
        machineUserResultDto.setStartTime(applicationKeyDto.getCreateTime().getTime() + "");
        try {
            machineUserResultDto.setEndTime(DateUtil.getLastDate().getTime() + "");
        } catch (ParseException e) {
            machineUserResultDto.setEndTime(2145891661 + "");
        }
        machineUserResultDto.setRemarks("HC小区管理系统");
        machineUserResultDto.setReserved(applicationKeyDto.getApplicationKeyId());
        machineUserResultDto.setUserType(MachineQueryUserInfoListener.TYPE_APPLICATION_KEY);

        //将 设备 待同步 改为同步中
        MachineTranslateDto tmpMtDto = new MachineTranslateDto();
        tmpMtDto.setMachineCode(reqJson.getString("machineCode"));
        tmpMtDto.setCommunityId(communityId);
        tmpMtDto.setObjId(applicationKeyDto.getApplicationKeyId());
        tmpMtDto.setState("20000");
        machineTranslateInnerServiceSMOImpl.updateMachineTranslateState(tmpMtDto);

        return machineUserResultDto;
    }
}

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

@@ -13,9 +13,9 @@
import com.java110.dto.CommunityMemberDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.file.FileDto;
import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
import com.java110.dto.hardwareAdapation.CarInoutDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.ApplicationKeyDto;
import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.po.car.CarInoutDetailPo;
import com.java110.po.car.CarInoutPo;

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

New file
@@ -0,0 +1,108 @@
package com.java110.api.bmo.machineTranslate.impl;

import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.machineTranslate.IOwnerMachineTranslateBMO;
import com.java110.api.listener.machineTranslate.MachineQueryUserInfoListener;
import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.core.smo.file.IFileInnerServiceSMO;
import com.java110.core.smo.file.IFileRelInnerServiceSMO;
import com.java110.core.smo.hardwareAdapation.IMachineTranslateInnerServiceSMO;
import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
import com.java110.dto.file.FileDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.machine.MachineTranslateDto;
import com.java110.dto.machine.MachineUserResultDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.utils.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;

import java.text.ParseException;
import java.util.List;

/**
 * @ClassName OwnerMachineTranslateBMOImpl
 * @Description TODO 业主信息同步
 * @Author wuxw
 * @Date 2020/6/5 8:30
 * @Version 1.0
 * add by wuxw 2020/6/5
 **/
@Service("ownerMachineTranslateBMOImpl")
public class OwnerMachineTranslateBMOImpl implements IOwnerMachineTranslateBMO {

    @Autowired
    private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;

    @Autowired
    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;

    @Autowired
    private IFileInnerServiceSMO fileInnerServiceSMOImpl;

    @Autowired
    private IMachineTranslateInnerServiceSMO machineTranslateInnerServiceSMOImpl;

    @Autowired
    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;

    @Override
    public MachineUserResultDto getPhotoInfo(JSONObject reqJson) {

        String communityId = reqJson.getString("communityId");
        OwnerDto ownerDto = new OwnerDto();
        ownerDto.setCommunityId(communityId);
        ownerDto.setMemberId(reqJson.getString("faceid"));
        List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);

        ResponseEntity<String> responseEntity = null;


        FileRelDto fileRelDto = new FileRelDto();
        fileRelDto.setObjId(reqJson.getString("faceid"));
        fileRelDto.setRelTypeCd("10000");
        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
        if (fileRelDtos == null || fileRelDtos.size() != 1) {
            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) {
            return null;
        }

        ownerDto = ownerDtos.get(0);

        MachineUserResultDto machineUserResultDto = new MachineUserResultDto();
        machineUserResultDto.setUserid(ownerDto.getMemberId());
        machineUserResultDto.setGroupid(communityId);
        machineUserResultDto.setGroup(reqJson.getString("communityName"));
        machineUserResultDto.setName(ownerDto.getName());
        String tmpImg = fileDtos.get(0).getContext();
        machineUserResultDto.setFaceBase64(tmpImg);
        machineUserResultDto.setIdNumber(ownerDto.getIdCard());
        machineUserResultDto.setStartTime(ownerDto.getCreateTime().getTime() + "");
        try {
            machineUserResultDto.setEndTime(DateUtil.getLastDate().getTime() + "");
        } catch (ParseException e) {
            machineUserResultDto.setEndTime(2145891661 + "");
        }
        machineUserResultDto.setRemarks("HC小区管理系统");
        machineUserResultDto.setReserved(ownerDto.getMemberId());
        machineUserResultDto.setUserType(MachineQueryUserInfoListener.TYPE_OWNER);

        //将 设备 待同步 改为同步中
        MachineTranslateDto tmpMtDto = new MachineTranslateDto();
        tmpMtDto.setMachineCode(reqJson.getString("machineCode"));
        tmpMtDto.setCommunityId(communityId);
        tmpMtDto.setObjId(ownerDto.getMemberId());
        tmpMtDto.setState("20000");
        machineTranslateInnerServiceSMOImpl.updateMachineTranslateState(tmpMtDto);

        return machineUserResultDto;
    }
}

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

New file
@@ -0,0 +1,108 @@
package com.java110.api.bmo.machineTranslate.impl;

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.file.IFileInnerServiceSMO;
import com.java110.core.smo.file.IFileRelInnerServiceSMO;
import com.java110.core.smo.hardwareAdapation.IMachineTranslateInnerServiceSMO;
import com.java110.core.smo.visit.IVisitInnerServiceSMO;
import com.java110.dto.file.FileDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.machine.MachineTranslateDto;
import com.java110.dto.machine.MachineUserResultDto;
import com.java110.dto.visit.VisitDto;
import com.java110.utils.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.text.ParseException;
import java.util.List;

/**
 * @ClassName OwnerMachineTranslateBMOImpl
 * @Description TODO 访客信息同步
 * @Author wuxw
 * @Date 2020/6/5 8:30
 * @Version 1.0
 * add by wuxw 2020/6/5
 **/
@Service("visitMachineTranslateBMOImpl")
public class VisitMachineTranslateBMOImpl implements IVisitMachineTranslateBMO {

    @Autowired
    private IVisitInnerServiceSMO visitInnerServiceSMOImpl;

    @Autowired
    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;

    @Autowired
    private IFileInnerServiceSMO fileInnerServiceSMOImpl;

    @Autowired
    private IMachineTranslateInnerServiceSMO machineTranslateInnerServiceSMOImpl;

    @Autowired
    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;

    @Override
    public MachineUserResultDto getPhotoInfo(JSONObject reqJson) {

        String communityId = reqJson.getString("communityId");
        VisitDto visitDto = new VisitDto();
        visitDto.setCommunityId(communityId);
        visitDto.setvId(reqJson.getString("faceid"));
        List<VisitDto> visitDtos = visitInnerServiceSMOImpl.queryVisits(visitDto);

        if (visitDtos == null || visitDtos.size() != 1) {

            return null;
        }

        FileRelDto fileRelDto = new FileRelDto();
        fileRelDto.setObjId(reqJson.getString("faceid"));
        fileRelDto.setRelTypeCd("11000");
        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
        if (fileRelDtos == null || fileRelDtos.size() != 1) {
            return null;
        }
        FileDto fileDto = new FileDto();
        fileDto.setFileId(fileRelDtos.get(0).getFileSaveName());
        fileDto.setCommunityId(communityId);
        List<FileDto> fileDtos = fileInnerServiceSMOImpl.queryFiles(fileDto);
        if (fileDtos == null || fileDtos.size() != 1) {
            return null;
        }
        visitDto = visitDtos.get(0);

        MachineUserResultDto machineUserResultDto = new MachineUserResultDto();
        machineUserResultDto.setUserid(visitDto.getvId());
        machineUserResultDto.setGroupid(communityId);
        machineUserResultDto.setGroup(reqJson.getString("communityName"));
        machineUserResultDto.setName(visitDto.getvName());
        String tmpImg = fileDtos.get(0).getContext();
        machineUserResultDto.setFaceBase64(tmpImg);
        machineUserResultDto.setIdNumber(visitDto.getPhoneNumber());
        try {
            machineUserResultDto.setStartTime(DateUtil.getDateFromString(visitDto.getVisitTime(), DateUtil.DATE_FORMATE_STRING_A).getTime() + "");
            machineUserResultDto.setEndTime(DateUtil.getDateFromString(visitDto.getDepartureTime(), DateUtil.DATE_FORMATE_STRING_A).getTime() + "");
        } catch (ParseException e) {
            machineUserResultDto.setEndTime(2145891661 + "");
            machineUserResultDto.setEndTime(2145891661 + "");
        }
        machineUserResultDto.setRemarks("HC小区管理系统");
        machineUserResultDto.setReserved(visitDto.getvId());
        machineUserResultDto.setUserType(MachineQueryUserInfoListener.TYPE_VISIT);

        //将 设备 待同步 改为同步中
        MachineTranslateDto tmpMtDto = new MachineTranslateDto();
        tmpMtDto.setMachineCode(reqJson.getString("machineCode"));
        tmpMtDto.setCommunityId(communityId);
        tmpMtDto.setObjId(visitDto.getvId());
        tmpMtDto.setState("20000");
        machineTranslateInnerServiceSMOImpl.updateMachineTranslateState(tmpMtDto);

        return machineUserResultDto;
    }
}

 service-api/src/main/java/com/java110/api/listener/advert/ListAdvertPhotoAndVediosListener.java

@@ -14,7 +14,7 @@
import com.java110.dto.UnitDto;
import com.java110.dto.advert.AdvertDto;
import com.java110.dto.advert.AdvertItemDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.MachineDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeAdvertConstant;
import com.java110.utils.util.Assert;

 service-api/src/main/java/com/java110/api/listener/applicationKey/ApplyVisitorApplicationKey.java

@@ -7,7 +7,7 @@
import com.java110.core.context.DataFlowContext;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.smo.hardwareAdapation.IApplicationKeyInnerServiceSMO;
import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
import com.java110.dto.machine.ApplicationKeyDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeApplicationKeyConstant;
import com.java110.utils.util.Assert;

 service-api/src/main/java/com/java110/api/listener/applicationKey/AuditApplicationKeyListener.java

@@ -7,7 +7,7 @@
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.hardwareAdapation.IApplicationKeyInnerServiceSMO;
import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
import com.java110.dto.machine.ApplicationKeyDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.po.applicationKey.ApplicationKeyPo;
import com.java110.utils.constant.BusinessTypeConstant;

 service-api/src/main/java/com/java110/api/listener/applicationKey/AuthApplicationKeyListener.java

@@ -13,8 +13,8 @@
import com.java110.core.smo.unit.IUnitInnerServiceSMO;
import com.java110.dto.RoomDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.ApplicationKeyDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.unit.FloorAndUnitDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeApplicationKeyConstant;

 service-api/src/main/java/com/java110/api/listener/applicationKey/ListApplicationKeysListener.java

@@ -11,7 +11,7 @@
import com.java110.core.smo.unit.IUnitInnerServiceSMO;
import com.java110.dto.RoomDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
import com.java110.dto.machine.ApplicationKeyDto;
import com.java110.dto.unit.FloorAndUnitDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeApplicationKeyConstant;

 service-api/src/main/java/com/java110/api/listener/carBlackWhite/ListCarBlackWhitesListener.java

@@ -5,7 +5,7 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.hardwareAdapation.ICarBlackWhiteInnerServiceSMO;
import com.java110.dto.hardwareAdapation.CarBlackWhiteDto;
import com.java110.dto.machine.CarBlackWhiteDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeCarBlackWhiteConstant;
import com.java110.utils.util.Assert;

 service-api/src/main/java/com/java110/api/listener/carInout/ListCarInoutsListener.java

@@ -9,7 +9,7 @@
import com.java110.core.smo.hardwareAdapation.ICarInoutInnerServiceSMO;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.hardwareAdapation.CarInoutDto;
import com.java110.dto.machine.CarInoutDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.FeeTypeConstant;
import com.java110.utils.constant.ServiceCodeCarInoutConstant;

 service-api/src/main/java/com/java110/api/listener/machine/ListMachinesListener.java

@@ -14,7 +14,7 @@
import com.java110.dto.RoomDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.communityLocation.CommunityLocationDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.unit.FloorAndUnitDto;
import com.java110.utils.constant.ServiceCodeMachineConstant;
import com.java110.utils.util.Assert;

 service-api/src/main/java/com/java110/api/listener/machineRecord/ListMachineRecordsListener.java

@@ -5,7 +5,7 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.hardwareAdapation.IMachineRecordInnerServiceSMO;
import com.java110.dto.hardwareAdapation.MachineRecordDto;
import com.java110.dto.machine.MachineRecordDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeMachineRecordConstant;
import com.java110.utils.util.Assert;

 service-api/src/main/java/com/java110/api/listener/machineTranslate/BaseMachineListener.java

@@ -6,7 +6,7 @@
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.MachineDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;

 service-api/src/main/java/com/java110/api/listener/machineTranslate/ListMachineTranslatesListener.java

@@ -5,7 +5,7 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.hardwareAdapation.IMachineTranslateInnerServiceSMO;
import com.java110.dto.hardwareAdapation.MachineTranslateDto;
import com.java110.dto.machine.MachineTranslateDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeMachineTranslateConstant;
import com.java110.utils.util.Assert;

 service-api/src/main/java/com/java110/api/listener/machineTranslate/MachineCmdResultListener.java

@@ -12,7 +12,7 @@
import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
import com.java110.core.smo.hardwareAdapation.IMachineTranslateInnerServiceSMO;
import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.MachineDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeMachineTranslateConstant;
import com.java110.utils.util.StringUtil;

 service-api/src/main/java/com/java110/api/listener/machineTranslate/MachineGetFreeParkingSpaceListener.java

@@ -10,7 +10,7 @@
import com.java110.core.smo.owner.IOwnerCarInnerServiceSMO;
import com.java110.core.smo.parkingSpace.IParkingSpaceInnerServiceSMO;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.hardwareAdapation.CarInoutDto;
import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;

 service-api/src/main/java/com/java110/api/listener/machineTranslate/MachineGetTaskInfoListener.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.machineTranslate.IOwnerMachineTranslateBMO;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.community.ICommunityInnerServiceSMO;
@@ -10,7 +11,7 @@
import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
import com.java110.core.smo.hardwareAdapation.IMachineTranslateInnerServiceSMO;
import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
import com.java110.dto.hardwareAdapation.MachineTranslateDto;
import com.java110.dto.machine.MachineTranslateDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeMachineTranslateConstant;
import com.java110.utils.constant.StatusConstant;
@@ -50,6 +51,7 @@
    @Autowired
    private IFileInnerServiceSMO fileInnerServiceSMOImpl;


    /**
     * @param event   事件对象
     * @param reqJson 请求报文数据

 service-api/src/main/java/com/java110/api/listener/machineTranslate/MachineQueryUserInfoListener.java

@@ -2,37 +2,32 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.machineTranslate.IApplicationKeyMachineTranslateBMO;
import com.java110.api.bmo.machineTranslate.IOwnerMachineTranslateBMO;
import com.java110.api.bmo.machineTranslate.IVisitMachineTranslateBMO;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.core.smo.file.IFileInnerServiceSMO;
import com.java110.core.smo.file.IFileRelInnerServiceSMO;
import com.java110.core.smo.hardwareAdapation.IApplicationKeyInnerServiceSMO;
import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
import com.java110.core.smo.hardwareAdapation.IMachineTranslateInnerServiceSMO;
import com.java110.core.smo.owner.IOwnerInnerServiceSMO;

import com.java110.dto.community.CommunityDto;
import com.java110.dto.file.FileDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
import com.java110.dto.hardwareAdapation.MachineTranslateDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.cache.CommonCache;
import com.java110.utils.cache.MappingCache;
import com.java110.dto.machine.MachineTranslateDto;
import com.java110.dto.machine.MachineUserResultDto;
import com.java110.utils.constant.ServiceCodeMachineTranslateConstant;
import com.java110.utils.exception.ConfigDataException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestTemplate;

import java.text.ParseException;
import java.util.List;
import java.util.Map;

@@ -46,6 +41,11 @@

    private static Logger logger = LoggerFactory.getLogger(MachineQueryUserInfoListener.class);

    public static final String TYPE_OWNER = "8899";//业主人脸
    public static final String TYPE_APPLICATION_KEY = "7788";//申请钥匙
    public static final String TYPE_VISIT = "6677";//访客人脸
    public static final String TYPE_STAFF = "5566";//员工人脸


    private static final String DEFAULT_DOMAIN = "YUNLUN";

@@ -55,8 +55,6 @@
    @Autowired
    private IMachineInnerServiceSMO machineInnerServiceSMOImpl;

    @Autowired
    private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;

    @Autowired
    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
@@ -72,6 +70,16 @@

    @Autowired
    private IApplicationKeyInnerServiceSMO applicationKeyInnerServiceSMOImpl;


    @Autowired
    private IOwnerMachineTranslateBMO ownerMachineTranslateBMOImpl;

    @Autowired
    private IApplicationKeyMachineTranslateBMO applicationKeyMachineTranslateBMOImpl;

    @Autowired
    private IVisitMachineTranslateBMO visitMachineTranslateBMOImpl;

    /**
     * @param event   事件对象
@@ -99,278 +107,64 @@
        JSONArray data = null;
        String communityId = reqJson.containsKey("communityId") ? reqJson.getString("communityId") : reqHeader.get("communityId");
        HttpHeaders httpHeaders = super.getHeader(context);
        //检查是否存在该用户
        OwnerDto ownerDto = new OwnerDto();
        ownerDto.setCommunityId(communityId);
        ownerDto.setMemberId(reqJson.getString("faceid"));
        List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);

        if (ownerDtos != null && ownerDtos.size() == 1) {
            getOwnerPhoto(communityId, outParam, context, httpHeaders, reqJson, ownerDtos.get(0));
        CommunityDto communityDto = new CommunityDto();
        communityDto.setCommunityId(communityId);
        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
        if (communityDtos == null || communityDtos.size() != 1) {
            outParam.put("code", -1);
            outParam.put("message", "未找到相应小区信息");
            responseEntity = new ResponseEntity<>(outParam.toJSONString(), httpHeaders, HttpStatus.OK);
            context.setResponseEntity(responseEntity);
            return;
        }
        ApplicationKeyDto applicationKeyDto = new ApplicationKeyDto();
        applicationKeyDto.setCommunityId(communityId);
        applicationKeyDto.setApplicationKeyId(reqJson.getString("faceid"));
        List<ApplicationKeyDto> applicationKeyDtos = applicationKeyInnerServiceSMOImpl.queryApplicationKeys(applicationKeyDto);

        if (applicationKeyDtos == null || applicationKeyDtos.size() != 1) {

        MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
        machineTranslateDto.setCommunityId(communityId);
        machineTranslateDto.setObjId(reqJson.getString("faceid"));
        machineTranslateDto.setState("30000");//查询同步中
        List<MachineTranslateDto> machineTranslateDtos = machineTranslateInnerServiceSMOImpl.queryMachineTranslates(machineTranslateDto);

        if (machineTranslateDtos == null || machineTranslateDtos.size() < 1) {
            outParam.put("code", -1);
            outParam.put("message", "未找到相应人脸信息");
            responseEntity = new ResponseEntity<>(outParam.toJSONString(), httpHeaders, HttpStatus.OK);
            context.setResponseEntity(responseEntity);
            return;
        }
        //查询钥匙人脸
        getApplicationKeyPhoto(communityId, outParam, context, httpHeaders, reqJson, applicationKeyDtos.get(0));

        MachineTranslateDto tmpMachineTranslateDto = machineTranslateDtos.get(0);

    }
        reqJson.put("communityId", communityId);
        reqJson.put("communityName", communityDtos.get(0).getName());
        reqJson.put("machineCode", httpHeaders.get("machinecode"));

    private void getApplicationKeyPhoto(String communityId, JSONObject outParam,
                                        DataFlowContext context,
                                        HttpHeaders httpHeaders, JSONObject reqJson, ApplicationKeyDto applicationKeyDto) {
        Map<String, String> reqHeader = context.getRequestHeaders();
        ResponseEntity<String> responseEntity = null;
        CommunityDto communityDto = new CommunityDto();
        communityDto.setCommunityId(communityId);
        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
        if (communityDtos == null || communityDtos.size() != 1) {
            outParam.put("code", -1);
            outParam.put("message", "未找到相应小区信息");
            responseEntity = new ResponseEntity<>(outParam.toJSONString(), httpHeaders, HttpStatus.OK);
            context.setResponseEntity(responseEntity);
            return;
        MachineUserResultDto machineUserResultDto = null;
        switch (tmpMachineTranslateDto.getTypeCd()) {
            case TYPE_OWNER:
                machineUserResultDto = ownerMachineTranslateBMOImpl.getPhotoInfo(reqJson);
                break;
            case TYPE_APPLICATION_KEY:
                machineUserResultDto = applicationKeyMachineTranslateBMOImpl.getPhotoInfo(reqJson);
            case TYPE_VISIT:
                machineUserResultDto = visitMachineTranslateBMOImpl.getPhotoInfo(reqJson);
            default:
                break;
        }
        FileRelDto fileRelDto = new FileRelDto();
        fileRelDto.setObjId(reqJson.getString("faceid"));
        fileRelDto.setRelTypeCd("30000");
        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
        if (fileRelDtos == null || fileRelDtos.size() != 1) {

        //检查是否存在该用户
        if (machineUserResultDto == null) {
            outParam.put("code", -1);
            outParam.put("message", "未找到钥匙照片，可能未录入照片");
            responseEntity = new ResponseEntity<>(outParam.toJSONString(), httpHeaders, HttpStatus.OK);
            context.setResponseEntity(responseEntity);
            return;
        }
        FileDto fileDto = new FileDto();
        fileDto.setFileId(fileRelDtos.get(0).getFileSaveName());
        fileDto.setCommunityId(communityId);
        List<FileDto> fileDtos = fileInnerServiceSMOImpl.queryFiles(fileDto);
        if (fileDtos == null || fileDtos.size() != 1) {
            outParam.put("code", -1);
            outParam.put("message", "未找到照片，可能未录入照片");
            outParam.put("message", "未找到相应人脸信息");
            responseEntity = new ResponseEntity<>(outParam.toJSONString(), httpHeaders, HttpStatus.OK);
            context.setResponseEntity(responseEntity);
            return;
        }

        JSONObject dataObj = new JSONObject();
        dataObj.put("userid", applicationKeyDto.getApplicationKeyId());
        dataObj.put("groupid", communityId);
        dataObj.put("group", communityDtos.get(0).getName());
        dataObj.put("name", applicationKeyDto.getName());
        dataObj.put("faceBase64", "data:image/jpeg;base64," + fileDtos.get(0).getContext()
                .replace("data:image/webp;base64,", "")
                .replace("data:image/png;base64,", "")
                .replace("data:image/jpeg;base64,", ""));
        dataObj.put("idNumber", applicationKeyDto.getIdCard());
        dataObj.put("startTime", applicationKeyDto.getCreateTime().getTime());
        try {
            dataObj.put("endTime", DateUtil.getLastDate().getTime());
        } catch (ParseException e) {
            dataObj.put("endTime", 2145891661);
        }
        dataObj.put("remarks", "HC小区管理系统");
        dataObj.put("reserved", applicationKeyDto.getApplicationKeyId());


        //特殊处理是否获取特征值
        if ("ON".equals(MappingCache.getValue(DEFAULT_DOMAIN, "getFeature"))) {
            getFeature(dataObj);
        }
        outParam.put("data", dataObj);
        //将 设备 待同步 改为同步中
        MachineTranslateDto tmpMtDto = new MachineTranslateDto();
        tmpMtDto.setMachineCode(reqHeader.get("machinecode"));
        tmpMtDto.setCommunityId(communityId);
        tmpMtDto.setObjId(applicationKeyDto.getApplicationKeyId());
        tmpMtDto.setState("20000");
        machineTranslateInnerServiceSMOImpl.updateMachineTranslateState(tmpMtDto);

        responseEntity = new ResponseEntity<>(outParam.toJSONString(), httpHeaders, HttpStatus.OK);
        responseEntity = new ResponseEntity<>(JSONObject.toJSONString(machineUserResultDto), httpHeaders, HttpStatus.OK);
        context.setResponseEntity(responseEntity);
    }

    private void getOwnerPhoto(String communityId, JSONObject outParam,
                               DataFlowContext context,
                               HttpHeaders httpHeaders, JSONObject reqJson, OwnerDto ownerDto) {
        Map<String, String> reqHeader = context.getRequestHeaders();
        ResponseEntity<String> responseEntity = null;
        CommunityDto communityDto = new CommunityDto();
        communityDto.setCommunityId(communityId);
        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
        if (communityDtos == null || communityDtos.size() != 1) {
            outParam.put("code", -1);
            outParam.put("message", "未找到相应小区信息");
            responseEntity = new ResponseEntity<>(outParam.toJSONString(), httpHeaders, HttpStatus.OK);
            context.setResponseEntity(responseEntity);
            return;
        }
        FileRelDto fileRelDto = new FileRelDto();
        fileRelDto.setObjId(reqJson.getString("faceid"));
        fileRelDto.setRelTypeCd("10000");
        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
        if (fileRelDtos == null || fileRelDtos.size() != 1) {
            outParam.put("code", -1);
            outParam.put("message", "未找到业主照片，可能未录入照片");
            responseEntity = new ResponseEntity<>(outParam.toJSONString(), httpHeaders, HttpStatus.OK);
            context.setResponseEntity(responseEntity);
            return;
        }
        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) {
            outParam.put("code", -1);
            outParam.put("message", "未找到业主照片，可能未录入照片");
            responseEntity = new ResponseEntity<>(outParam.toJSONString(), httpHeaders, HttpStatus.OK);
            context.setResponseEntity(responseEntity);
            return;
        }

        JSONObject dataObj = new JSONObject();
        dataObj.put("userid", ownerDto.getMemberId());
        dataObj.put("groupid", communityId);
        dataObj.put("group", communityDtos.get(0).getName());
        dataObj.put("name", ownerDto.getName());
        String tmpImg = fileDtos.get(0).getContext();
        dataObj.put("faceBase64",  tmpImg);
        dataObj.put("idNumber", ownerDto.getIdCard());
        dataObj.put("startTime", ownerDto.getCreateTime().getTime());
        try {
            dataObj.put("endTime", DateUtil.getLastDate().getTime());
        } catch (ParseException e) {
            dataObj.put("endTime", 2145891661);
        }
        dataObj.put("remarks", "HC小区管理系统");
        dataObj.put("reserved", ownerDto.getMemberId());


        //特殊处理是否获取特征值
        if ("ON".equals(MappingCache.getValue(DEFAULT_DOMAIN, "getFeature"))) {
            getFeature(dataObj);
        }
        outParam.put("data", dataObj);
        //将 设备 待同步 改为同步中
        MachineTranslateDto tmpMtDto = new MachineTranslateDto();
        tmpMtDto.setMachineCode(reqHeader.get("machinecode"));
        tmpMtDto.setCommunityId(communityId);
        tmpMtDto.setObjId(ownerDto.getMemberId());
        tmpMtDto.setState("20000");
        machineTranslateInnerServiceSMOImpl.updateMachineTranslateState(tmpMtDto);

        responseEntity = new ResponseEntity<>(outParam.toJSONString(), httpHeaders, HttpStatus.OK);
        context.setResponseEntity(responseEntity);
    }

    /**
     * 调用第三方平台获取照片特征
     *
     * @param dataObj
     */
    private void getFeature(JSONObject dataObj) {

        logger.debug("开始获取照片特征");

        String photo = dataObj.getString("faceBase64");

        photo = photo
                .replace("data:image/webp;base64,", "")
                .replace("data:image/png;base64,", "")
                .replace("data:image/jpeg;base64,", "");

        //从redis 中获取token，没有则重新获取
        String token = getToken();
        logger.debug("获取到的token为：" + token);

        String url = MappingCache.getValue(DEFAULT_DOMAIN, "hc_feature_url");
        if (StringUtil.isEmpty(url)) {
            throw new ConfigDataException(199, "未配置hc_feature_url参数");
        }

        HttpHeaders headers = new HttpHeaders();
        headers.add("accessToken", token);
        headers.add("Content-Type", "application/json");
        JSONObject paramIn = new JSONObject();
        paramIn.put("image", photo);
        paramIn.put("imageType", "BASE64");
        HttpEntity httpEntity = new HttpEntity(paramIn.toJSONString(), headers);
        ResponseEntity<String> responseEntity = restTemplateNoLoadBalanced.exchange(url, HttpMethod.POST, httpEntity, String.class);

        if (responseEntity.getStatusCode() != HttpStatus.OK) {
            throw new RuntimeException("查询特征token失败" + responseEntity.toString());
        }

        String outBody = responseEntity.getBody();

        JSONObject outObj = JSONObject.parseObject(outBody);
        if (!outObj.containsKey("code")) {
            throw new RuntimeException("查询特征失败" + outBody);
        }

        if (!"0".equals(outObj.getString("code"))) {
            throw new RuntimeException("查询特征失败" + outBody);
        }

        dataObj.put("faceBase64", outObj.getString("feature"));
        logger.debug("获取到的数据dataObj为：" + dataObj.toJSONString());

    }

    /**
     * 获取token
     *
     * @return
     */
    private String getToken() {
        String token = CommonCache.getValue("hc_getFeature_token");
        if (!StringUtil.isEmpty(token)) {
            return token;
        }

        String url = MappingCache.getValue(DEFAULT_DOMAIN, "hc_token_url");
        if (StringUtil.isEmpty(url)) {
            throw new ConfigDataException(199, "未配置hc_token_url参数");
        }

        url += ("?clientId=" + MappingCache.getValue(DEFAULT_DOMAIN, "hc_clientId"));
        url += ("&clientSecret=" + MappingCache.getValue(DEFAULT_DOMAIN, "hc_clientSecret"));

        String resultInfo = restTemplateNoLoadBalanced.getForObject(url, String.class);

        logger.debug("调用 获取特征token接口：url = " + url + "返回报文：" + resultInfo);

        JSONObject resultObj = JSONObject.parseObject(resultInfo);

        if (!resultObj.containsKey("code")) {
            throw new RuntimeException("查询特征token失败" + resultInfo);
        }

        if (!"0".equals(resultObj.getString("code"))) {
            throw new RuntimeException("查询特征token失败" + resultInfo);

        }

        token = resultObj.getString("accessToken");
        int expiresIn = resultObj.getInteger("expiresIn");
        CommonCache.setValue("hc_getFeature_token", token, (expiresIn / 1000) - 10);//减去10秒 防止网络超时 时间不一致问题


        return token;

    }

    @Override
@@ -404,13 +198,6 @@
        this.machineInnerServiceSMOImpl = machineInnerServiceSMOImpl;
    }

    public IOwnerInnerServiceSMO getOwnerInnerServiceSMOImpl() {
        return ownerInnerServiceSMOImpl;
    }

    public void setOwnerInnerServiceSMOImpl(IOwnerInnerServiceSMO ownerInnerServiceSMOImpl) {
        this.ownerInnerServiceSMOImpl = ownerInnerServiceSMOImpl;
    }

    public ICommunityInnerServiceSMO getCommunityInnerServiceSMOImpl() {
        return communityInnerServiceSMOImpl;

 service-api/src/main/java/com/java110/api/listener/machineTranslate/MachineRoadGateOpenListener.java

@@ -15,9 +15,9 @@
import com.java110.dto.CommunityMemberDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.hardwareAdapation.CarBlackWhiteDto;
import com.java110.dto.hardwareAdapation.CarInoutDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.CarBlackWhiteDto;
import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.entity.center.AppService;
import com.java110.core.event.service.api.ServiceDataFlowEvent;

 service-api/src/main/java/com/java110/api/listener/owner/ListOwnerMachines.java

@@ -11,7 +11,7 @@
import com.java110.core.smo.unit.IUnitInnerServiceSMO;
import com.java110.dto.RoomDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.unit.FloorAndUnitDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;

 service-common/src/main/java/com/java110/common/smo/impl/ApplicationKeyInnerServiceSMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.core.smo.hardwareAdapation.IApplicationKeyInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
import com.java110.dto.machine.ApplicationKeyDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;

 service-common/src/main/java/com/java110/common/smo/impl/CarBlackWhiteInnerServiceSMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.core.smo.hardwareAdapation.ICarBlackWhiteInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.hardwareAdapation.CarBlackWhiteDto;
import com.java110.dto.machine.CarBlackWhiteDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;

 service-common/src/main/java/com/java110/common/smo/impl/CarInoutDetailInnerServiceSMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.core.smo.hardwareAdapation.ICarInoutDetailInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.hardwareAdapation.CarInoutDetailDto;
import com.java110.dto.machine.CarInoutDetailDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;

 service-common/src/main/java/com/java110/common/smo/impl/CarInoutInnerServiceSMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.core.smo.hardwareAdapation.ICarInoutInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.hardwareAdapation.CarInoutDto;
import com.java110.dto.machine.CarInoutDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;

 service-common/src/main/java/com/java110/common/smo/impl/MachineAttrInnerServiceSMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.core.smo.hardwareAdapation.IMachineAttrInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.hardwareAdapation.MachineAttrDto;
import com.java110.dto.machine.MachineAttrDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;

 service-common/src/main/java/com/java110/common/smo/impl/MachineInnerServiceSMOImpl.java

@@ -7,7 +7,7 @@
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.demo.DemoDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.user.UserDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;

 service-common/src/main/java/com/java110/common/smo/impl/MachineRecordInnerServiceSMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.core.smo.hardwareAdapation.IMachineRecordInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.hardwareAdapation.MachineRecordDto;
import com.java110.dto.machine.MachineRecordDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;

 service-common/src/main/java/com/java110/common/smo/impl/MachineTranslateInnerServiceSMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.core.smo.hardwareAdapation.IMachineTranslateInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.hardwareAdapation.MachineTranslateDto;
import com.java110.dto.machine.MachineTranslateDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;

 service-common/src/main/java/com/java110/common/thread/TranslateApplicationKeyToMachine.java

@@ -7,8 +7,8 @@
import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
import com.java110.core.smo.order.IOrderInnerServiceSMO;
import com.java110.core.smo.room.IRoomInnerServiceSMO;
import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.ApplicationKeyDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.order.OrderDto;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.BusinessTypeConstant;

 service-common/src/main/java/com/java110/common/thread/TranslateOwnerToMachine.java

@@ -9,7 +9,7 @@
import com.java110.core.smo.owner.IOwnerRoomRelInnerServiceSMO;
import com.java110.core.smo.room.IRoomInnerServiceSMO;
import com.java110.dto.RoomDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.order.OrderDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.owner.OwnerRoomRelDto;

 service-common/src/main/java/com/java110/common/thread/TranslateOwnerToMachineChangeMachine.java

@@ -8,7 +8,7 @@
import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
import com.java110.core.smo.room.IRoomInnerServiceSMO;
import com.java110.dto.RoomDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.order.OrderDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.utils.cache.MappingCache;

 service-common/src/main/java/com/java110/common/thread/UpdateApplicationKeyPwd.java

@@ -2,7 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.core.smo.hardwareAdapation.IApplicationKeyInnerServiceSMO;
import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
import com.java110.dto.machine.ApplicationKeyDto;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.factory.ApplicationContextFactory;

 service-job/src/main/java/com/java110/job/task/visiterToMachine/TranslateVisitPhotoToMachine.java

@@ -8,8 +8,8 @@
import com.java110.core.smo.room.IRoomInnerServiceSMO;
import com.java110.core.smo.visit.IVisitInnerServiceSMO;
import com.java110.dto.RoomDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.hardwareAdapation.MachineTranslateDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.machine.MachineTranslateDto;
import com.java110.dto.order.OrderDto;
import com.java110.dto.task.TaskDto;
import com.java110.dto.visit.VisitDto;