From a383a31892e2d3c43771f0d96eacba819411dc9b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 19:26:02 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 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 d472ed8..b8f27dc 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
@@ -576,6 +576,7 @@
record.setMemberType(Constants.ZERO);
record.setIsdeleted(Constants.ZERO);
record.setMemberName(visits.getName());
+ record.setCarCode(request.getData().getVisitorInformationList().get(0).getPlateNo());
record.setObjId(visits.getId());
record.setMemberId(visits.getMemberId());
record.setObjType(Constants.TWO);
@@ -584,6 +585,21 @@
record.setInOrOut(Constants.ZERO);
record.setHkEventId(request.getEventId());
record.setHkId(visits.getHkId());
+ Category category = null;
+ if(StringUtils.isNotBlank(record.getCarCode())){
+ category = categoryMapper.selectJoinOne(Category.class, new MPJLambdaWrapper<Category>()
+ .selectAll(Category.class)
+ .select("t4.name",Category::getParentName)
+ .leftJoin("category t4 on t.parent_id=t4.id")
+ .eq(Category::getIsdeleted,Constants.ZERO)
+ .eq(Category::getBizType,Constants.RetentionCarType.fkCar)
+ .last("limit 1"));
+ if(category ==null){
+ category = new Category();
+ category.setName("璁垮杞﹁締");
+ }
+ category.setParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
+ }
//濡傛灉鏄瀹㈤�氳
if(request.getData()!=null&&request.getData().getParamValues()!=null &&
StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
@@ -600,6 +616,20 @@
!StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
record.setInOrOut(Constants.ONE);
+ }
+ if(record.getCarCode()!=null){
+ record.setCarBizType(Constants.RetentionCarType.fkCar);
+ record.setCategoryId(category.getId());
+ record.setCategoryName(category.getName());
+ record.setCategoryParentId(category.getParentId());
+ record.setCategoryParentName(category.getParentName());
+ record.setRemark("璁垮璺熼殢杞﹁締绂诲洯骞惰嚜鍔ㄧ绂�");
+ try {
+ //璁垮鐢宠鑷姩绛剧
+ visitsService.visitLevelForCarOut(visits);
+ }catch (Exception e){
+ log.error("璁垮璺熼殢杞﹁締鍑哄洯鑷姩绛剧澶辫触锛�==========="+e.getMessage());
+ }
}
inoutRecordList.add(record);
}
@@ -1038,7 +1068,7 @@
carrecord.setInOrOut(Constants.ONE);
}
//杞﹁締杩涘叆璁板綍瀵瑰簲涓氬姟绫诲瀷
- if(isCarInOrOutEvent(request) &&( event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other))){
+ if(1==2 && isCarInOrOutEvent(request) &&( event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other))){
//濡傛灉鏈瘑鍒埌杞﹀瀷锛屼笉鏄浐瀹氳溅 涔熶笉鏄揣杩愯溅杈嗭紝鍒欐鏌ユ槸鍚︽槸璁垮杞�
visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
.eq(Visits::getCarNos,event.getPlateNos())
--
Gitblit v1.9.3