From f49ead8710e093ee1d2d3ed50870497f07dee9fa Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 09 五月 2025 15:04:38 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 337f753..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
@@ -280,9 +280,9 @@
inoutDayCount.setOutOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutOtherMemberNum())+1);//鐩稿叧鏂瑰嚭鍦轰汉娆�
}
}
- }
- if(record.getMemberType()!=null){
- inoutRecordList.add(record);
+ if(record.getMemberType()!=null){
+ inoutRecordList.add(record);
+ }
}
}
}
@@ -569,7 +569,7 @@
record.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
record.setTimeInfo(Utils.Date.getStart(record.getCreateDate()));
record.setType(Constants.ONE);//浜哄憳
- record.setMemberType(Constants.ZERO);
+ record.setMemberType(Constants.RetentionMemberType.fk);
record.setIsdeleted(Constants.ZERO);
record.setMemberName(visits.getName());
record.setObjId(visits.getId());
@@ -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());
@@ -890,9 +891,11 @@
.in(Retention::getCarNo,delRetentionList));
}
if(delMemberRetentionList.size()>0){
- //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳鍜岃瀹級
+ //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳銆佺浉鍏虫柟鍜岃瀹級
retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
- .in(Retention::getType,Constants.memberType.internal,Constants.memberType.visitor)
+ .in(Retention::getType,Constants.RetentionMemberType.internalMember
+ ,Constants.RetentionMemberType.relMember
+ ,Constants.RetentionMemberType.fk)
.in(Retention::getMemberId,delMemberRetentionList));
}
if(retentionList.size()>0){
--
Gitblit v1.9.3