From 9b74b477139659d69fcf321d160724aa1cd90ce0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 07 五月 2025 18:49:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 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 82cee9c..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
@@ -284,8 +284,10 @@
}
}
}
+ if(record.getMemberType()!=null){
+ inoutRecordList.add(record);
+ }
}
- inoutRecordList.add(record);
}
}
@@ -942,7 +944,7 @@
carrecord.setCategoryId(carModel.getCateId());
carrecord.setCategoryName(carModel.getCateName());
carrecord.setCategoryParentId(carModel.getCatePId());
- carrecord.setCategoryParentName(carModel.getCatePName());
+ carrecord.setCategoryParentName(StringUtils.defaultString(carModel.getCatePName(),carModel.getCateName()));
carrecord.setType( Constants.RetentionMemberType.car);//鍙槸杞﹁締鐨勮褰�
if(carModel.getMemberId()!=null){
if(Constants.equalsInteger(carModel.getCompanyType(),Constants.ONE)){
@@ -1021,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()){
@@ -1032,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())
@@ -1050,8 +1052,8 @@
carrecord.setCarBizType(Constants.RetentionCarType.fkCar);
Category category =findCategoryByBizType(Constants.RetentionCarType.fkCar,"璁垮杞﹁締","璁垮杞﹁締",categoryList);
carrecord.setCategoryId(category.getId());
- carrecord.setCategoryName(category.getName());
- carrecord.setCategoryParentName(category.getParentName());
+ carrecord.setCategoryName(StringUtils.defaultString(category.getName(),"璁垮杞﹁締"));
+ carrecord.setCategoryParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
carrecord.setCategoryParentId(category.getParentId());
for(Visits v :visitsList){
delMemberRetentionList.add(event.getMemberId());
@@ -1087,12 +1089,20 @@
}
}
}
- if(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) {
@@ -1130,6 +1140,7 @@
if(carrecord.getInOrOut() !=null) {//濡傛灉鏄嚭鍏ヨ褰�
if(Constants.equalsInteger(carrecord.getCarBizType(),Constants.RetentionCarType.other)){
carrecord.setCategoryName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
+ carrecord.setCategoryParentName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
}
inoutRecordList.add(carrecord);//褰曞叆杞﹁締浠ュ強鎼哄甫浜哄憳鐨勫叆鍥槑缁嗚褰曪紙闈炶瀹級
}
@@ -1139,6 +1150,9 @@
if(categoryList!=null){
for(Category category :categoryList){
if(Constants.equalsInteger(carType,category.getBizType())){
+ if(StringUtils.isBlank(category.getParentName() )){
+ category.setParentName(category.getName());
+ }
return category;
}
}
@@ -1316,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()));
@@ -1325,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