From 1e268f3b855b666c1714b7985cb437c585e47948 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 29 四月 2025 17:26:15 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 insertions(+), 3 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..20e9aa3 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
@@ -877,8 +880,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 +907,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"));
@@ -921,6 +934,10 @@
carrecord.setMemberCode(carModel.getMemberCode());
carrecord.setCompanyId(carModel.getGroupId());
carrecord.setCompanyName(carModel.getCompanyName());
+ carrecord.setCategoryId(carModel.getCateId());
+ carrecord.setCategoryName(carModel.getCateName());
+ carrecord.setCategoryParentId(carModel.getCatePId());
+ carrecord.setCategoryParentName(carModel.getCatePName());
carrecord.setMemberType( Constants.RetentionMemberType.car);//鍙槸杞﹁締鐨勮褰�
if(carModel.getMemberId()!=null){
if(Constants.equalsInteger(carModel.getCompanyType(),Constants.ONE)){
@@ -964,19 +981,33 @@
//璐ц繍鍙告満(濡傛灉鍙告満鎵嬫満鍙锋垨鑰呭鍚嶄笉涓虹┖锛�
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());
}
}
//澶勭悊鑷湁杞﹁嚜鍔ㄧ鍒颁笟鍔�
@@ -1011,6 +1042,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,7 +1056,6 @@
copyObj.setMemberName(v.getName());
copyObj.setMemberPhone(v.getPhone());
copyObj.setCompanyName(v.getCompanyName());
- copyObj.setCarBizType(Constants.RetentionCarType.fkCar);
copyObj.setMemberType(Constants.ZERO);
copyObj.setRemark(carrecord.getCarCode());
copyObj.setCarCode(index>=0?null:carrecord.getCarCode());
@@ -1052,6 +1088,20 @@
return event;
}
+ 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) {
ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
.eq(ParkBook::getCarCode,event.getPlateNos())
--
Gitblit v1.9.3