From d7e663d304a2ccb565a24362b116ddaa9da9941a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 09 一月 2024 13:56:43 +0800
Subject: [PATCH] 整理

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 c8884e4..a6ed00d 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;
 
@@ -149,14 +148,16 @@
         event.setIsdeleted(Constants.ZERO);
         event.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
         event.setEventId(request.getEventId());
-        event.setEventType( request.getData().getExtEventType()!=null?request.getData().getExtEventType()+"":null);
+        event.setEventType(request.getEventType());
         event.setAccessChannel(request.getData().getExtAccessChannel());
         event.setUserType(request.getData().getUserType());
         event.setSvrIndexCode(request.getData().getSvrIndexCode());
         event.setStatus(request.getStatus());
+        event.setExtEventType(request.getData().getExtEventType()!=null?request.getData().getExtEventType():null);
         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());
@@ -368,7 +369,7 @@
         Retention retention = new Retention();
         retention.setIsdeleted(Constants.ZERO);
         retention.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
-        retention.setClasses(visits.getMemberClasses());
+        retention.setClasses(visits.getClasses());
         retention.setCode(visits.getCode());
         retention.setIdcardNo(visits.getIdcardNo());
         retention.setIdcardDecode(visits.getIdcardDecode());

--
Gitblit v1.9.3