From 3748591ecd04c47e550049bbc09ad5959210aa29 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 四月 2025 18:23:30 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 59 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 ec27f56..63e3e04 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
@@ -76,6 +76,8 @@
@Autowired
private RetentionMapper retentionMapper;
@Autowired
+ private InoutRecordMapper inoutRecordMapper;
+ @Autowired
private PlatformMapper platformMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -121,6 +123,7 @@
List<DeviceEvent> list = new ArrayList<>();
List<Integer> delRetentionLis = new ArrayList<>();
List<Retention> retentionList = new ArrayList<>();
+ List<InoutRecord> inoutRecordList = new ArrayList<>();
InoutDayCount inoutDayCount = new InoutDayCount();
for(EventAcsInfoRequest request : events){
EventDeviceDataRequest model = request.getData();
@@ -128,7 +131,7 @@
continue;
}
//鏍规嵁鎺ㄩ�佷汉鍛樼紪鐮侊紝澶勭悊鍦ㄥ満銆佺鍦轰汉鍛樻暟鎹褰�
- dealMemberDataByRequest(request,delRetentionLis,retentionList,inoutDayCount);
+ dealMemberDataByRequest(request,delRetentionLis,retentionList,inoutDayCount,inoutRecordList);
//灏佽闂ㄧ浜嬩欢淇℃伅琛ㄥ璞�
list.add(getDeviceEventModelByRequest(request));
}
@@ -145,6 +148,10 @@
if(retentionList.size()>0){
//鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
retentionMapper.insert(retentionList);
+ }
+ if(inoutRecordList.size()>0){
+ //鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
+ inoutRecordMapper.insert(inoutRecordList);
}
dealInoutDayCountBiz(inoutDayCount);
log.info("銆愭捣搴烽棬绂佷簨浠舵帹閫併��========鎴愬姛=======");
@@ -199,12 +206,17 @@
* @param delRetentionLis
* @param retentionList
*/
- private void dealMemberDataByRequest(EventAcsInfoRequest request, List<Integer> delRetentionLis, List<Retention> retentionList,InoutDayCount inoutDayCount) {
+ private void dealMemberDataByRequest(EventAcsInfoRequest request
+ , List<Integer> delRetentionLis
+ , List<Retention> retentionList
+ ,InoutDayCount inoutDayCount
+ ,List<InoutRecord> inoutRecordList) {
//娴峰悍浜哄憳缂栫爜
String userNo = request.getData().getExtEventPersonNo();
if(StringUtils.isNotBlank(userNo)){
Member member = memberMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
.selectAll(Member.class)
+ .selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath)
.selectAs(Company::getType,Member::getCompanyType)
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(Member::getHkId,userNo)
@@ -215,23 +227,41 @@
.eq(Device::getDoorId,request.getSrcIndex())
.eq(Device::getIsdeleted,Constants.ZERO)
.last("limit 1" ));
+ InoutRecord record = new InoutRecord();
+ record.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
+ record.setType(Constants.ONE);//浜哄憳
+ record.setMemberType(Constants.ZERO);//榛樿涓烘湭鐭ヤ汉鍛橈紙璁垮锛�
+ record.setIsdeleted(Constants.ZERO);
+ record.setInOrOut(Constants.ZERO);
+ record.setHkEventId(request.getEventId());
+ record.setHkId(userNo);
if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
if(Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE){
//濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);//鍏ュ満浜烘
}else{
+ //濡傛灉鏄嚭闂�
+ record.setInOrOut(Constants.ONE);
inoutDayCount.setOutMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutMemberNum())+1);//绂诲満浜烘
}
}
if(member !=null){
+ record.setMemberName(member.getName());
+ record.setObjId(member.getId());
+ record.setObjType(Constants.ONE);
+ record.setMemberPhone(member.getPhone());
+ record.setCompanyId(member.getCompanyId());
+ record.setCompanyName(member.getCompanyNamePath());
if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
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.ONE);
inoutDayCount.setInSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getInSelfMemberNum())+1);//鍐呴儴浜哄憳鍏ュ満浜烘
}else{
+ record.setMemberType(Constants.TWO);
inoutDayCount.setInOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getInOtherMemberNum())+1);//鐩稿叧鏂瑰叆鍦轰汉娆�
}
}else{
@@ -243,6 +273,7 @@
}
}
}
+ inoutRecordList.add(record);
}
}
@@ -428,6 +459,7 @@
List<VisitEvent> list = new ArrayList<>();
List<Integer> delRetentionLis = new ArrayList<>();
List<Retention> retentionList = new ArrayList<>();
+ List<InoutRecord> inoutRecordList = new ArrayList<>();
InoutDayCount inoutDayCount = new InoutDayCount();
for(EventVisitIccmInfoRequest request : events){
if(request.getData() ==null || request.getData().getVisitorInvoices() ==null){
@@ -437,7 +469,7 @@
continue;
}
//娴峰悍璁垮璁板綍缂栫爜
- dealVisitDataByRequstIccm(request,delRetentionLis,retentionList,inoutDayCount);
+ dealVisitDataByRequstIccm(request,delRetentionLis,retentionList,inoutDayCount,inoutRecordList);
list.add(getVisitEventModelByRequestIccm(request,request.getData().getVisitorInformationList().get(0)));
}
if(list.size()>0){
@@ -454,6 +486,10 @@
//鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
retentionMapper.insert(retentionList);
}
+ if(inoutRecordList.size()>0){
+ //鎵归噺鎻掑叆浜哄憳鍑哄叆璁板綍
+ inoutRecordMapper.insert(inoutRecordList);
+ }
dealInoutDayCountBiz(inoutDayCount);
log.info("銆愭捣搴疯瀹簨浠舵帹閫併��========鎴愬姛=======");
}catch (Exception e){
@@ -466,7 +502,11 @@
/**
* 鏍规嵁璁垮鎺ㄩ�佽瀹㈣褰曠紪鐮侊紝澶勭悊璁垮璁板綍銆佸湪鍦轰汉鍛樼瓑淇℃伅
*/
- private void dealVisitDataByRequstIccm(EventVisitIccmInfoRequest request, List<Integer> delRetentionLis, List<Retention> retentionList, InoutDayCount inoutDayCount) {
+ private void dealVisitDataByRequstIccm(EventVisitIccmInfoRequest request
+ , List<Integer> delRetentionLis
+ , List<Retention> retentionList
+ , InoutDayCount inoutDayCount
+ ,List<InoutRecord> inoutRecordList) {
EventVisitIccmDataRequest model = request.getData();
EventVisitIccmInvoiceParamRequest data = request.getData().getVisitorInvoices();
MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
@@ -512,6 +552,19 @@
}else{
//濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垏鏄瀹㈤�氳锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
delRetentionLis.add(visits.getMemberId());
+ InoutRecord record = new InoutRecord();
+ record.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
+ record.setType(Constants.ONE);//浜哄憳
+ record.setMemberType(Constants.ZERO);
+ record.setIsdeleted(Constants.ZERO);
+ record.setMemberName(visits.getName());
+ record.setObjId(visits.getId());
+ record.setObjType(Constants.TWO);
+ record.setMemberPhone(visits.getPhone());
+ record.setCompanyName(visits.getCompanyName());
+ record.setInOrOut(Constants.ZERO);
+ record.setHkEventId(request.getEventId());
+ record.setHkId(visits.getHkId());
//濡傛灉鏄瀹㈤�氳
if(request.getData()!=null&&request.getData().getParamValues()!=null &&
StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
@@ -527,7 +580,9 @@
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);
}
+ inoutRecordList.add(record);
}
updateVistis.setEditDate(new Date());
//鏇存柊璁垮鏉ヨ鎴栬�呯绂绘椂闂翠俊鎭�
--
Gitblit v1.9.3