整理

jiangping

2024-02-26 c75257907b5f0d31135236b7c4494aa20e2d7973

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java

@@ -28,7 +28,6 @@
import com.hikvision.artemis.sdk.config.ArtemisConfig;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -48,6 +47,8 @@

    @Autowired
    private InterfaceLogMapper interfaceLogMapper;
    @Autowired
    private CarsMapper carsMapper;
    @Autowired
    private DeviceEventMapper deviceEventMapper;
    @Autowired
@@ -318,9 +319,11 @@
                //如果是访客登记，录入人员的在场数据记录
                retentionList.add(getRetentionModelByVisitRequest(visits,request));
                //来访时间
                updateVistis.setOutDate(DateUtil.getISO8601DateByStr(model.getStartTime()));
                updateVistis.setStatus(Constants.VisitStatus.signin);
                updateVistis.setInDate(DateUtil.getISO8601DateByStr(model.getStartTime()));
            }else {
                //如果是访客签离事件
                updateVistis.setStatus(Constants.VisitStatus.signout);
                updateVistis.setOutDate(DateUtil.getISO8601DateByStr(model.getEndTime()));
                updateVistis.setOutType(Constants.ZERO);
                updateVistis.setOutInfo("访客正常签离");
@@ -441,8 +444,9 @@
        event.setVehicleColor(request.getData().getVehicleColor());
        event.setVehicleClass(request.getData().getVehicleClass());
        event.setTimestr(request.getData().getTime());
        event.setEventId(request.getEventId());
        event.setTimeout(request.getTimeout());
        event.setSvrIndex(request.getSrcIndex());
        event.setSvrIndex(request.getData().getSvrIndex());
        event.setSubModel(request.getData().getSubModel());
        event.setSubLogo(request.getData().getSubLogo());
        event.setStatus(request.getStatus());
@@ -470,6 +474,7 @@
        event.setEventCmd(request.getData().getEventCmd());
        event.setCardNo(request.getData().getCardNo());
        event.setCarAttributeName(request.getData().getCarAttributeName());

        if(request.getData().getInResult()!=null && request.getData().getInResult().getRlsResult() !=null ){
            //放行方式
            event.setReleaseWay(request.getData().getInResult().getRlsResult().getReleaseWay());
@@ -484,7 +489,15 @@
            event.setVehiclePicUrl(getHkImgUrl(request.getData().getPicUrl().getVehiclePicUrl()));
            event.setPlatePicUrl(getHkImgUrl(request.getData().getPicUrl().getPlatePicUrl()));
        }

        if(StringUtils.isNotBlank(event.getPlateNos())){
                Cars cars = carsMapper.selectOne(new QueryWrapper<Cars>().lambda()
                        .eq(Cars::getCode,event.getPlateNos())
                                .eq(Cars::getIsdeleted,Constants.ONE )
                        .last("limit 1" ));
                if(cars!=null){
                    event.setMemberId(cars.getMemberId());
                }
        }
        return event;

    }