From c3aaf28f7316cce12eec007a9f85a96cbcddeec2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 10:34:20 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 148 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 122 insertions(+), 26 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 64be9af..82cee9c 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
@@ -25,6 +25,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO;
+import com.doumee.service.business.CategoryService;
import com.doumee.service.business.VisitsService;
import com.doumee.service.business.impl.PlatformWarnEventServiceImpl;
import com.doumee.service.business.third.TmsService;
@@ -72,6 +73,8 @@
private DataSyncConfig dataSyncConfig;
@Autowired
private CarEventMapper carEventMapper;
+ @Autowired
+ private CategoryMapper categoryMapper;
@Autowired
private VisitEventMapper visitEventMapper;
@Autowired
@@ -236,14 +239,14 @@
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.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){
//濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
+ record.setInOrOut(Constants.ZERO);
inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);//鍏ュ満浜烘
}else{
//濡傛灉鏄嚭闂�
@@ -252,10 +255,11 @@
}
}
if(member !=null){
+ record.setMemberId(member.getId());
record.setMemberName(member.getName());
+ record.setMemberPhone(member.getPhone());
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)){
@@ -264,16 +268,18 @@
//濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
retentionList.add(getRetentionModelByRequest(member,request));
if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
- record.setMemberType(Constants.ONE);
+ record.setMemberType(Constants.RetentionMemberType.internalMember);
inoutDayCount.setInSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getInSelfMemberNum())+1);//鍐呴儴浜哄憳鍏ュ満浜烘
}else{
- record.setMemberType(Constants.TWO);
+ record.setMemberType(Constants.RetentionMemberType.relMember);
inoutDayCount.setInOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getInOtherMemberNum())+1);//鐩稿叧鏂瑰叆鍦轰汉娆�
}
}else{
if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
+ record.setMemberType(Constants.RetentionMemberType.internalMember);
inoutDayCount.setOutSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutSelfMemberNum())+1);//鍐呴儴浜哄憳鍑哄満浜烘
}else{
+ record.setMemberType(Constants.RetentionMemberType.relMember);
inoutDayCount.setOutOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutOtherMemberNum())+1);//鐩稿叧鏂瑰嚭鍦轰汉娆�
}
}
@@ -566,6 +572,7 @@
record.setIsdeleted(Constants.ZERO);
record.setMemberName(visits.getName());
record.setObjId(visits.getId());
+ record.setMemberId(visits.getMemberId());
record.setObjType(Constants.TWO);
record.setMemberPhone(visits.getPhone());
record.setCompanyName(visits.getCompanyName());
@@ -877,8 +884,14 @@
CarEvent event =initCarEventModelByRequest(request);
if(StringUtils.isNotBlank(event.getPlateNos())){
//鏍囪杞﹁締杩涘嚭璁板綍
+ List<Category> categoryList = categoryMapper.selectJoinList(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)
+ .isNotNull(Category::getBizType));//鏌ヨ鎵�鏈夊甫鏈変笟鍔＄被鍨嬬殑杞﹁締鍒嗙被缂栫爜
List<Visits> visitsList = null;
- InoutRecord carrecord = new InoutRecord();
+ InoutRecord carrecord = new InoutRecord();
carrecord.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
carrecord.setTimeInfo(Utils.Date.getStart(carrecord.getCreateDate()));
carrecord.setType(Constants.ZERO);//杞﹁締
@@ -898,9 +911,13 @@
.selectAs(Member::getPhone,Cars::getMemberPhone)
.selectAs(Company::getCompanyNamePath,Cars::getCompanyName)
.selectAs(Category::getBizType,Cars::getBizType)
+ .selectAs(Category::getName,Cars::getCateName)
+ .select("t4.id",Cars::getCatePId)
+ .select("t4.name",Cars::getCatePName)
.leftJoin(Company.class,Company::getId,Cars::getGroupId)
- .leftJoin(Category.class,Category::getId,Cars::getCateId)
.leftJoin(Member.class,Member::getId,Cars::getMemberId)
+ .leftJoin(Category.class,Category::getId,Cars::getCateId)
+ .leftJoin("category t4 on t3.parent_id=t4.id")
.eq(Cars::getCode,event.getPlateNos())
.eq(Cars::getIsdeleted,Constants.ZERO)
.last(" limit 1"));
@@ -914,6 +931,7 @@
carrecord.setMemberName(carModel.getMemberName());//鍙告満
carrecord.setMemberPhone(carModel.getMemberPhone());//鍙告満
carrecord.setObjId(carModel.getId());
+ carrecord.setMemberId(carModel.getMemberId());
carrecord.setObjType(Constants.ZERO);
carrecord.setFaceImg(carModel.getFaceImg());
carrecord.setIdcardDecode(carModel.getIdcardDecode());
@@ -921,7 +939,11 @@
carrecord.setMemberCode(carModel.getMemberCode());
carrecord.setCompanyId(carModel.getGroupId());
carrecord.setCompanyName(carModel.getCompanyName());
- carrecord.setMemberType( Constants.RetentionMemberType.car);//鍙槸杞﹁締鐨勮褰�
+ carrecord.setCategoryId(carModel.getCateId());
+ carrecord.setCategoryName(carModel.getCateName());
+ carrecord.setCategoryParentId(carModel.getCatePId());
+ carrecord.setCategoryParentName(carModel.getCatePName());
+ carrecord.setType( Constants.RetentionMemberType.car);//鍙槸杞﹁締鐨勮褰�
if(carModel.getMemberId()!=null){
if(Constants.equalsInteger(carModel.getCompanyType(),Constants.ONE)){
//鍐呴儴缁勭粐
@@ -959,24 +981,38 @@
carrecord.setObjType(Constants.FOUR);
carrecord.setCompanyId(carTypeJob.getCompanyId());
carrecord.setCompanyName(carTypeJob.getCompanyNamePath());
- carrecord.setMemberType(Constants.RetentionMemberType.car);
+ carrecord.setType(Constants.RetentionMemberType.car);
if(carModel.getMemberPhone()!=null || StringUtils.isNotBlank(carModel.getMemberName())){
//璐ц繍鍙告満(濡傛灉鍙告満鎵嬫満鍙锋垨鑰呭鍚嶄笉涓虹┖锛�
carrecord.setMemberType(Constants.RetentionMemberType.driver);
}
+ Category category = null;
+ String tempName = "";
+ String tempPName = "";
//濡傛灉闈炲浐瀹氳溅杈嗭紝鍒欐煡璇㈡槸鍚﹁揣杩愯溅杈� 浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣
if(Constants.equalsInteger(carTypeJob.getOrigin(),Constants.ONE)){
//濡傛灉鏄帹閫佺殑wms闈炶嚜鏈夎溅
event.setCarType(Constants.RetentionCarType.wxysCar);//澶栧崗杞�
+ tempName = "澶栧崗杩愯緭杞﹁締";
+ tempPName = "璐ц繍杞﹁締";
}else if(Constants.equalsInteger(carTypeJob.getType(),Constants.FOUR)){
if(Constants.equalsInteger(carTypeJob.getGroupType(),Constants.TWO)){
///瀹夋嘲鐨勯绾﹀叆鍥溅杈嗭細璐ц繍杞﹁締-鍔犲伐鐑熷嵏璐ц溅杈�
+ tempName = "鍔犲伐鐑熷嵏璐ц溅杈�";
+ tempPName = "璐ц繍杞﹁締";
event.setCarType(Constants.RetentionCarType.jgyxhCar);//鍔犲伐鐑熷嵏璐ц溅杈�
}else if(Constants.equalsInteger(carTypeJob.getGroupType(),Constants.TWO)){
//甯傚叕鍙哥殑棰勭害鍏ュ洯杞﹁締锛氳揣杩愯溅杈�-甯傚叕鍙稿嵏璐ц溅杈�
+ tempName = "甯傚叕鍙稿嵏璐ц溅杈�";
+ tempPName = "璐ц繍杞﹁締";
event.setCarType(Constants.RetentionCarType.sgsxhCar);//甯傚叕鍙稿嵏璐ц溅杈�
}
}
+ category =findCategoryByBizType(event.getCarType(),tempName,tempPName,categoryList);
+ carrecord.setCategoryId(category.getId());
+ carrecord.setCategoryName(category.getName());
+ carrecord.setCategoryParentName(category.getParentName());
+ carrecord.setCategoryParentId(category.getParentId());
}
}
//澶勭悊鑷湁杞﹁嚜鍔ㄧ鍒颁笟鍔�
@@ -996,8 +1032,8 @@
carrecord.setInOrOut(Constants.ZERO);
}
//杞﹁締杩涘叆璁板綍瀵瑰簲涓氬姟绫诲瀷
- if(event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other)){//濡傛灉涓鸿瘑鍒埌杞﹀瀷
- //濡傛灉涓嶆槸鍥哄畾杞� 涔熶笉鏄揣杩愯溅杈嗭紝鍒欐鏌ユ槸鍚︽槸璁垮杞�
+ if(event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other)){
+ //濡傛灉鏈瘑鍒埌杞﹀瀷锛屼笉鏄浐瀹氳溅 涔熶笉鏄揣杩愯溅杈嗭紝鍒欐鏌ユ槸鍚︽槸璁垮杞�
visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
.eq(Visits::getCarNos,event.getPlateNos())
.eq(Visits::getIsdeleted,Constants.ZERO )
@@ -1011,6 +1047,12 @@
event.setMemberId(visitsList.get(0).getMemberId());
event.setCarType(Constants.RetentionCarType.fkCar);
int index =0;
+ carrecord.setCarBizType(Constants.RetentionCarType.fkCar);
+ Category category =findCategoryByBizType(Constants.RetentionCarType.fkCar,"璁垮杞﹁締","璁垮杞﹁締",categoryList);
+ carrecord.setCategoryId(category.getId());
+ carrecord.setCategoryName(category.getName());
+ carrecord.setCategoryParentName(category.getParentName());
+ carrecord.setCategoryParentId(category.getParentId());
for(Visits v :visitsList){
delMemberRetentionList.add(event.getMemberId());
InoutRecord copyObj = new InoutRecord();
@@ -1019,37 +1061,92 @@
copyObj.setMemberName(v.getName());
copyObj.setMemberPhone(v.getPhone());
copyObj.setCompanyName(v.getCompanyName());
- copyObj.setCarBizType(Constants.RetentionCarType.fkCar);
- copyObj.setMemberType(Constants.ZERO);
+ copyObj.setType(Constants.ONE);
copyObj.setRemark(carrecord.getCarCode());
copyObj.setCarCode(index>=0?null:carrecord.getCarCode());
copyObj.setMemberType(Constants.RetentionMemberType.fk);
inoutRecordList.add(copyObj);
index++;
if(Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)){
- //濡傛灉鏄溅杈嗗嚭鍥尯锛岃瀹㈢敵璇疯嚜鍔ㄧ绂�
- visitsService.visitLevelForCarOut(v);
+ //濡傛灉鏄溅杈嗗嚭鍥尯 缁熻璁垮杩涘叆鏁�
+ inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
+ try {
+ //璁垮鐢宠鑷姩绛剧
+ visitsService.visitLevelForCarOut(v);
+ //缁熻绛剧鏁�
+ inoutDayCount.setLeaveVisitorNum(Constants.formatIntegerNum(inoutDayCount.getLeaveVisitorNum())+1);
+ }catch (Exception e){
+ log.error("璁垮璺熼殢杞﹁締鍑哄洯鑷姩绛剧澶辫触锛�==========="+e.getMessage());
+ }
}else{
//濡傛灉鏄繘鍏ュ洯鍖猴紝璁垮褰曞叆鍦ㄥ洯浜哄憳璁板綍
retentionList.add(getRetentionModelByRequest(copyObj,request));
+ //缁熻璁垮鍑鸿鏁�
+ inoutDayCount.setInVisitorNum(Constants.formatIntegerNum(inoutDayCount.getInVisitorNum())+1);
}
}
}
}
- //杞﹁締杩涘叆璁板綍瀵瑰簲涓氬姟绫诲瀷
- if(event.getCarType() !=null && event.getCarType().equals(Constants.RetentionCarType.fkCar)) {
+ if(event.getCarType() !=null && !event.getCarType().equals(Constants.RetentionCarType.fkCar)){
//褰曞叆闈炶瀹㈢被鍨嬭溅杈嗚繘鍑鸿褰�
- carrecord.setCarBizType(event.getCarType()==null?Constants.RetentionCarType.other:event.getCarType());
- if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.internalMember)
- ||Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.relMember)
- ||Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.driver)){
- retentionList.add(getRetentionModelByRequest(carrecord,request));
- }
- inoutRecordList.add(carrecord);
+ dealNotFkCarMemberBiz(event,request,carrecord,retentionList,inoutDayCount,inoutRecordList);
}
-
}
return event;
+ }
+
+ private void dealNotFkCarMemberBiz( CarEvent event ,EventParkInfoRequest request, InoutRecord carrecord,List<Retention> retentionList,InoutDayCount inoutDayCount,List<InoutRecord> inoutRecordList) {
+ //褰曞叆闈炶瀹㈢被鍨嬭溅杈嗚繘鍑鸿褰�
+ carrecord.setCarBizType(event.getCarType()==null?Constants.RetentionCarType.other:event.getCarType());
+ if(carrecord.getMemberId()!=null
+ && (Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.internalMember)
+ ||Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.relMember)
+ ||Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.driver))){
+ if( Constants.equalsInteger(carrecord.getInOrOut(),Constants.ZERO)) {
+ //濡傛灉鏄繘鍏�
+ retentionList.add(getRetentionModelByRequest(carrecord,request));
+ if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.relMember)){
+ //濡傛灉鏄浉鍏虫柟浜哄憳锛岀粺璁′粖鏃ョ疮璁℃暟
+ inoutDayCount.setInOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getInOtherMemberNum())+1);
+ }else if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.internalMember)){
+ //濡傛灉鏄唴閮ㄤ汉鍛�,缁熻浠婃棩绱鏁�
+ inoutDayCount.setInSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getInSelfMemberNum())+1);
+ }
+ //缁熻浠婃棩鍏ュ洯鎬讳汉娆�
+ inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);
+ }else if(carrecord.getMemberId()!=null && Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)) {
+ //濡傛灉鏄嚭鍥尯
+ if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.relMember)){
+ //濡傛灉鏄浉鍏虫柟锛岀粺璁′粖鏃ョ疮璁℃暟
+ inoutDayCount.setOutOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutOtherMemberNum())+1);
+ }else if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.internalMember)){
+ //濡傛灉鏄唴閮ㄤ汉鍛橈紝缁熻浠婃棩绱鏁�
+ inoutDayCount.setOutSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutSelfMemberNum())+1);
+ }
+ //缁熻浠婃棩鍑哄洯鎬讳汉娆�
+ inoutDayCount.setOutMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutMemberNum())+1);
+ }
+ }
+ if(carrecord.getInOrOut() !=null) {//濡傛灉鏄嚭鍏ヨ褰�
+ if(Constants.equalsInteger(carrecord.getCarBizType(),Constants.RetentionCarType.other)){
+ carrecord.setCategoryName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
+ }
+ inoutRecordList.add(carrecord);//褰曞叆杞﹁締浠ュ強鎼哄甫浜哄憳鐨勫叆鍥槑缁嗚褰曪紙闈炶瀹級
+ }
+ }
+
+ private Category findCategoryByBizType(Integer carType,String tempname, String pName,List<Category> categoryList) {
+ if(categoryList!=null){
+ for(Category category :categoryList){
+ if(Constants.equalsInteger(carType,category.getBizType())){
+ return category;
+ }
+ }
+ }
+ Category category = new Category();
+ category.setName(tempname);
+ category.setParentName(pName);
+ return null;
}
private void dealSelTruckAutoSignBiz(EventParkInfoRequest request, CarEvent event) {
@@ -1096,7 +1193,6 @@
//濡傛灉鏄嚜鏈夎溅鍗歌揣 鏌ヨTMS鍚堝悓鐘舵�侊紝鍐冲畾鏄惁鑷姩绛惧埌
checkTmsContractStatusBiz(platformJob);
}
-
}
}
}
--
Gitblit v1.9.3