From 42f57295f5fe64132c11a25f55cd25c3c8acf167 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 28 八月 2024 15:35:55 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 830 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 823 insertions(+), 7 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 38cfd43..2544ffb 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 @@ -1,20 +1,45 @@ package com.doumee.service.business.impl; +import com.alibaba.fastjson.JSONObject; +import com.doumee.biz.system.SystemDictDataBiz; +import com.doumee.core.constants.ResponseStatus; +import com.doumee.core.exception.BusinessException; +import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; +import com.doumee.core.utils.Constants; +import com.doumee.core.utils.DateUtil; +import com.doumee.core.utils.PositionUtil; import com.doumee.core.utils.Utils; -import com.doumee.dao.business.PlatformJobMapper; -import com.doumee.dao.business.model.PlatformJob; +import com.doumee.dao.business.*; +import com.doumee.dao.business.join.PlatformJobJoinMapper; +import com.doumee.dao.business.join.PlatformJoinMapper; +import com.doumee.dao.business.model.*; +import com.doumee.dao.web.reqeust.JobDetailDTO; +import com.doumee.dao.web.reqeust.JobOperateDTO; +import com.doumee.dao.web.reqeust.LineUpDetailDTO; +import com.doumee.dao.web.reqeust.SignInDTO; +import com.doumee.dao.web.response.DriverHomeVO; +import com.doumee.dao.web.response.LineUpVO; import com.doumee.service.business.PlatformJobService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.Date; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; /** * 鏈堝彴璋冨害浣滀笟淇℃伅琛⊿ervice瀹炵幇 @@ -26,6 +51,35 @@ @Autowired private PlatformJobMapper platformJobMapper; + + @Autowired + private PlatformDeviceMapper platformDeviceMapper; + + @Autowired + private PlatformJobJoinMapper platformJobJoinMapper; + + @Autowired + private SystemDictDataBiz systemDictDataBiz; + + + @Autowired + private PlatformJoinMapper platformJoinMapper; + + @Autowired + private PlatformLogMapper platformLogMapper; + + @Autowired + private PlatformWmsJobMapper platformWmsJobMapper; + + @Autowired + private PlatformWmsDetailMapper platformWmsDetailMapper; + + @Autowired + private PlatformGroupMapper platformGroupMapper; + + @Autowired + private PlatformShowParamMapper platformShowParamMapper; + @Override public Integer create(PlatformJob platformJob) { @@ -87,9 +141,13 @@ @Override public PageData<PlatformJob> findPage(PageWrap<PlatformJob> pageWrap) { IPage<PlatformJob> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); - QueryWrapper<PlatformJob> queryWrapper = new QueryWrapper<>(); + MPJLambdaWrapper<PlatformJob> queryWrapper = new MPJLambdaWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); - queryWrapper.lambda() + queryWrapper + .selectAll(PlatformJob.class) + .selectAs(Platform::getName,PlatformJob::getPlatformName) + .selectAs(Platform::getWorkRate,PlatformJob::getWorkRate) + .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId) .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())) @@ -148,8 +206,8 @@ .ge(pageWrap.getModel().getInHkdate() != null, PlatformJob::getInHkdate, Utils.Date.getStart(pageWrap.getModel().getInHkdate())) .le(pageWrap.getModel().getInHkdate() != null, PlatformJob::getInHkdate, Utils.Date.getEnd(pageWrap.getModel().getInHkdate())) .eq(pageWrap.getModel().getType() != null, PlatformJob::getType, pageWrap.getModel().getType()) - .eq(pageWrap.getModel().getCarCodeFront() != null, PlatformJob::getCarCodeFront, pageWrap.getModel().getCarCodeFront()) - .eq(pageWrap.getModel().getCarCodeBack() != null, PlatformJob::getCarCodeBack, pageWrap.getModel().getCarCodeBack()) + .like(pageWrap.getModel().getCarCodeFront() != null, PlatformJob::getCarCodeFront, pageWrap.getModel().getCarCodeFront()) + .like(pageWrap.getModel().getCarCodeBack() != null, PlatformJob::getCarCodeBack, pageWrap.getModel().getCarCodeBack()) .eq(pageWrap.getModel().getCompanyId() != null, PlatformJob::getCompanyId, pageWrap.getModel().getCompanyId()) .eq(pageWrap.getModel().getCompanyNamePath() != null, PlatformJob::getCompanyNamePath, pageWrap.getModel().getCompanyNamePath()) .ge(pageWrap.getModel().getCancelDate() != null, PlatformJob::getCancelDate, Utils.Date.getStart(pageWrap.getModel().getCancelDate())) @@ -162,7 +220,9 @@ .le(pageWrap.getModel().getArriveDate() != null, PlatformJob::getArriveDate, Utils.Date.getEnd(pageWrap.getModel().getArriveDate())) .eq(pageWrap.getModel().getInType() != null, PlatformJob::getInType, pageWrap.getModel().getInType()) .eq(pageWrap.getModel().getTotalNum() != null, PlatformJob::getTotalNum, pageWrap.getModel().getTotalNum()) + .eq(pageWrap.getModel().getPlatformGroupId() != null, PlatformJob::getPlatformGroupId, pageWrap.getModel().getPlatformGroupId()) ; + for(PageWrap.SortData sortData: pageWrap.getSorts()) { if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) { queryWrapper.orderByDesc(sortData.getProperty()); @@ -170,12 +230,768 @@ queryWrapper.orderByAsc(sortData.getProperty()); } } - return PageData.from(platformJobMapper.selectPage(page, queryWrapper)); + IPage<PlatformJob> platformJobIPage = platformJobJoinMapper.selectJoinPage(page,PlatformJob.class,queryWrapper); + platformJobIPage.getRecords().forEach(i->{ + i.dealTime(); + this.getWmsJobData(i); + }); + return PageData.from(platformJobIPage); +// PageData<PlatformJob> pageData = PageData.from(platformJobMapper.selectPage(page, queryWrapper)); +// pageData.getRecords().forEach(i->{ +// i.dealTime(); +// this.getWmsJobData(i); +// }); +// return pageData; } + + public void getWmsJobData(PlatformJob platformJob){ + if(Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.zycxh) + || Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.zyczh) + || Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.sgscxh)) { + + PlatformWmsJob platformWmsJob = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda() + .eq(PlatformWmsJob::getIsdeleted,Constants.ZERO) + .eq(PlatformWmsJob::getJobId,platformJob.getId()) + .orderByDesc(PlatformWmsJob::getId) + .last(" limit 1") + ); + if(Objects.isNull(platformWmsJob)){ + return; + } + List<PlatformWmsDetail> platformWmsDetailList = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>().lambda() + .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO) + .eq(PlatformWmsDetail::getJobId,platformJob.getId())); + if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformWmsDetailList)){ + platformJob.setTotalNum( + platformWmsDetailList.stream().map(m->m.getIoQty()).reduce(BigDecimal.ZERO,BigDecimal::add) + ); + platformWmsJob.setPlatformWmsDetailList(platformWmsDetailList); + platformJob.setPlatformWmsJob(platformWmsJob); + } + } + } + + + public void queryWaitNum(PlatformJob platformJob){ + if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){ + //鏌ヨ鍓嶆柟鎺掗槦鏁伴噺 + List<PlatformJob> lineUpNum = platformJobMapper.selectList(new QueryWrapper<PlatformJob>().lambda() + .eq(PlatformJob::getIsdeleted,Constants.ZERO) + .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey() + ,Constants.PlatformJobStatus.IN_WAIT.getKey() + ,Constants.PlatformJobStatus.TRANSFERING.getKey()) + .gt(PlatformJob::getSignDate,platformJob.getSignDate()) + .eq(PlatformJob::getPlatformGroupId,platformJob.getPlatformGroupId()) + .like(PlatformJob::getArriveDate,DateUtil.getDate(platformJob.getArriveDate(),"yyyy-MM-dd"))); + platformJob.setLineUpNum(lineUpNum.size()); + BigDecimal sumWorkRate = platformJob.getTotalNum(); + for (PlatformJob linePlatformJob:lineUpNum) { + this.getWmsJobData(linePlatformJob); + sumWorkRate = sumWorkRate.add(linePlatformJob.getTotalNum()); + } + //璁$畻棰勮绛夊緟鏃堕棿 + List<Platform> platformList = platformJoinMapper.selectList(new QueryWrapper<Platform>().lambda().eq(Platform::getIsdeleted,Constants.ZERO).eq(Platform::getGroupId,platformJob.getPlatformGroupId())); + BigDecimal workRate = platformList.stream().map(m->m.getWorkRate()).reduce(BigDecimal.ZERO,BigDecimal::add); + if(sumWorkRate.compareTo(BigDecimal.ZERO) == Constants.ZERO|| workRate.compareTo(BigDecimal.ZERO) == Constants.ZERO ){ + BigDecimal sumMinute = sumWorkRate.divide(workRate,1, RoundingMode.HALF_DOWN).multiply(BigDecimal.valueOf(60L)); + Integer sumMinuteInteger = sumMinute.intValue(); + Integer hours = sumMinuteInteger/60; + Integer minus = sumMinuteInteger%60; + String waitTime = "棰勮绛夊緟锛�"; + if(!Constants.equalsInteger(hours,Constants.ZERO)){ + waitTime = waitTime + hours + "灏忔椂"; + } + if(!Constants.equalsInteger(hours,Constants.ZERO)){ + waitTime = waitTime + minus + "鍒嗛挓"; + } + platformJob.setWaitTime(waitTime); + } + }else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){ + //鏌ヨ鏈�鍚庡紑濮嬩换鍔$殑鏈堝彴璁板綍 鏃ュ織琛� 鍥犱负瀛樺湪寮傚父鎸傝捣 杞Щ 绛夐棶棰� + PlatformLog platformLog = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda() + .eq(PlatformLog::getJobId,platformJob.getId()) + .eq(PlatformLog::getObjType,Constants.PlatformJobStatus.WORKING.getKey()) + .orderByDesc(PlatformLog::getCreateDate) + .last(" limit 1") + ); + if(Objects.nonNull(platformLog)){ + BigDecimal sumMinute = platformJob.getTotalNum().divide(platformJob.getWorkRate(),1, RoundingMode.HALF_DOWN).multiply(BigDecimal.valueOf(60L)); + platformJob.setFinishTimeStr(DateUtil.DateToStr(DateUtil.afterMinutesDate(platformLog.getCreateDate(),sumMinute.intValue()),"HH:mm")); + } + } + } + + @Override public long count(PlatformJob platformJob) { QueryWrapper<PlatformJob> wrapper = new QueryWrapper<>(platformJob); return platformJobMapper.selectCount(wrapper); } + + //TODO + @Override + public DriverHomeVO getDriverHome(LoginUserInfo loginUserInfo){ + DriverHomeVO driverHomeVO = new DriverHomeVO(); + //TODO 杞挱鍥� + + List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>() + .selectAll(PlatformJob.class) + .selectAs(Platform::getName,PlatformJob::getPlatformName) + .selectAs(Platform::getWorkRate,PlatformJob::getWorkRate) + .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId) + .eq(PlatformJob::getIsdeleted,Constants.ZERO) + .eq(PlatformJob::getDrivierPhone,loginUserInfo.getMobile()) + .like(PlatformJob::getArriveDate,DateUtil.getCurrDate()) + .orderByDesc(PlatformJob::getId) + ); + for (PlatformJob platformJob:platformJobList) { + //澶勭悊WSM鏁伴噺 + this.getWmsJobData(platformJob); + //鏌ヨ鍓嶆柟鎺掗槦鏁伴噺 + this.queryWaitNum(platformJob); + } + + + driverHomeVO.setPlatformJobList(platformJobList); + + // 鍥尯瀵艰鍥� 鍥剧墖 + driverHomeVO.setReservationMap(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.PLATFORM_GUIDEMAP).getCode()); + // 棰勭害鎸囧崡 鏂囨湰 + driverHomeVO.setBookingTips(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.PLATFORM_BOOKING_TIPS).getCode()); + + return driverHomeVO; + } + + + /** + * 璺濈绛惧埌 + * @param signInDTO + */ + @Override + @Transactional(rollbackFor = {BusinessException.class,Exception.class}) + public void signIn(SignInDTO signInDTO){ + if(Objects.isNull(signInDTO) + || Objects.isNull(signInDTO.getSignType()) + || Objects.isNull(signInDTO.getJobId())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + PlatformJob platformJob = platformJobMapper.selectById(signInDTO.getJobId()); + if(Objects.isNull(platformJob)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓氬姟鐘舵�佸凡娴佽浆锛岃鍒锋柊鏌ョ湅"); + } + PlatformJob oldPlatformJob = new PlatformJob(); + BeanUtils.copyProperties(platformJob,oldPlatformJob); + + if(Constants.equalsInteger(signInDTO.getSignType(),Constants.ZERO)){ + this.distanceSignIn(signInDTO,platformJob); + }else if(Constants.equalsInteger(signInDTO.getSignType(),Constants.ONE)){ + this.sceneSignIn(signInDTO); + } + platformJob.setSignDate(new Date()); + platformJob.setSingType(Constants.ZERO); + platformJob.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey()); + platformJobMapper.updateById(platformJob); + //瀛樺偍鎿嶄綔鏃ュ織 + savePlatformLog(Constants.PlatformJobStatus.WAIT_CALL.getKey(),oldPlatformJob,platformJob); + } + + + public void distanceSignIn(SignInDTO signInDTO , PlatformJob platformJob){ + if(Objects.isNull(signInDTO.getLat()) + || Objects.isNull(signInDTO.getLnt())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"缁忕含搴︿俊鎭紓甯�"); + } + //鑾峰彇绛惧埌鐐圭殑缁忕含搴� + Double lat = Double.parseDouble(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_PLACE_LAT).getCode()); + Double lnt = Double.parseDouble(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_PLACE_LNT).getCode()); + BigDecimal distance = new BigDecimal(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_PLACE_DISTANCE).getCode()); + //鑾峰彇2涓偣鐨勮窛绂籜绫� + Double getDistanceDouble = PositionUtil.getDistance(signInDTO.getLnt(),signInDTO.getLat(),lnt,lat); + //杞崲km + BigDecimal getDistance = BigDecimal.valueOf(getDistanceDouble).divide(new BigDecimal(1000),2,BigDecimal.ROUND_HALF_UP); + if(distance.compareTo(getDistance)<Constants.ZERO){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瓒呭嚭鍙鍒拌窛绂伙紝鍙鍒拌窛绂籟"+distance+"]鍏噷]"); + } + platformJob.setSignDistance(BigDecimal.valueOf(getDistanceDouble)); + } + + public void sceneSignIn(SignInDTO signInDTO){ + if( StringUtils.isNotBlank(signInDTO.getQrCodeKey())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + if(!signInDTO.getQrCodeKey().equals(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE).getCode())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"浜岀淮鐮佸凡杩囨湡,璇峰埛鏂伴噸璇�"); + } + } + + + @Override + public PlatformJob getDetail(JobDetailDTO jobDetailDTO){ + if(Objects.isNull(jobDetailDTO) + || Objects.isNull(jobDetailDTO.getJobId())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + PlatformJob platformJob = platformJobMapper.selectById(jobDetailDTO.getJobId()); + if(Objects.isNull(platformJob)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())){ + //寰呯鍒� 璁$畻璺濈 + if(Objects.nonNull(jobDetailDTO.getLnt())&&Objects.nonNull(jobDetailDTO.getLat())){ + //鑾峰彇绛惧埌鐐圭殑缁忕含搴� + Double lat = Double.parseDouble(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_PLACE_LAT).getCode()); + Double lnt = Double.parseDouble(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_PLACE_LNT).getCode()); + //鑾峰彇2涓偣鐨勮窛绂籜绫� + Double getDistanceDouble = PositionUtil.getDistance(jobDetailDTO.getLnt(),jobDetailDTO.getLat(),lnt,lat); + //杞崲km + BigDecimal getDistance = BigDecimal.valueOf(getDistanceDouble).divide(new BigDecimal(1000),2,BigDecimal.ROUND_HALF_UP); + platformJob.setGetDistance(getDistance); + } + }else if( Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey()) + || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey()) + ){ + //鏌ヨ鍓嶆柟鎺掗槦鏁伴噺 + this.queryWaitNum(platformJob); + }else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){ + //浣滀笟鏈堝彴淇℃伅 + Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId()); + if(Objects.nonNull(platform)){ + platformJob.setPlatformName(platform.getName()); + } + + } + platformJob.dealTime(); + this.getWorkTime(platformJob); + this.getWmsJobData(platformJob); + return platformJob; + } + + + + @Override + public LineUpVO lineUpDetail(LineUpDetailDTO lineUpDetailDTO){ + if(Objects.isNull(lineUpDetailDTO) + || Objects.isNull(lineUpDetailDTO.getQueryType())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + LineUpVO lineUpVO = new LineUpVO(); + //鏌ヨ鎵�鏈変换鍔� + List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class, + new MPJLambdaWrapper<PlatformJob>() + .selectAll(PlatformJob.class) + .eq(PlatformJob::getIsdeleted,Constants.ZERO) + .eq(Constants.equalsInteger(lineUpDetailDTO.getQueryType(),Constants.ZERO) + ,PlatformJob::getDrivierPhone,lineUpDetailDTO.getMobile()) + .eq(Constants.equalsInteger(lineUpDetailDTO.getQueryType(),Constants.ONE) + ,PlatformJob::getId,lineUpDetailDTO.getJobId()) + .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(), + Constants.PlatformJobStatus.IN_WAIT.getKey(), + Constants.PlatformJobStatus.CALLED.getKey()) + .orderByAsc(PlatformJob::getSignDate) + ); + //鑾峰彇鎵�鏈夋湀鍙扮粍 + List<Integer> platformIdList = platformJobList.stream().map(m->m.getPlatformGroupId()).collect(Collectors.toList()); + List<Platform> platformList = platformJoinMapper.selectList(new QueryWrapper<Platform>().lambda() + .eq(Platform::getIsdeleted,Constants.ZERO) + .in(Platform::getId,platformIdList)); + + for (Platform platform:platformList) { + //鏌ヨ鏈湀鍙扮粍涓� 鑷繁鐨勬暟鎹� 鏈�鏃╃鍒扮殑 + PlatformJob platformJob = platformJobList.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),platform.getId())).findFirst().orElse(null); + //鏌ヨ鍦ㄥ綋鍓嶆湀鍙扮粍涓� 绛惧埌鎺掗槦杞﹁締鏁版嵁 + List<PlatformJob> platformJobSignInList = platformJobJoinMapper.selectJoinList(PlatformJob.class, + new MPJLambdaWrapper<PlatformJob>() + .selectAll(PlatformJob.class) + .eq(PlatformJob::getIsdeleted,Constants.ZERO) + .eq(PlatformJob::getPlatformGroupId,platform.getGroupId()) + .ge(Objects.nonNull(platformJob),PlatformJob::getSignDate,DateUtil.getDate(platformJob.getSignDate(),"yyyy-MM-dd HH:mm:ss")) + .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(), + Constants.PlatformJobStatus.IN_WAIT.getKey(), + Constants.PlatformJobStatus.CALLED.getKey()) + .orderByDesc(PlatformJob::getSignDate)); + platform.setSignJobList(platformJobSignInList); + //鏌ヨ褰撳墠鏈堝彴缁勪笅 + List<PlatformJob> platformJobWorkList = platformJobJoinMapper.selectJoinList(PlatformJob.class, + new MPJLambdaWrapper<PlatformJob>() + .selectAll(PlatformJob.class) + .eq(PlatformJob::getIsdeleted,Constants.ZERO) + .eq(PlatformJob::getPlatformGroupId,platform.getGroupId()) + .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey()) + .orderByDesc(PlatformJob::getSignDate)); + platform.setWorkJobList(platformJobWorkList); + } + lineUpVO.setPlatformList(platformList); + return lineUpVO; + } + + + /** + * 鑾峰彇宸蹭綔涓氭椂闂� + * @param platformJob + */ + public void getWorkTime(PlatformJob platformJob){ + List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>() + .lambda().eq(PlatformLog::getIsdeleted,Constants.ZERO) + .eq(PlatformLog::getJobId,platformJob.getId()) + .ne(PlatformLog::getParam3,"0") + ); + Long optTime = 0L; + if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformLogList)){ + List<Long> param3List = platformLogList.stream().map(m->Long.valueOf(m.getParam3())).collect(Collectors.toList()); + for (Long val:param3List) { + optTime = optTime + val; + } + } + if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){ + //鏌ヨ鏈�鍚庝竴娆″紑濮嬬殑鏃ュ織鏁版嵁 + PlatformLog lastBeginPlatform = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda() + .eq(PlatformLog::getIsdeleted,Constants.ZERO) + .eq(PlatformLog::getObjType,Constants.PlatformJobStatus.WORKING.getKey()) + .eq(PlatformLog::getJobId,platformJob.getId()) + .orderByDesc(PlatformLog::getCreateDate) + .last(" limit 1 ") + ); + if(Objects.nonNull(lastBeginPlatform)){ + String v = Long.toString(System.currentTimeMillis() - lastBeginPlatform.getCreateDate().getTime() / 1000) ; + optTime = optTime + Long.valueOf(v); + } + } + platformJob.setWorkTime(optTime); + } + + /** + * 閫氱煡鍏ュ洯 + */ + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public void platformInPark(JobOperateDTO jobOperateDTO){ + if(Objects.isNull(jobOperateDTO) + || Objects.isNull(jobOperateDTO.getJobId())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId()); + if(Objects.isNull(platformJob)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�"); + } + PlatformJob oldPlatformJob = new PlatformJob(); + BeanUtils.copyProperties(platformJob,oldPlatformJob); + + platformJob.setInwaitDate(new Date()); + platformJob.setInwaitUserId(jobOperateDTO.getLoginUserInfo().getId()); + platformJob.setStatus(Constants.PlatformJobStatus.IN_WAIT.getKey()); + platformJob.setEditDate(new Date()); + platformJobMapper.updateById(platformJob); + + if(Constants.equalsInteger(platformJob.getType(),Constants.TWO) + || Constants.equalsInteger(platformJob.getType(),Constants.THREE) + || Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){ + //TODO 涓嬪彂鍏ュ洯鏉冮檺 + + } + + //瀛樺偍鎿嶄綔鏃ュ織 + savePlatformLog(Constants.PlatformJobStatus.WAIT_CALL.getKey(),oldPlatformJob,platformJob); + + } + + /** + * 鏈堝彴鍙彿 + */ + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public void platformCallNumber(JobOperateDTO jobOperateDTO){ + if(Objects.isNull(jobOperateDTO) + || Objects.isNull(jobOperateDTO.getJobId())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId()); + if(Objects.isNull(platformJob)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(!(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey()) + || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey()) + || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey()) + ) ){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�"); + } + + PlatformJob oldPlatformJob = new PlatformJob(); + BeanUtils.copyProperties(platformJob,oldPlatformJob); + + platformJob.setCallDate(new Date()); + platformJob.setCallUserId(jobOperateDTO.getLoginUserInfo().getId()); + platformJob.setStatus(Constants.PlatformJobStatus.CALLED.getKey()); + platformJob.setEditDate(new Date()); + platformJobMapper.updateById(platformJob); + //瀛樺偍鎿嶄綔鏃ュ織 + savePlatformLog(Constants.PlatformJobStatus.CALLED.getKey(),oldPlatformJob,platformJob); + } + + + /** + * 杞Щ鏈堝彴 + * @param jobOperateDTO + */ + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public void platformMove(JobOperateDTO jobOperateDTO){ + if(Objects.isNull(jobOperateDTO) + || Objects.isNull(jobOperateDTO.getJobId()) + || Objects.isNull(jobOperateDTO.getPlatformId())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId()); + if(Objects.isNull(platformJob)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if( !( Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey()) + || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey()) + )){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�"); + } + if(Constants.equalsInteger(platformJob.getPlatformId(),jobOperateDTO.getPlatformId())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳硶杞Щ鏈湀鍙�"); + } + + PlatformJob oldPlatformJob = new PlatformJob(); + BeanUtils.copyProperties(platformJob,oldPlatformJob); + + platformJob.setTransPlatformDate(new Date()); + platformJob.setTransPlatformUserId(jobOperateDTO.getLoginUserInfo().getId()); + platformJob.setPlatformId(jobOperateDTO.getPlatformId()); + platformJob.setStatus(Constants.PlatformJobStatus.TRANSFERING.getKey()); + platformJob.setEditDate(new Date()); + platformJobMapper.updateById(platformJob); + + //TODO 璋冭捣WMS 閫氱煡鏈堝彴杞Щ + //瀛樺偍鎿嶄綔鏃ュ織 + savePlatformLog(Constants.PlatformJobStatus.TRANSFERING.getKey(),oldPlatformJob,platformJob); + } + + + /** + * 鏈堝彴杩囧彿 + */ + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public void platformOverNumber(JobOperateDTO jobOperateDTO){ + if(Objects.isNull(jobOperateDTO) + || Objects.isNull(jobOperateDTO.getJobId()) + || Objects.isNull(jobOperateDTO.getPlatformId())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId()); + if(Objects.isNull(platformJob)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�"); + } + + PlatformJob oldPlatformJob = new PlatformJob(); + BeanUtils.copyProperties(platformJob,oldPlatformJob); + + platformJob.setStatus(Constants.PlatformJobStatus.WART_SIGN_IN.getKey()); + platformJob.setEditDate(new Date()); + platformJobMapper.updateById(platformJob); + //瀛樺偍鎿嶄綔鏃ュ織 + savePlatformLog(Constants.PlatformJobStatus.WART_SIGN_IN.getKey(),oldPlatformJob,platformJob); + + + } + + + /** + * 寮傚父鎸傝捣 + */ + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public void platformErr(JobOperateDTO jobOperateDTO){ + if(Objects.isNull(jobOperateDTO) + || Objects.isNull(jobOperateDTO.getJobId()) + || Objects.isNull(jobOperateDTO.getPlatformId())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId()); + if(Objects.isNull(platformJob)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�"); + } + + PlatformJob oldPlatformJob = new PlatformJob(); + BeanUtils.copyProperties(platformJob,oldPlatformJob); + + platformJob.setErrorDate(new Date()); + platformJob.setErrorUserId(jobOperateDTO.getLoginUserInfo().getId()); + platformJob.setStatus(Constants.PlatformJobStatus.EXCEPTION.getKey()); + platformJob.setEditDate(new Date()); + platformJobMapper.updateById(platformJob); + //瀛樺偍鎿嶄綔鏃ュ織 + savePlatformLog(Constants.PlatformJobStatus.EXCEPTION.getKey(),oldPlatformJob,platformJob); + } + + + /** + * 寮�濮嬩綔涓� + */ + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public void beginWork(JobOperateDTO jobOperateDTO){ + if(Objects.isNull(jobOperateDTO) + || Objects.isNull(jobOperateDTO.getJobId()) + || Objects.isNull(jobOperateDTO.getPlatformId())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId()); + if(Objects.isNull(platformJob)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�"); + } + platformJobMapper.update(null,new UpdateWrapper<PlatformJob>() + .lambda() + .set(Objects.isNull(platformJob.getStartDate()),PlatformJob::getStartDate,new Date()) + .set(PlatformJob::getEditDate,new Date()) + .set(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey()) + .eq(PlatformJob::getId,jobOperateDTO.getJobId()) + ); + + PlatformJob oldPlatformJob = new PlatformJob(); + BeanUtils.copyProperties(platformJob,oldPlatformJob); + if(Objects.isNull(platformJob.getStartDate())){ + platformJob.setStartDate(new Date()); + } + platformJob.setStatus(Constants.PlatformJobStatus.WORKING.getKey()); + platformJob.setEditDate(new Date()); + platformJobMapper.updateById(platformJob); + //瀛樺偍鎿嶄綔鏃ュ織 + savePlatformLog(Constants.PlatformJobStatus.WORKING.getKey(),oldPlatformJob,platformJob); + } + + + /** + * 瀹屾垚浣滀笟 + */ + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public void finishWork(JobOperateDTO jobOperateDTO){ + if(Objects.isNull(jobOperateDTO) + || Objects.isNull(jobOperateDTO.getJobId())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId()); + if(Objects.isNull(platformJob)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�"); + } + PlatformJob oldPlatformJob = new PlatformJob(); + BeanUtils.copyProperties(platformJob,oldPlatformJob); + + platformJob.setDoneDate(new Date()); + platformJob.setStatus(Constants.PlatformJobStatus.EXCEPTION.getKey()); + platformJob.setEditDate(new Date()); + platformJobMapper.updateById(platformJob); + //瀛樺偍鎿嶄綔鏃ュ織 + savePlatformLog(Constants.PlatformJobStatus.EXCEPTION.getKey(),oldPlatformJob,platformJob); + + if(Constants.equalsInteger(platformJob.getType(),Constants.TWO)){ + //TODO 澶栧崗杞﹁璐� 鏌ヨTMS 鐢靛瓙閿佹儏鍐� + + }else if(Constants.equalsInteger(platformJob.getType(),Constants.ONE) || Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){ + //TODO 澶栧崗杞﹀嵏璐� 鎴栬�� 甯傚叕鍙歌溅鍗歌揣 鍒欐牴鎹换鍔℃儏鍐佃繘琛屼笅鍙戠鍥潈闄� + + } + } + + + /** + * 鏈堝彴鐩告満鎺ㄩ�� 寮�濮嬩綔涓� + * @param jobOperateDTO + */ + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public void cameraStartWork(JobOperateDTO jobOperateDTO){ + if(Objects.isNull(jobOperateDTO) + || Objects.isNull(jobOperateDTO.getDeviceId()) + || StringUtils.isBlank(jobOperateDTO.getCarCodeBack())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + PlatformDevice platformDevice = platformDeviceMapper.selectOne(new QueryWrapper<PlatformDevice>().lambda() + .eq(PlatformDevice::getIsdeleted,Constants.ZERO) + .eq(PlatformDevice::getDeviceId,jobOperateDTO.getDeviceId()) + .last(" limit 1") + ); + if(Objects.isNull(platformDevice)){ + return; + } + PlatformJob platformJob = platformJobMapper.selectOne(new QueryWrapper<PlatformJob>().lambda() + .eq(PlatformJob::getPlatformId,platformDevice.getPlatformId()) + .eq(PlatformJob::getCarCodeBack,jobOperateDTO.getCarCodeBack()) + .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey()) + .last(" limit 1 ") + ); + if(Objects.isNull(platformJob)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�"); + } + + PlatformJob oldPlatformJob = new PlatformJob(); + BeanUtils.copyProperties(platformJob,oldPlatformJob); + if(Objects.isNull(platformJob.getStartDate())){ + platformJob.setStartDate(new Date()); + } + platformJob.setStatus(Constants.PlatformJobStatus.WORKING.getKey()); + platformJob.setEditDate(new Date()); + platformJobMapper.updateById(platformJob); + //瀛樺偍鎿嶄綔鏃ュ織 + savePlatformLog(Constants.PlatformJobStatus.WORKING.getKey(),oldPlatformJob,platformJob); + } + + + /** + * 瀛樺偍鎿嶄綔鏃ュ織 + * @param objType + * @param platformJobBefor + * @param platformJobAfter + */ + public void savePlatformLog(Integer objType,PlatformJob platformJobBefor,PlatformJob platformJobAfter){ + PlatformLog platformLog = new PlatformLog(); + platformLog.setIsdeleted(Constants.ZERO); + platformLog.setCreateDate(new Date()); + platformLog.setJobId(platformJobAfter.getId()); + platformLog.setObjType(objType); + platformLog.setBeforeContent(JSONObject.toJSONString(platformJobBefor)); + platformLog.setAfterContent(JSONObject.toJSONString(platformJobAfter)); + platformLog.setObjId(platformJobAfter.getId().toString()); + //鏌ヨ鏈�鍚庝竴娆″紑濮嬩綔涓氱殑鏃ュ織 + PlatformLog lastBeginPlatform = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda() + .eq(PlatformLog::getIsdeleted,Constants.ZERO) + .eq(PlatformLog::getObjType,Constants.PlatformJobStatus.WORKING.getKey()) + .eq(PlatformLog::getJobId,platformLog.getJobId()) + .orderByDesc(PlatformLog::getCreateDate) + .last(" limit 1 ") + ); + if(Objects.isNull(lastBeginPlatform)){ + return; + } + if(Constants.equalsInteger(objType,Constants.PlatformJobStatus.EXCEPTION.getKey()) + || Constants.equalsInteger(objType,Constants.PlatformJobStatus.TRANSFERING.getKey())){ + //寮傚父鎸傝捣 涓庤浆绉讳腑 璁板綍鏈 浣滀笟鏃堕棿 + platformLog.setParam1(DateUtil.getDate(lastBeginPlatform.getCreateDate(),"yyyy-MM-dd HH:mm:ss")); + platformLog.setParam2(DateUtil.getDate(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss")); + String v = Long.toString(platformJobAfter.getDoneDate().getTime() - platformJobBefor.getStartDate().getTime() / 1000) ; + platformLog.setParam3(v); + }else if(Constants.equalsInteger(objType,Constants.PlatformJobStatus.DONE.getKey())){ + //鏌ヨ鏈�鍚庝竴娆℃棩蹇楁槸鍚︿负寮傚父鎸傝捣锛屽紓甯告寕璧峰悗鍙繘琛岃浆绉� 濡傛灉杩涜杞Щ閭d箞涓氬姟灏遍渶瑕侀噸鏂拌繘琛屽紑濮嬪氨涓嶉渶瑕佺壒娈婂鐞� 锛屽鏋滀笉鏄紓甯告寕璧疯繘琛屾暟鎹粨鏉� 鍒欑洿鎺ユ煡璇㈡渶鍚庝竴娆″紑濮嬬殑鏃堕棿 + PlatformLog lastPlatformLog = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda() + .eq(PlatformLog::getIsdeleted,Constants.ZERO) + .eq(PlatformLog::getJobId,platformLog.getJobId()) + .orderByDesc(PlatformLog::getCreateDate) + .last(" limit 1 ") + ); + if(Objects.nonNull(lastPlatformLog) && Constants.equalsInteger(lastPlatformLog.getObjType(),Constants.PlatformJobStatus.EXCEPTION.getKey())){ + platformLog.setParam3("0"); + }else{ + //闈炲紓甯告寕璧� 鍒欑洿鎺ヨ繃鍘绘渶鍚庝竴娆″紑濮嬩綔涓氱殑鏃ュ織鐨勫紑濮嬫椂闂� + platformLog.setParam1(DateUtil.getDate(lastBeginPlatform.getCreateDate(),"yyyy-MM-dd HH:mm:ss")); + platformLog.setParam2(DateUtil.getDate(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss")); + String v = Long.toString(platformJobAfter.getDoneDate().getTime() - platformJobBefor.getStartDate().getTime() / 1000) ; + platformLog.setParam3(v); + } + }else{ + platformLog.setParam3("0"); + } + platformLogMapper.insert(platformLog); + } + + + @Override + public List<Platform> getPlatformList(Integer groupId, LoginUserInfo loginUserInfo){ + //鏌ヨ鏈堝彴缁勪笅鎵�鏈夋湀鍙� + List<Platform> allPlatformList = platformJoinMapper.selectJoinList(Platform.class, + new MPJLambdaWrapper<Platform>() + .selectAll(Platform.class) + .select(" ( select count(1) from platform_job pj where t.id = pj.PLATFORM_ID and pj.STATUS = "+Constants.PlatformJobStatus.WORKING.getKey()+" ) as workStatus ") + .eq(Platform::getIsdeleted, Constants.ZERO) + .eq(Platform::getStatus,Constants.ZERO) + .eq(Platform::getGroupId,groupId) + ); + this.getPlatformShow(allPlatformList,loginUserInfo); + for (Platform platform:allPlatformList) { + this.getJobByPlatform(platform,loginUserInfo); + } + return allPlatformList; + } + + /** + * 鏌ヨ鏈堝彴鐨勫紑鍚儏鍐� + * @param allPlatformList + * @param loginUserInfo + */ + public void getPlatformShow(List<Platform> allPlatformList , LoginUserInfo loginUserInfo){ + //澶勭悊鎴戠殑鏈堝彴淇℃伅 鏄惁閰嶇疆闅愯棌 + List<PlatformShowParam> platformShowParamList = platformShowParamMapper.selectList(new QueryWrapper<PlatformShowParam>() + .lambda() + .eq(PlatformShowParam::getIsdeleted, Constants.ZERO) + .eq(PlatformShowParam::getMemberId,loginUserInfo.getMemberId()) + ); + //濡傛灉鏈厤缃鏁版嵁 鍒欏叏閮ㄦ樉绀� + if(CollectionUtils.isEmpty(platformShowParamList)){ + for (Platform platform:allPlatformList) { + platform.setShowConfig(true); + } + }else{ + //鏍规嵁閰嶇疆鏄剧ず鏁版嵁 + for (PlatformShowParam platformShowParam:platformShowParamList) { + for (Platform platform:allPlatformList) { + if(Constants.equalsInteger(platform.getId(),platformShowParam.getPlatformId())){ + platform.setShowConfig(true); + break; + } + } + } + } + } + + + /** + * 鑾峰彇鏈堝彴涓嬬殑浠诲姟鍒楄〃 + * @param platform + * @param loginUserInfo + */ + public void getJobByPlatform(Platform platform,LoginUserInfo loginUserInfo){ + List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>() + .selectAll(PlatformJob.class) + .selectAs(Platform::getName,PlatformJob::getPlatformName) + .selectAs(Platform::getWorkRate,PlatformJob::getWorkRate) + .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId) + .eq(PlatformJob::getPlatformId,platform.getId()) + .eq(PlatformJob::getIsdeleted,Constants.ZERO) + .eq(PlatformJob::getDrivierPhone,loginUserInfo.getMobile()) + .like(PlatformJob::getArriveDate, DateUtil.getCurrDate()) + .orderByDesc(PlatformJob::getId) + ); + for (PlatformJob platformJob:platformJobList) { + //澶勭悊WSM鏁伴噺 + this.getWmsJobData(platformJob); + //鏌ヨ鍓嶆柟鎺掗槦鏁伴噺 + this.queryWaitNum(platformJob); + } + platform.setWorkJobList(platformJobList); + } + } -- Gitblit v1.9.3