From f5ab83dfad01c87828232af8cd18c676e69fd917 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 21 五月 2025 09:14:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 102 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 69 insertions(+), 33 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..617c8fd 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
@@ -146,7 +146,7 @@
if(delRetentionLis.size()>0){
//鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳锛�
retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
- .eq(Retention::getType,Constants.memberType.internal)
+// .eq(Retention::getType,Constants.memberType.internal)
.in(Retention::getMemberId,delRetentionLis));
}
if(retentionList.size()>0){
@@ -263,7 +263,6 @@
delRetentionLis.add(member.getId());
if( Constants.formatIntegerNum(request.getData().getExtEventInOut()) == Constants.ONE){
//濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
- retentionList.add(getRetentionModelByRequest(member,request));
if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
record.setMemberType(Constants.RetentionMemberType.internalMember);
inoutDayCount.setInSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getInSelfMemberNum())+1);//鍐呴儴浜哄憳鍏ュ満浜烘
@@ -271,6 +270,7 @@
record.setMemberType(Constants.RetentionMemberType.relMember);
inoutDayCount.setInOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getInOtherMemberNum())+1);//鐩稿叧鏂瑰叆鍦轰汉娆�
}
+ retentionList.add(getRetentionModelByRequest(member,request,record.getMemberType()));
}else{
if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
record.setMemberType(Constants.RetentionMemberType.internalMember);
@@ -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);
+ }
}
}
}
@@ -372,7 +372,7 @@
* @param request
* @return
*/
- private Retention getRetentionModelByRequest(Member member, EventAcsInfoRequest request) {
+ private Retention getRetentionModelByRequest(Member member, EventAcsInfoRequest request,int memberType) {
Retention retention = new Retention();
retention.setIsdeleted(Constants.ZERO);
retention.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
@@ -382,7 +382,7 @@
retention.setIdcardDecode(member.getIdcardDecode());
retention.setName(member.getName());
retention.setBirthday(member.getBirthday());
- retention.setType(member.getType());
+ retention.setType(memberType);
retention.setCompanyId(member.getCompanyId());
retention.setCompanyName(member.getCompanyName());
retention.setEventCode(request.getData().getExtEventCode()+"");
@@ -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());
@@ -583,9 +583,10 @@
record.setDeviceName((request.getData()!=null &&request.getData().getParamValues()!=null)?
request.getData().getParamValues().getSrcName():request.getSrcName());
//濡傛灉鏄瀹㈤�氳
- if(request.getData()!=null&&request.getData().getParamValues()!=null &&
- StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
- //濡傛灉鏄瀹㈢櫥璁帮紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
+ 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 +594,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);
+ 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 +623,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());
@@ -869,7 +871,7 @@
List<CarEvent> list = new ArrayList<>();
List<Retention> retentionList = new ArrayList<>();
List<String> delRetentionList = new ArrayList<>();
- List<Integer> delMemberRetentionList = new ArrayList<>();
+ List<Retention> delMemberRetentionList = new ArrayList<>();
InoutDayCount inoutDayCount = new InoutDayCount();
List<InoutRecord> inoutRecordList = new ArrayList<>();
for(EventParkInfoRequest request : events){
@@ -884,16 +886,34 @@
carEventMapper.insert(list);
}
if(delRetentionList.size()>0){
- //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳锛�
+ //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満杞﹁締浜哄憳(鍐呴儴浜哄憳锛�
retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
.eq(Retention::getType,Constants.THREE)
.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::getMemberId,delMemberRetentionList));
+ //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳銆佺浉鍏虫柟鍜岃瀹級
+ List<Integer> memberList = new ArrayList<>();
+ for(Retention m :delMemberRetentionList){
+ if(m.getMemberId()!=null){
+ //璺熼殢杞﹁締鍏ュ満鐨刴ember瀛樺湪鐨勬暟鎹珛鍦�
+ retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
+ .in(Retention::getType,Constants.RetentionMemberType.internalMember
+ ,Constants.RetentionMemberType.relMember
+ ,Constants.RetentionMemberType.fk
+ ,Constants.RetentionMemberType.driver)
+ .eq(Retention::getMemberId,m.getMemberId()));
+ }else if(m.getCarNo()!=null){
+ //璺熼殢杞﹁締鍏ュ満鐨勭敤鎴蜂俊鎭�
+ retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
+ .in(Retention::getType,Constants.RetentionMemberType.internalMember
+ ,Constants.RetentionMemberType.relMember
+ ,Constants.RetentionMemberType.fk
+ ,Constants.RetentionMemberType.driver)
+ .eq(Retention::getCarNo,m.getCarNo()));
+ }
+ }
+
}
if(retentionList.size()>0){
//鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
@@ -921,7 +941,7 @@
private CarEvent getParkEventModelByRequest(EventParkInfoRequest request
, List<String> delRetentionList
, List<Retention> retentionList
- , List<Integer> delMemberRetentionList
+ , List<Retention> delMemberRetentionList
, InoutDayCount inoutDayCount
, List<InoutRecord> inoutRecordList) {
CarEvent event =initCarEventModelByRequest(request);
@@ -1064,14 +1084,22 @@
if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
//濡傛灉鏄叆鍘傛斁琛�
delRetentionList.add(event.getPlateNos());
- delMemberRetentionList.add(event.getMemberId());
+ Retention dm = new Retention();
+ dm.setMemberId(event.getMemberId());
+ dm.setPhone(carrecord.getMemberPhone());
+ dm.setCarNo(event.getPlateNos());
+ delMemberRetentionList.add(dm);
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()){
//濡傛灉鏄嚭鍦烘斁琛�
delRetentionList.add(event.getPlateNos());
- delMemberRetentionList.add(event.getMemberId());
+ Retention dm = new Retention();
+ dm.setMemberId(event.getMemberId());
+ dm.setPhone(carrecord.getMemberPhone());
+ dm.setCarNo(event.getPlateNos());
+ delMemberRetentionList.add(dm);
inoutDayCount.setOutCarNum(Constants.formatIntegerNum(inoutDayCount.getOutCarNum())+1);
carrecord.setInOrOut(Constants.ONE);
}
@@ -1092,14 +1120,19 @@
event.setCarType(Constants.RetentionCarType.fkCar);
int index =0;
carrecord.setCarBizType(Constants.RetentionCarType.fkCar);
- if(1==2){
- Category category =findCategoryByBizType(Constants.RetentionCarType.fkCar,"璁垮杞﹁締","璁垮杞﹁締",categoryList);
- carrecord.setCategoryId(category.getId());
- carrecord.setCategoryName(StringUtils.defaultString(category.getName(),"璁垮杞﹁締"));
- carrecord.setCategoryParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
- carrecord.setCategoryParentId(category.getParentId());
- for(Visits v :visitsList){
- delMemberRetentionList.add(event.getMemberId());
+ Category category =findCategoryByBizType(Constants.RetentionCarType.fkCar,"璁垮杞﹁締","璁垮杞﹁締",categoryList);
+ carrecord.setCategoryId(category.getId());
+ carrecord.setCategoryName(StringUtils.defaultString(category.getName(),"璁垮杞﹁締"));
+ carrecord.setCategoryParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
+ carrecord.setCategoryParentId(category.getParentId());
+ for(Visits v :visitsList){
+ if(v.getEndtime()!=null && v.getEndtime().getTime() < System.currentTimeMillis()){
+ Retention dm = new Retention();
+ dm.setMemberId(event.getMemberId());
+ dm.setPhone(carrecord.getMemberPhone());
+ dm.setCarNo(event.getPlateNos());
+ delMemberRetentionList.add(dm);
+// delMemberRetentionList.add(event.getMemberId());
InoutRecord copyObj = new InoutRecord();
BeanUtils.copyProperties(carrecord,copyObj);
copyObj.setMemberId(v.getMemberId());
@@ -1369,7 +1402,9 @@
retention.setMemberId(inoutRecord.getMemberId());
retention.setDeviceName(request.getSrcName());
retention.setDeviceIndex(request.getSrcIndex());
- retention.setRemark("璺熼殢杞﹁締鍏ュ洯鍖�");
+ retention.setCarNo(inoutRecord.getCarCode());
+ retention.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName());
+ retention.setRemark("璺熼殢杞﹁締銆�"+inoutRecord.getCarCode()+"銆戝叆鍥尯");
return retention;
}
private Retention getRetentionModelByParkRequest(EventParkInfoRequest request,CarEvent event ,InoutRecord carrecord ) {
@@ -1385,6 +1420,7 @@
retention.setCategoryName(carrecord.getCategoryName());
retention.setCategoryParentId(carrecord.getCategoryParentId());
retention.setCategoryParentName(carrecord.getCategoryParentName());
+ retention.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName());
// retention.setDeviceName(request.getSrcName());
// retention.setDeviceIndex(request.getSrcIndex());
--
Gitblit v1.9.3