From c75257907b5f0d31135236b7c4494aa20e2d7973 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 二月 2024 15:56:33 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 8cc098b..3ec0b8d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/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
@@ -158,6 +159,7 @@
event.setSrcType(request.getSrcType());
event.setSrcName(request.getSrcName());
event.setSrcIndex(request.getSrcIndex());
+ event.setSrcParentIndex(request.getSrcParentIndex());
event.setSeq(request.getData().getSeq());
event.setTimeout(request.getTimeout());
event.setExtEventType(request.getData().getExtEventType());
@@ -317,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("璁垮姝ｅ父绛剧");
@@ -440,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());
@@ -469,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());
@@ -483,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;
}
--
Gitblit v1.9.3