From 6fdded5413c9fa540048a0bd26574b7671ad5420 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 11 十月 2024 15:12:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 80 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 6341d06..9a6b9e0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -32,7 +32,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.impl.hksync.HkSyncPushServiceImpl;
+import com.doumee.service.business.impl.thrid.WmsServiceImpl;
import com.doumee.service.business.third.EmayService;
+import com.doumee.service.business.third.WmsService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -107,6 +109,8 @@
@Autowired
private PlatformBroadcastLogMapper platformBroadcastLogMapper;
+ @Autowired
+ private PlatformWarnEventServiceImpl platformWarnEventService;
@Override
public Integer create(PlatformJob platformJob) {
@@ -1024,6 +1028,8 @@
}
platformJob.setEditDate(new Date());
platformJobMapper.updateById(platformJob);
+
+
//瀛樺偍鎿嶄綔鏃ュ織
savePlatformLog(Constants.PlatformJobLogType.CALLED.getKey(),oldPlatformJob,platformJob,
Constants.PlatformJobLogType.CALLED.getInfo().replace("{data}",platform.getName()));
@@ -1039,6 +1045,8 @@
this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.CALLING.getInfo(),
Constants.PlatformBroadcastContent.CALLING.getInfo()
);
+
+ platformJob.setPlatformWmsCode(platform.getCode());
return platformJob;
}
@@ -1053,7 +1061,8 @@
log.error("鏌ヨLED涓庡箍鎾暟鎹�------------------------------------------------------------------------------------------");
List<PlatformDevice> deviceList = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda()
.eq(PlatformDevice::getPlatformId,model.getPlatformId())
- .eq(PlatformDevice::getIsdeleted,Constants.ZERO));
+ .eq(PlatformDevice::getIsdeleted,Constants.ZERO)
+ );
if(deviceList ==null || deviceList.size() == 0){
return;
}
@@ -1160,6 +1169,11 @@
emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
SmsConstants.platformJobContent.platformJobMove,oldPlatform.getName(),platform.getName()
);
+
+ this.broadcastAndLEed(platformJob,null,
+ StringUtils.isBlank(oldPlatform.getRemark())?Constants.PlatformLedContent.IDEL_CONTNET.getName():oldPlatform.getRemark()
+ );
+
}
@@ -1310,7 +1324,6 @@
||Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey()) )){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
}
-
Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId());
if(Objects.isNull(platform)){
@@ -1888,10 +1901,13 @@
.selectAll(PlatformJob.class)
.selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
.selectAs(Platform::getName,PlatformJob::getPlatformName)
+ .selectAs(PlatformGroup::getWaitCallTime,PlatformJob::getWorktimeOutAlarmTime)
.select(" case when t.total_num is null then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id ) else t.total_num end workNum ")
.select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 5 order by pl.CREATE_DATE desc limit 1 ) as newStartDate ")
.select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 4 order by pl.CREATE_DATE desc limit 1 ) as newCallDate ")
.leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getStatus,
Constants.PlatformJobStatus.WAIT_CALL.getKey(),
Constants.PlatformJobStatus.WORKING.getKey(),
@@ -1915,8 +1931,7 @@
platformJob.setOptTime(overDate.getTime());
}
}else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){
- //璁＄畻宸插彨鍙锋椂闂�
- platformJob.dealTime();
+ platformJob.setOptTime(DateUtil.getXMinuteAfterDate(platformJob.getCallDate(),platformJob.getWorktimeOutAlarmTime()).getTime());
}
}
largeScreenDataVO.setAllList(platformJobList);
@@ -1927,9 +1942,64 @@
return largeScreenDataVO;
}
+
+
+
+ @Override
+ public void timeOutReport(){
+ //鏌ヨ瓒呮椂鏁版嵁
+ List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .selectAs(Platform::getName,PlatformJob::getPlatformName)
+ .select(" ( now() > DATE_ADD(t.DONE_DATE ,INTERVAL t1.STAY_TIMEOUT_ALARM_TIME MINUTE) ) as isTimeOut ")
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE,Constants.PlatformJobStatus.AUTHED_LEAVE)
+ .eq(PlatformJob::getInOut,Constants.ONE)
+ .isNotNull(PlatformJob::getDoneDate)
+ );
+ //濡傛灉瓒呮椂 澶勭悊鏁版嵁 骞跺彂閫乴ed涓庡箍鎾�
+ for (PlatformJob platformJob:platformJobList) {
+ if(Constants.equalsInteger(platformJob.getIsTimeOut(),Constants.ONE)){
+ //骞挎挱 led閫氱煡
+ this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.TIMEOUT_IN.getInfo(),
+ Constants.PlatformBroadcastContent.TIMEOUT_IN.getInfo());
+ //鏇存柊鐘舵��
+ platformJobJoinMapper.update(new UpdateWrapper<PlatformJob>().lambda().set(PlatformJob::getInOut,Constants.ZERO).eq(PlatformJob::getId,platformJob.getId()));
+
+ SavePlatformWarnEventDTO savePlatformWarnEventDTO = new SavePlatformWarnEventDTO();
+ savePlatformWarnEventDTO.setPlatformJobId(platformJob.getId());
+ savePlatformWarnEventDTO.setPlatformId(platformJob.getPlatformId());
+ savePlatformWarnEventDTO.setCarCode(platformJob.getCarCodeFront());
+ savePlatformWarnEventDTO.setEventType(Constants.PlatformWarnEvent.STOP_TIMEOUT.getKey());
+ platformWarnEventService.savePlatformWarnEvent(savePlatformWarnEventDTO);
+ }
+ }
+ }
-
+ /**
+ * 鑷姩杩囧彿 鑷姩鏇存柊鑷充唬绛惧埌鐘舵��
+ */
+ @Override
+ public void timeOutCallIn(){
+ //鏌ヨ瓒呮椂鏁版嵁
+ List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .selectAs(Platform::getName,PlatformJob::getPlatformName)
+ .select(" ( now() > DATE_ADD(t.CALL_DATE ,INTERVAL t2.WAIT_CALL_TIME MINUTE) ) as isTimeOut ")
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId)
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED)
+ .isNotNull(PlatformJob::getCallDate)
+ );
+ //濡傛灉瓒呮椂 澶勭悊鏁版嵁 骞跺彂閫乴ed涓庡箍鎾�
+ for (PlatformJob platformJob:platformJobList) {
+ JobOperateDTO jobOperateDTO = new JobOperateDTO();
+ jobOperateDTO.setJobId(platformJob.getId());
+ this.platformOverNumber(jobOperateDTO);
+ this.cancelInPark(platformJob);
+ }
+ }
}
--
Gitblit v1.9.3