From 4f8b83178eabea113df2ea48b64a56cb7f721107 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 四月 2025 14:55:42 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 237 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 200 insertions(+), 37 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 23383bc..ec27f56 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
@@ -19,14 +19,19 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
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.PlatformJobService;
import com.doumee.service.business.impl.PlatformWarnEventServiceImpl;
+import com.doumee.service.business.third.TmsService;
+import com.doumee.service.business.third.model.request.TmsOrderInfoRequest;
+import com.doumee.service.business.third.model.response.TmsOrderInfoResponse;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.net.ftp.FTP;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -81,6 +86,8 @@
@Autowired
private PlatformJobMapper platformJobMapper;
@Autowired
+ private TmsService tmsService;
+ @Autowired
private PlatformWmsDetailMapper platformWmsDetailMapper;
@Autowired
private PlatformEventMapper platformEventMapper;
@@ -88,6 +95,13 @@
private PlatformLogMapper platformLogMapper;
@Autowired
private PlatformWarnEventServiceImpl platformWarnEventService;
+
+
+
+
+
+
+
/**
* 娴峰悍闂ㄧ浜嬩欢鎺ㄩ��
* @param param
@@ -453,7 +467,6 @@
* 鏍规嵁璁垮鎺ㄩ�佽瀹㈣褰曠紪鐮侊紝澶勭悊璁垮璁板綍銆佸湪鍦轰汉鍛樼瓑淇℃伅
*/
private void dealVisitDataByRequstIccm(EventVisitIccmInfoRequest request, List<Integer> delRetentionLis, List<Retention> retentionList, InoutDayCount inoutDayCount) {
-
EventVisitIccmDataRequest model = request.getData();
EventVisitIccmInvoiceParamRequest data = request.getData().getVisitorInvoices();
MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
@@ -472,12 +485,14 @@
updateVistis.setId(visits.getId());
if (Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_ICCM_IN.getKey()) {
//濡傛灉鏄瀹㈢櫥璁帮紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
-// retentionList.add(getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType()));
+ //retentionList.add(getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType()));
//鏉ヨ鏃堕棿
- inoutDayCount.setSigninVisitorNum(Constants.formatIntegerNum(inoutDayCount.getSigninVisitorNum())+1);
- updateVistis.setStatus(Constants.VisitStatus.signin);
- updateVistis.setInDate(DateUtil.getISO8601DateByStr(data.getBeginTime()));
- updateVistis.setOutDate(DateUtil.getISO8601DateByStr(data.getFinishTime()));
+ if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess)){
+ inoutDayCount.setSigninVisitorNum(Constants.formatIntegerNum(inoutDayCount.getSigninVisitorNum())+1);
+ updateVistis.setStatus(Constants.VisitStatus.signin);
+ updateVistis.setInDate(DateUtil.getISO8601DateByStr(data.getBeginTime()));
+ updateVistis.setOutDate(DateUtil.getISO8601DateByStr(data.getFinishTime()));
+ }
//鏇存柊鏈�鏂版潵璁挎椂闂�
Member member = new Member();
member.setLastVisitDate(updateVistis.getInDate());
@@ -485,12 +500,15 @@
memberMapper.updateById(member);
}else if (Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_ICCM_OUT.getKey()) {
//濡傛灉鏄瀹㈢绂讳簨浠�
- inoutDayCount.setLeaveVisitorNum(Constants.formatIntegerNum(inoutDayCount.getLeaveVisitorNum())+1);
- updateVistis.setStatus(Constants.VisitStatus.signout);
- updateVistis.setInDate(DateUtil.getISO8601DateByStr(data.getBeginTime()));
- updateVistis.setOutDate(DateUtil.getISO8601DateByStr(data.getFinishTime()));
- updateVistis.setOutType(Constants.ZERO);
- updateVistis.setOutInfo("璁垮姝ｅ父绛剧");
+ if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.signin)){
+ inoutDayCount.setLeaveVisitorNum(Constants.formatIntegerNum(inoutDayCount.getLeaveVisitorNum())+1);
+ updateVistis.setStatus(Constants.VisitStatus.signout);
+ updateVistis.setInDate(DateUtil.getISO8601DateByStr(data.getBeginTime()));
+ updateVistis.setOutDate(DateUtil.getISO8601DateByStr(data.getFinishTime()));
+ updateVistis.setOutType(Constants.ZERO);
+ updateVistis.setOutInfo("璁垮姝ｅ父绛剧");
+ }
+ delRetentionLis.add(visits.getMemberId());
}else{
//濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垏鏄瀹㈤�氳锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
delRetentionLis.add(visits.getMemberId());
@@ -550,6 +568,15 @@
event.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
if(event.getCreateDate() == null){
event.setCreateDate(new Date());
+ }
+ if (Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS.getKey()) {
+ //濡傛灉鏄瀹㈤�氳浜嬩欢,杩涘叆杩涘嚭浜嬩欢
+ if(request.getData()!=null&&request.getData().getParamValues()!=null &&
+ StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
+ event.setInOrOut("0");//杩�
+ }else{
+ event.setInOrOut("1");//鍑�
+ }
}
event.setVisitorWorkUint(detail.getUnit());
event.setVisitorId(detail.getVisitorId());
@@ -805,7 +832,7 @@
event.setEventCmd(request.getData().getEventCmd());
event.setCardNo(request.getData().getCardNo());
event.setCarAttributeName(request.getData().getCarAttributeName());
-
+ event.setCarType(Constants.RetentionCarType.unknown);//榛樿鏈櫥璁拌溅杈�
if(request.getData().getInResult()!=null && request.getData().getInResult().getRlsResult() !=null ){
//鏀捐鏂瑰紡
event.setReleaseWay(request.getData().getInResult().getRlsResult().getReleaseWay());
@@ -820,6 +847,44 @@
event.setPlatePicUrl(getHkImgUrl(request.getData().getPicUrl().getPlatePicUrl()));
}
if(StringUtils.isNotBlank(event.getPlateNos())){
+ Cars carModel = carsMapper.selectJoinOne(Cars.class,new MPJLambdaWrapper<Cars>()
+ .selectAll(Cars.class )
+ .selectAs(Company::getType,Cars::getCompanyType)
+ .leftJoin(Company.class,Company::getId,Cars::getGroupId)
+ .eq(Cars::getCode,event.getPlateNos())
+ .eq(Cars::getIsdeleted,Constants.ZERO)
+ .last(" limit 1"));
+ if(carModel!=null){
+ //0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠
+ event.setMemberId(carModel.getMemberId());
+ event.setCompanyId(carModel.getGroupId());
+ if(Constants.equalsInteger(carModel.getType(),Constants.ONE)){
+ event.setCarType(Constants.RetentionCarType.selfTruck);
+ }else {
+ if(Constants.equalsInteger(carModel.getCompanyType(),Constants.ONE)){
+ event.setCarType(Constants.RetentionCarType.internal);//鍐呴儴杞﹁締
+ }else{
+ event.setCarType(Constants.RetentionCarType.relation);//鐩稿叧鏂硅溅杈�
+ }
+ }
+ }
+ PlatformJob carTypeJob = platformJobMapper.selectOne(new QueryWrapper<PlatformJob>().lambda()
+ .eq(PlatformJob::getCarCodeFront,event.getPlateNos())
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .orderByAsc(PlatformJob::getCreateDate)
+ .last(" limit 1"));
+ if(carTypeJob!=null){
+ //浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣
+ if(Constants.equalsInteger(carTypeJob.getType(),Constants.FOUR)){
+ event.setCarType(Constants.RetentionCarType.cityComTruck);//甯傚叕鍙歌溅杈�
+ }else if(Constants.equalsInteger(carTypeJob.getType(),Constants.TWO)
+ || Constants.equalsInteger(carTypeJob.getType(),Constants.THREE)){
+ event.setCarType(Constants.RetentionCarType.outTruck);//澶栧崗杞�
+ }else{
+ event.setCarType(Constants.RetentionCarType.selfTruck);//鑷湁杞�
+ }
+ }
+
ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
.eq(ParkBook::getCarCode,event.getPlateNos())
.eq(ParkBook::getIsdeleted,Constants.ZERO )
@@ -840,12 +905,10 @@
Constants.PlatformJobStatus.IN_WAIT.getKey(),
Constants.PlatformJobStatus.CALLED.getKey(),
Constants.PlatformJobStatus.WORKING.getKey(),
- Constants.PlatformJobStatus.DONE.getKey(),
Constants.PlatformJobStatus.TRANSFERING.getKey(),
- Constants.PlatformJobStatus.EXCEPTION.getKey(),
- Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+ Constants.PlatformJobStatus.EXCEPTION.getKey()
)
- )==Constants.ZERO){
+ )==Constants.ZERO){//濡傛灉娌¤繘琛屼腑浠诲姟
PlatformJob platformJob = platformJobMapper.selectOne(new QueryWrapper<PlatformJob>().lambda()
.eq(PlatformJob::getCarCodeFront,event.getPlateNos())
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
@@ -857,24 +920,17 @@
.last(" limit 1")
);
if(Objects.nonNull(platformJob)){
- platformJob.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());
- platformJob.setArriveDate(new Date());
- platformJob.setSingType(Constants.TWO);
- platformJob.setSignDate(new Date());
- List<PlatformJob> signList = platformJobMapper.selectList(new QueryWrapper<PlatformJob>().lambda().apply(" DATE(SIGN_DATE) = DATE(NOW()) and sign_date is not null "));
- if(CollectionUtils.isEmpty(signList)){
- platformJob.setSignNum(Constants.ONE);
- } else{
- int maxNumber = Collections.max(signList.stream().map(i->i.getSignNum()).collect(Collectors.toList()));
- platformJob.setSignNum(maxNumber + Constants.ONE);
+ if(Constants.equalsInteger(platformJob.getType(),Constants.ONE)){
+ //濡傛灉鏄嚜鏈夎溅瑁呰揣鑷姩绛惧埌
+ jobAutoSignBiz(platformJob);
+ }else if(Constants.equalsInteger(platformJob.getType(),Constants.ZERO)){
+ //濡傛灉鏄嚜鏈夎溅鍗歌揣 鏌ヨTMS鍚堝悓鐘舵�侊紝鍐冲畾鏄惁鑷姩绛惧埌
+ checkTmsContractStatusBiz(platformJob);
}
- platformJobMapper.updateById(platformJob);
+
}
}
};
-
-
-
}else{
Visits visits = visitsMapper.selectOne(new QueryWrapper<Visits>().lambda()
.eq(Visits::getCarNos,event.getPlateNos())
@@ -886,12 +942,13 @@
if(visits!=null){
//鏈�杩戜娇鐢ㄨ杞︾殑鐢宠浜猴紙宸插埌杈撅級
event.setMemberId(visits.getMemberId());
+ event.setCarType(Constants.RetentionCarType.visitor);
}
}
if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
//濡傛灉鏄叆鍘傛斁琛�
delRetentionList.add(event.getPlateNos());
- retentionList.add(getRetentionModelByParkRequest(request));
+ retentionList.add(getRetentionModelByParkRequest(request,event));
inoutDayCount.setInCarNum(Constants.formatIntegerNum(inoutDayCount.getInCarNum())+1);
}else if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_OUT.getKey()){
//濡傛灉鏄嚭鍦烘斁琛�
@@ -902,12 +959,57 @@
return event;
}
- private Retention getRetentionModelByParkRequest(EventParkInfoRequest request) {
+ /**
+ * 锛涘鏋滄槸鍗歌揣浠诲姟锛岄渶瑕侀�氳繃TMS鎻愪緵鐨勨��2.2鍚堝悓鍒楄〃鎺ュ彛鈥濇帴鍙ｆ煡璇㈣溅杈嗗搴旂殑鍚堝悓鐘舵�佹槸鍚︿负鍦ㄩ�旂姸鎬侊紙瀵瑰簲orderStatus鍊间负3/4/5/6锛夛紝
+ * 濡傛灉鏄嚜鍔ㄧ鍒帮紝鍚﹀垯涓嶈嚜鍔ㄧ鍒帮紱濡傛灉涓�涓溅杈嗗搴斿涓悎鍚屽彿锛屽垯鍙栬繍鍗曚笅浠讳竴鍚堝悓鏌ヨ瀵瑰簲鍦ㄩ�斾俊鎭�
+ * @param platformJob
+ */
+ private void checkTmsContractStatusBiz(PlatformJob platformJob) {
+ PlatformWmsDetail detail = platformWmsDetailMapper.selectOne(new QueryWrapper<PlatformWmsDetail>().lambda()
+ .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO)
+ .eq(PlatformWmsDetail::getJobId, platformJob.getId())
+ .isNotNull(PlatformWmsDetail::getContractNum)
+ .last("limit 1")
+ );
+ if(detail!=null && StringUtils.isNotBlank(detail.getContractNum())){
+ TmsOrderInfoRequest param = new TmsOrderInfoRequest();
+ param.setContractNumber(detail.getContractNum());
+ TmsOrderInfoResponse response = tmsService.orderInfo(param);
+ if(response!=null &&( StringUtils.equals(response.getOrderStatus(),"3") )
+ ||StringUtils.equals(response.getOrderStatus(),"4")
+ ||StringUtils.equals(response.getOrderStatus(),"5")
+ ||StringUtils.equals(response.getOrderStatus(),"6")){
+ //濡傛灉鍚堝悓鍦ㄩ�旓紝鍒欒嚜鍔ㄧ鍒�
+ jobAutoSignBiz(platformJob);
+ }
+ }
+
+ }
+
+ private void jobAutoSignBiz(PlatformJob platformJob) {
+ platformJob.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());
+ platformJob.setArriveDate(new Date());
+ platformJob.setSingType(Constants.TWO);
+ platformJob.setSignDate(new Date());
+ List<PlatformJob> signList = platformJobMapper.selectList(new QueryWrapper<PlatformJob>().lambda().apply(" DATE(SIGN_DATE) = DATE(NOW()) and sign_date is not null "));
+ if(CollectionUtils.isEmpty(signList)){
+ platformJob.setSignNum(Constants.ONE);
+ } else{
+ int maxNumber = Collections.max(signList.stream().map(i->i.getSignNum()).collect(Collectors.toList()));
+ platformJob.setSignNum(maxNumber + Constants.ONE);
+ }
+ platformJobMapper.updateById(platformJob);
+ }
+
+ private Retention getRetentionModelByParkRequest(EventParkInfoRequest request,CarEvent event) {
Retention retention = new Retention();
retention.setIsdeleted(Constants.ZERO);
retention.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
retention.setCarNo(request.getData().getPlateNo());
retention.setType(Constants.THREE);
+ retention.setMemberId(event.getMemberId());
+ retention.setCarType(event.getCarType());
+ retention.setCompanyId(event.getCompanyId());
// retention.setDeviceName(request.getSrcName());
// retention.setDeviceIndex(request.getSrcIndex());
return retention;
@@ -1028,13 +1130,24 @@
.selectAs(Platform::getName,PlatformJob::getPlatformName)
.selectAs(Platform::getLedContent,PlatformJob::getLedContent)
.leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
-// .eq(StringUtils.equals(status.getStockStatus(),"front"),PlatformJob::getCarCodeFront,status.getPlateNo() )//鍓嶈溅鐗屽彿
// .eq(!StringUtils.equals(status.getStockStatus(),"front"),PlatformJob::getCarCodeBack,status.getPlateNo() )//鍚庤溅鐗屽彿
+// .eq(StringUtils.equals(status.getStockStatus(),"front"),PlatformJob::getCarCodeFront,status.getPlateNo() )//鍓嶈溅鐗屽彿
.eq(PlatformJob::getIsdeleted,Constants.ZERO )
.eq(PlatformJob::getPlatformId,model.getPlatformId() )
.orderByDesc(PlatformJob::getCallDate)
.last("limit 1 "));
if(job == null){
+ if(StringUtils.equals(status.getMotionStatus(),"enter")){
+ //濡傛灉鏈堝彴褰撳墠娌′綔涓氾紝鐩存帴鎻愮ず杞﹁締鍋滈敊
+ Platform platform = platformMapper.selectJoinOne(Platform.class, new MPJLambdaWrapper<Platform>()
+ .selectAll(Platform.class)
+ .eq(Platform::getIsdeleted,Constants.ZERO )
+ .eq(PlatformJob::getId,model.getPlatformId() )
+ .last("limit 1 "));
+ if(platform!=null){
+ dealCarsAndPlatformErrorBiz(platform,status);
+ }
+ }
continue;//濡傛灉浣滀笟涓虹┖锛岃烦杩囧鐞�
}
PlatformJob update = new PlatformJob();
@@ -1263,12 +1376,12 @@
if(StringUtils.isBlank(device.getHkId())){
continue;
}
- if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
+ /*if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
//濡傛灉鏄疞ED
PlatformBroadcastLog log = dealLedContentBiz(model.getId(),device.getHkNo(),device.getName(),content,speed,1);
logList.add(log);
ledList.add(device.getHkId());
- }else if(Constants.equalsInteger(device.getType(),Constants.TWO)){
+ }else */if(Constants.equalsInteger(device.getType(),Constants.TWO)){
//濡傛灉鏄箍鎾偣
bNames += device.getName()+";";
broadcastList.add(device.getHkId());
@@ -1282,6 +1395,56 @@
platformBroadcastLogMapper.insert(logList);
}
}
+ private void dealCarsAndPlatformErrorBiz( Platform model, EventPlatformCarsStatusInfoRequest status) {
+ //澶勭悊杞﹁締杩涘叆閿欒鏈堝彴涓氬姟閫昏緫
+ SavePlatformWarnEventDTO savePlatformWarnEventDTO = new SavePlatformWarnEventDTO();
+ savePlatformWarnEventDTO.setPlatformJobId(model.getId());
+ savePlatformWarnEventDTO.setPlatformId(model.getId());
+ savePlatformWarnEventDTO.setCarCode(status.getPlateNo());
+ savePlatformWarnEventDTO.setEventType(Constants.PlatformWarnEvent.STOP_ERROR.getKey());
+ platformWarnEventService.savePlatformWarnEvent(savePlatformWarnEventDTO);
+
+ int speed = 13;
+ try {
+ speed = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LED_CONTENT_SPEED).getCode());
+ }catch (Exception e){
+
+ }
+ List<PlatformDevice> deviceList = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda()
+ .eq(PlatformDevice::getPlatformId,model.getId())
+ .eq(PlatformDevice::getIsdeleted,Constants.ZERO));
+ if(deviceList ==null || deviceList.size() == 0){
+ return;
+ }
+ String content =Constants.PlatformLedContent.WRONG_IN.getInfo();
+ content = content.replace("${param2}",model.getName());
+ content = content.replace("${param}",status.getPlateNo());
+ List<String> broadcastList = new ArrayList<>();
+ List<String> ledList = new ArrayList<>();
+ String bNames = "";
+ List<PlatformBroadcastLog> logList = new ArrayList<>();
+ for(PlatformDevice device : deviceList){
+ if(StringUtils.isBlank(device.getHkId())){
+ continue;
+ }
+ if(Constants.equalsInteger(device.getType(),Constants.TWO)){
+ //濡傛灉鏄箍鎾偣
+ bNames += device.getName()+";";
+ broadcastList.add(device.getHkId());
+ }
+ }
+ if(broadcastList.size()>0){
+ PlatformJob job = new PlatformJob();
+ job.setId(-1);
+ job.setCarCodeFront(status.getPlateNo());
+ job.setPlatformId(model.getId());
+ PlatformBroadcastLog log = dealBroadcastBiz(job,broadcastList,bNames,Constants.PlatformBroadcastContent.WRONG_IN.getInfo().replace("${param}",status.getPlateNo()));
+ logList.add(log);
+ }
+ if(logList.size()>0){
+ platformBroadcastLogMapper.insert(logList);
+ }
+ }
/**
* 骞挎挱閫氱煡
--
Gitblit v1.9.3