From 7cdea6d16a8b9f74800792ea412ad8b51c4df7f4 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 22 十月 2024 17:48:38 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 241 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 214 insertions(+), 27 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 5957712..a2b09a9 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 @@ -13,6 +13,9 @@ import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; +import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest; +import com.doumee.core.tms.model.response.TmsBaseResponse; +import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse; import com.doumee.core.utils.*; import com.doumee.dao.business.*; import com.doumee.dao.business.join.PlatformJobJoinMapper; @@ -32,7 +35,10 @@ 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.TmsService; +import com.doumee.service.business.third.WmsService; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -61,6 +67,8 @@ @Autowired private PlatformJobMapper platformJobMapper; + @Autowired + private TmsService tmsService; @Autowired private PlatformDeviceMapper platformDeviceMapper; @@ -107,6 +115,8 @@ @Autowired private PlatformBroadcastLogMapper platformBroadcastLogMapper; + @Autowired + private PlatformWarnEventServiceImpl platformWarnEventService; @Override public Integer create(PlatformJob platformJob) { @@ -187,10 +197,12 @@ .selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName) .selectAs(PlatformWmsJob::getIoCreatedate,PlatformJob::getIoCreatedate) .selectAs(SystemUser::getRealname,PlatformJob::getOutUserName) + .selectAs(PlatformBooks::getId,PlatformJob::getBookId) .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId) .leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId) .leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode) .leftJoin(SystemUser.class,SystemUser::getId,PlatformJob::getOutUserId) + .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId) .eq(pageWrap.getModel().getId() != null, PlatformJob::getId, pageWrap.getModel().getId()) .eq(pageWrap.getModel().getCreator() != null, PlatformJob::getCreator, pageWrap.getModel().getCreator()) .ge(pageWrap.getModel().getCreateDate() != null, PlatformJob::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate())) @@ -267,14 +279,17 @@ .eq(pageWrap.getModel().getPlatformGroupId() != null, PlatformJob::getPlatformGroupId, pageWrap.getModel().getPlatformGroupId()) .apply(pageWrap.getModel().getQueryStatus() != null, " find_in_set(t.`STATUS`,'"+pageWrap.getModel().getQueryStatus()+"')") + .apply(pageWrap.getModel().getQueryStatusForPower() != null, " find_in_set(t.`STATUS`,'"+pageWrap.getModel().getQueryStatusForPower()+"')") .apply(pageWrap.getModel().getQueryType() != null, " find_in_set(t.TYPE,'"+pageWrap.getModel().getQueryType()+"')") .ge(pageWrap.getModel().getBeginWorkDateStart() != null, PlatformJob::getStartDate, Utils.Date.getStart(pageWrap.getModel().getBeginWorkDateStart())) .le(pageWrap.getModel().getBeginWorkDateEnd() != null, PlatformJob::getStartDate, Utils.Date.getEnd(pageWrap.getModel().getBeginWorkDateEnd())) + .ge(pageWrap.getModel().getBeginDoneDateStart() != null, PlatformJob::getDoneDate, Utils.Date.getStart(pageWrap.getModel().getBeginDoneDateStart())) + .le(pageWrap.getModel().getBeginDoneDateEnd() != null, PlatformJob::getDoneDate, Utils.Date.getEnd(pageWrap.getModel().getBeginDoneDateEnd())) .ge(pageWrap.getModel().getCreateDateStart() != null, PlatformWmsJob::getIoCreatedate, Utils.Date.getStart(pageWrap.getModel().getCreateDateStart())) .le(pageWrap.getModel().getCreateDateEnd() != null, PlatformWmsJob::getIoCreatedate, Utils.Date.getEnd(pageWrap.getModel().getCreateDateEnd())) - .eq(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getJobType()), PlatformJob::getType, Constants.platformJobType.sgscxh) - .ne(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()), PlatformJob::getType, Constants.platformJobType.sgscxh) + .isNotNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getJobType()), PlatformJob::getContractNum) + .isNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()), PlatformJob::getContractNum) ; for(PageWrap.SortData sortData: pageWrap.getSorts()) { @@ -327,7 +342,7 @@ " ( " + " ( t.`STATUS` = "+Constants.PlatformJobStatus.WAIT_CALL.getKey()+" and t.PLATFORM_GROUP_ID = ( SELECT p.group_id FROM platform p WHERE p.id = "+pageWrap.getModel().getPlatformId()+" LIMIT 1 ) )" + " or " + - " (t.`STATUS` = "+Constants.PlatformJobStatus.IN_WAIT.getKey()+" and t.PLATFORM_ID = "+pageWrap.getModel().getPlatformId()+" )" + + " (t.`STATUS` = "+Constants.PlatformJobStatus.IN_WAIT.getKey()+" and t.PLATFORM_GROUP_ID = ( SELECT p.group_id FROM platform p WHERE p.id = "+pageWrap.getModel().getPlatformId()+" LIMIT 1 ) )" + " or " + " (t.`STATUS` = "+Constants.PlatformJobStatus.TRANSFERING.getKey()+" and t.PLATFORM_ID = "+pageWrap.getModel().getPlatformId()+" ) " + ") " @@ -1024,6 +1039,8 @@ } platformJob.setEditDate(new Date()); platformJobMapper.updateById(platformJob); + + //瀛樺偍鎿嶄綔鏃ュ織 savePlatformLog(Constants.PlatformJobLogType.CALLED.getKey(),oldPlatformJob,platformJob, Constants.PlatformJobLogType.CALLED.getInfo().replace("{data}",platform.getName())); @@ -1035,47 +1052,70 @@ ); //骞挎挱 led閫氱煡 - this.broadcastAndLEed(platformJob,Constants.PlatformBroadcastContent.CALLING.getInfo().replace("{param2}",platform.getName())); + platformJob.setPlatformName(platform.getName()); + this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.CALLING.getInfo(), + Constants.PlatformBroadcastContent.CALLING.getInfo() + ); + + platformJob.setPlatformWmsCode(platform.getCode()); return platformJob; } - public void broadcastAndLEed(PlatformJob model,String content){ + public void broadcastAndLEed(PlatformJob model,String ledContent,String broadcastContent){ int speed = 13; try { speed = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LED_CONTENT_SPEED).getCode()); }catch (Exception e){ } + 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; } - content = content.replace("${param}",model.getPlatformName()); - content = content.replace("${param2}",model.getCarCodeFront()); + + Boolean sendLed = StringUtils.isBlank(ledContent)?false:true; + Boolean sendBroadcast = StringUtils.isBlank(broadcastContent)?false:true; + + if (sendLed) { + //骞挎挱 param2 = 杞︾墝鍙� param = 鏈堝彴 + ledContent = ledContent.replace("${param}",model.getPlatformName()); + ledContent = ledContent.replace("${param2}",model.getCarCodeFront()); + } + if(sendBroadcast){ + //骞挎挱 param2 = 鏈堝彴 param = 杞︾墝鍙� + broadcastContent = broadcastContent.replace("${param2}",model.getPlatformName()); + broadcastContent = broadcastContent.replace("${param}",model.getCarCodeFront()); + } + List<String> broadcastList = new ArrayList<>(); List<String> ledList = new ArrayList<>(); String bNames = ""; List<PlatformBroadcastLog> logList = new ArrayList<>(); + log.error("寰幆璋冭捣led涓庡箍鎾�------------------------------------------------------------------------------------------"); for(PlatformDevice device : deviceList){ - if(StringUtils.isNotBlank(device.getHkId())){ + if(StringUtils.isBlank(device.getHkId())){ continue; } - if(Constants.equalsInteger(device.getType(),Constants.ZERO)){ + if(Constants.equalsInteger(device.getType(),Constants.ZERO)&&sendLed){ + log.error("璋冭捣led------------------------------------------------------------------------------------------"); //濡傛灉鏄疞ED - PlatformBroadcastLog log = HkSyncPushServiceImpl.dealLedContentBiz(device.getHkNo(),device.getName(),content,speed,1); + PlatformBroadcastLog log = HkSyncPushServiceImpl.dealLedContentBiz(model.getId(),device.getHkNo(),device.getName(),ledContent,speed,1); logList.add(log); ledList.add(device.getHkId()); - }else if(Constants.equalsInteger(device.getType(),Constants.ZERO)){ + }else if(Constants.equalsInteger(device.getType(),Constants.TWO)&&sendBroadcast){ + log.error("璋冭捣骞挎挱------------------------------------------------------------------------------------------"); //濡傛灉鏄箍鎾偣 bNames += device.getName()+";"; broadcastList.add(device.getHkId()); } } if(broadcastList.size()>0){ - PlatformBroadcastLog log = HkSyncPushServiceImpl.dealBroadcastBiz(model,broadcastList,bNames,Constants.PlatformBroadcastContent.WRONG_IN.getInfo()); + PlatformBroadcastLog log = HkSyncPushServiceImpl.dealBroadcastBiz(model,broadcastList,bNames,broadcastContent); logList.add(log); } if(logList.size()>0){ @@ -1140,6 +1180,12 @@ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(), SmsConstants.platformJobContent.platformJobMove,oldPlatform.getName(),platform.getName() ); + + platformJob.setPlatformName(platform.getName()); + this.broadcastAndLEed(platformJob, StringUtils.isBlank(oldPlatform.getLedContent())?Constants.PlatformLedContent.IDEL_CONTNET.getName():oldPlatform.getLedContent(), + null + ); + } @@ -1217,6 +1263,12 @@ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(), SmsConstants.platformJobContent.platformJobError,platform.getName(),null ); + + platformJob.setPlatformName(platform.getName()); + this.broadcastAndLEed(platformJob, StringUtils.isBlank(platform.getLedContent())?Constants.PlatformLedContent.IDEL_CONTNET.getName():platform.getLedContent(), + null + ); + } @@ -1261,7 +1313,13 @@ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(), SmsConstants.platformJobContent.platformJobWorking,platform.getName(),null ); - + + //骞挎挱 led閫氱煡 + platformJob.setPlatformName(platform.getName()); + this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.WORKING.getInfo(), + null + ); + return platformJob; } @@ -1285,7 +1343,6 @@ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�"); } - Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId()); if(Objects.isNull(platform)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏈堝彴淇℃伅"); @@ -1302,22 +1359,51 @@ savePlatformLog(Constants.PlatformJobLogType.DONE.getKey(),oldPlatformJob,platformJob , Constants.PlatformJobLogType.DONE.getInfo()); - if(Constants.equalsInteger(platformJob.getType(),Constants.TWO)){ - //TODO 澶栧崗杞﹁璐� 鏌ヨTMS 鐢靛瓙閿佹儏鍐� + if(Constants.equalsInteger(platformJob.getType(),Constants.THREE)){ + // 澶栧崗杞﹁璐� 鏌ヨTMS 鐢靛瓙閿佹儏鍐� + List<PlatformWmsDetail> details = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>().lambda() + .eq(PlatformWmsDetail::getJobId,platformJob.getId()) + .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO) + ); + if(details!=null && details.size()>0){ + Date date = new Date(); + List<String> codeList =new ArrayList<>(); + for(PlatformWmsDetail d : details){ + codeList.add(d.getIocode()); + } + TmsLockStatusQueryRequest tmsLock = new TmsLockStatusQueryRequest(); + tmsLock.setContractNumbers(codeList); + TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockResult = tmsService.lockStatusQuery(tmsLock); + if(lockResult!=null && lockResult.isSuccess()&& lockResult.getData()!=null ){ + for(TmsLockStatusQueryResponse s : lockResult.getData()){ + platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda() + .eq(PlatformWmsDetail::getIocode,s.getContractNumber()) + .set(PlatformWmsDetail::getEditDate,date) + .set(PlatformWmsDetail::getLockDate,s.getOutDate()) + .set(PlatformWmsDetail::getLockStatus,Constants.ONE) + .eq(PlatformWmsDetail::getJobId,platformJob.getId()) + .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)); + } + } + } }else if(Constants.equalsInteger(platformJob.getType(),Constants.ONE) || Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){ //TODO 澶栧崗杞﹀嵏璐� 鎴栬�� 甯傚叕鍙歌溅鍗歌揣 鍒欐牴鎹换鍔℃儏鍐� } - + + + + //鍙戦�佺煭淇′俊鎭� SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz, emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(), SmsConstants.platformJobContent.platformJobFinish,platform.getName(),null ); - //骞挎挱 led閫氱煡 - this.broadcastAndLEed(platformJob,Constants.PlatformBroadcastContent.DONE.getInfo()); + platformJob.setPlatformName(platform.getName()); + this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.DONE.getInfo(), + Constants.PlatformBroadcastContent.DONE.getInfo()); return platformJob; } @@ -1590,7 +1676,6 @@ .selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName) .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId) .leftJoin(PlatformWmsJob.class,PlatformWmsJob::getJobId,PlatformJob::getId) - .eq(PlatformJob::getPlatformId,platformId) .eq(PlatformJob::getIsdeleted,Constants.ZERO) .in(PlatformJob::getStatus, Constants.PlatformJobStatus.WAIT_CALL.getKey(), @@ -1598,9 +1683,9 @@ Constants.PlatformJobStatus.CALLED.getKey(), Constants.PlatformJobStatus.WORKING.getKey(), Constants.PlatformJobStatus.EXCEPTION.getKey(), - Constants.PlatformJobStatus.OVER_NUMBER.getKey() + Constants.PlatformJobStatus.OVER_NUMBER.getKey(), + Constants.PlatformJobStatus.TRANSFERING.getKey() ) - .like(PlatformJob::getArriveDate, DateUtil.getCurrDate()) .orderByDesc(PlatformJob::getId) ); for (PlatformJob platformJob:platformJobList) { @@ -1690,7 +1775,7 @@ if (Objects.isNull(platformJob.getWorkNum()) || Objects.isNull(platformJob.getWorkRate())) { platformDataListResponse.setFinishTime(null); } else { - Integer workMinute = platformJob.getWorkNum().multiply(new BigDecimal(60)).divide(platformJob.getWorkRate()).intValue(); + Integer workMinute = platformJob.getWorkNum().multiply(new BigDecimal(60)).divide(platformJob.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue(); Date overDate = DateUtil.getXMinuteAfterDate(platformJob.getNewStartDate(), workMinute); platformDataListResponse.setFinishTime(overDate); } @@ -1860,10 +1945,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(), @@ -1875,18 +1963,19 @@ ); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){ for (PlatformJob platformJob:platformJobList) { + //杞︾墝鍙疯劚鏁� + platformJob.setCarCodeFront(Constants.carCodeTuominStr(platformJob.getCarCodeFront())); if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){ //璁$畻宸蹭綔涓氭椂闀� 鏍规嵁鏈堝彴宸ヤ綔鏁堢巼 璁$畻浠诲姟閲忛渶瑕佹椂闂� if(Objects.isNull(platformJob.getWorkNum()) || Objects.isNull(platformJob.getWorkRate())){ platformJob.setOptTime(0L); }else{ - Integer workMinute = platformJob.getWorkNum().multiply(new BigDecimal(60)).divide(platformJob.getWorkRate()).intValue(); + Integer workMinute = platformJob.getWorkNum().multiply(new BigDecimal(60)).divide(platformJob.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue(); Date overDate = DateUtil.getXMinuteAfterDate(platformJob.getNewStartDate(),workMinute); platformJob.setOptTime(overDate.getTime()); } }else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){ - //璁$畻宸插彨鍙锋椂闂� - platformJob.dealTime(); + platformJob.setOptTime(DateUtil.getXMinuteAfterDate(platformJob.getNewCallDate(),platformJob.getWorktimeOutAlarmTime()).getTime()); } } largeScreenDataVO.setAllList(platformJobList); @@ -1899,6 +1988,104 @@ } + /** + * 浣滀笟瀹屾垚瓒呮椂 + */ + @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.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()) + .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( ( 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 ) ,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.getKey()) + .isNotNull(PlatformJob::getCallDate) + ); + //濡傛灉瓒呮椂 澶勭悊鏁版嵁 骞跺彂閫乴ed涓庡箍鎾� + for (PlatformJob platformJob:platformJobList) { + JobOperateDTO jobOperateDTO = new JobOperateDTO(); + jobOperateDTO.setJobId(platformJob.getId()); + this.platformOverNumber(jobOperateDTO); + this.cancelInPark(platformJob); + } + } + + + /** + * 浣滀笟瓒呮椂 + */ + @Override + public void timeOutWork(){ + //鏌ヨ瓒呮椂鏁版嵁 + List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>() + .selectAll(PlatformJob.class) + .selectAs(Platform::getName,PlatformJob::getPlatformName) + .selectAs(Platform::getWorkRate, PlatformJob::getWorkRate) + .selectAs(Platform::getWorkTimeoutAlarmTime, 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 ") + .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId) + .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey()) + .eq(PlatformJob::getInOut,Constants.ONE) + ); + //濡傛灉瓒呮椂 澶勭悊鏁版嵁 骞跺彂閫乴ed涓庡箍鎾� + for (PlatformJob platformJob:platformJobList) { + + Integer workMinute = platformJob.getWorkNum().multiply(new BigDecimal(60)).divide(platformJob.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue(); + Date overDate = DateUtil.getXMinuteAfterDate(platformJob.getNewStartDate(),workMinute + platformJob.getWorktimeOutAlarmTime()); + if(overDate.getTime() < System.currentTimeMillis() ){ + //骞挎挱 led閫氱煡 + this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.TIMEOUT_WORK.getInfo(), + Constants.PlatformBroadcastContent.TIMEOUT_WORK.getInfo()); + + SavePlatformWarnEventDTO savePlatformWarnEventDTO = new SavePlatformWarnEventDTO(); + savePlatformWarnEventDTO.setPlatformJobId(platformJob.getId()); + savePlatformWarnEventDTO.setPlatformId(platformJob.getPlatformId()); + savePlatformWarnEventDTO.setCarCode(platformJob.getCarCodeFront()); + savePlatformWarnEventDTO.setEventType(Constants.PlatformWarnEvent.WORK_TIMEOUT.getKey()); + platformWarnEventService.savePlatformWarnEvent(savePlatformWarnEventDTO); + } + + } + } + -- Gitblit v1.9.3