From a30647d4ab84bdffa96cc94a845005c7fa8b8e25 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 11 六月 2025 11:42:11 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 a52f476..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);
@@ -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()+"");
@@ -1120,13 +1120,13 @@
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){
+ 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());
@@ -1403,6 +1403,7 @@
retention.setDeviceName(request.getSrcName());
retention.setDeviceIndex(request.getSrcIndex());
retention.setCarNo(inoutRecord.getCarCode());
+ retention.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName());
retention.setRemark("璺熼殢杞﹁締銆�"+inoutRecord.getCarCode()+"銆戝叆鍥尯");
return retention;
}
@@ -1419,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