From e4ed89aae12459bd54fd3d53a7a46ce48f74e37f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 五月 2025 15:01:11 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 1e5d6e6..4e7d5c0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -585,7 +585,7 @@
                 //濡傛灉鏄瀹㈤�氳
                 if(request.getData()!=null&&request.getData().getParamValues()!=null &&
                         StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
-                    //濡傛灉鏄瀹㈢櫥璁帮紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
+                    //濡傛灉鏄瀹㈣繘鍏ワ紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
                     Retention r = getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType());
                     r.setCarNo(request.getData().getParamValues().getPlateNos());
                     r.setAccessType(request.getData().getParamValues().getAccessType());
@@ -593,17 +593,19 @@
                     r.setDeviceIndex(request.getData().getParamValues().getSrcIndex());
                     retentionList.add(r);
                     inoutDayCount.setInVisitorNum(Constants.formatIntegerNum(inoutDayCount.getInVisitorNum())+1);
+                    record.setInOrOut(Constants.ZERO);//杩涘叆鍥尯
                 }
                 if(request.getData()!=null&&request.getData().getParamValues()!=null &&
                         !StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
                     inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
                     record.setInOrOut(Constants.ONE);
                 }
-                if(StringUtils.isNotBlank(record.getCarCode())
-                        &&request.getData().getParamValues()!=null
+                if( request.getData().getParamValues()!=null
+                        && StringUtils.isNotBlank(request.getData().getParamValues().getPlateNos())
                         && StringUtils.isNotBlank(request.getData().getParamValues().getParkIndex())){
                     //濡傛灉鏄仠杞﹀満浜嬩欢锛岃褰曡溅杈嗙被鍨�
                     Category category = null;
+                    record.setCarCode(request.getData().getParamValues().getPlateNos());
                     if(StringUtils.isNotBlank(record.getCarCode())){
                         category = categoryMapper.selectJoinOne(Category.class, new MPJLambdaWrapper<Category>()
                                 .selectAll(Category.class)
@@ -620,7 +622,6 @@
                     }
                     record.setCarBizType(Constants.RetentionCarType.fkCar);
                     record.setCategoryId(category.getId());
-                    record.setCarCode(request.getData().getVisitorInformationList().get(0).getPlateNo());
                     record.setDeviceName(request.getData().getParamValues().getGateName());
                     record.setCategoryName(category.getName());
                     record.setCategoryParentId(category.getParentId());

--
Gitblit v1.9.3