From b96cc19f216ccd7451a5d2758055a4f174587ba9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 16:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 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 fc478ce..3a0dbe1 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
@@ -1023,7 +1023,7 @@
//濡傛灉鏄叆鍘傛斁琛�
delRetentionList.add(event.getPlateNos());
delMemberRetentionList.add(event.getMemberId());
- retentionList.add(getRetentionModelByParkRequest(request,event));//鍦ㄥ巶杞﹁締淇℃伅
+ retentionList.add(getRetentionModelByParkRequest(request,event,carrecord));//鍦ㄥ巶杞﹁締淇℃伅
inoutDayCount.setInCarNum(Constants.formatIntegerNum(inoutDayCount.getInCarNum())+1);
carrecord.setInOrOut(Constants.ZERO);
}else if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_OUT.getKey()){
@@ -1034,7 +1034,7 @@
carrecord.setInOrOut(Constants.ZERO);
}
//杞﹁締杩涘叆璁板綍瀵瑰簲涓氬姟绫诲瀷
- if(event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other)){
+ if(isCarInOrOutEvent(request) &&( event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other))){
//濡傛灉鏈瘑鍒埌杞﹀瀷锛屼笉鏄浐瀹氳溅 涔熶笉鏄揣杩愯溅杈嗭紝鍒欐鏌ユ槸鍚︽槸璁垮杞�
visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
.eq(Visits::getCarNos,event.getPlateNos())
@@ -1089,12 +1089,20 @@
}
}
}
- if(carrecord.getInOrOut()!=null && event.getCarType() !=null && !event.getCarType().equals(Constants.RetentionCarType.fkCar)){
+ if(isCarInOrOutEvent(request) && event.getCarType() !=null && !event.getCarType().equals(Constants.RetentionCarType.fkCar)){
//褰曞叆闈炶瀹㈢被鍨嬭溅杈嗚繘鍑鸿褰�
dealNotFkCarMemberBiz(event,request,carrecord,retentionList,inoutDayCount,inoutRecordList);
}
}
return event;
+ }
+
+ private boolean isCarInOrOutEvent(EventParkInfoRequest request) {
+ if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey() ||
+ Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_OUT.getKey()){
+ return true;
+ }
+ return false;
}
private void dealNotFkCarMemberBiz( CarEvent event ,EventParkInfoRequest request, InoutRecord carrecord,List<Retention> retentionList,InoutDayCount inoutDayCount,List<InoutRecord> inoutRecordList) {
@@ -1322,7 +1330,7 @@
retention.setRemark("璺熼殢杞﹁締鍏ュ洯鍖�");
return retention;
}
- private Retention getRetentionModelByParkRequest(EventParkInfoRequest request,CarEvent event ) {
+ private Retention getRetentionModelByParkRequest(EventParkInfoRequest request,CarEvent event ,InoutRecord carrecord ) {
Retention retention = new Retention();
retention.setIsdeleted(Constants.ZERO);
retention.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
@@ -1331,6 +1339,10 @@
retention.setMemberId(event.getMemberId());
retention.setCarType(event.getCarType());
retention.setCompanyId(event.getCompanyId());
+ retention.setCategoryId(carrecord.getCategoryId());
+ retention.setCategoryName(carrecord.getCategoryName());
+ retention.setCategoryParentId(carrecord.getCategoryParentId());
+ retention.setCategoryParentName(carrecord.getCategoryParentName());
// retention.setDeviceName(request.getSrcName());
// retention.setDeviceIndex(request.getSrcIndex());
--
Gitblit v1.9.3