From 6ef869b1adcf3a5bb8e4c3117dc507d173f13fd8 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 18 九月 2024 15:19:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 1173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 1,115 insertions(+), 58 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 a5ec104..0432147 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,6 +1,6 @@
package com.doumee.service.business.impl;
-import cn.hutool.crypto.asymmetric.Sign;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -11,18 +11,17 @@
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.PlatformMapper;
+import com.doumee.dao.business.*;
import com.doumee.dao.business.join.PlatformJobJoinMapper;
-import com.doumee.dao.business.model.Platform;
-import com.doumee.dao.business.model.PlatformBooks;
-import com.doumee.dao.business.model.PlatformJob;
-import com.doumee.dao.business.model.PlatformReason;
-import com.doumee.dao.web.reqeust.JobDetailDTO;
-import com.doumee.dao.web.reqeust.LineUpDetailDTO;
-import com.doumee.dao.web.reqeust.SignInDTO;
+import com.doumee.dao.business.join.PlatformJoinMapper;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.openapi.request.*;
+import com.doumee.dao.openapi.response.*;
+import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.DriverHomeVO;
import com.doumee.dao.web.response.LineUpVO;
+import com.doumee.dao.web.response.PlatformWorkVO;
import com.doumee.service.business.PlatformJobService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -30,12 +29,16 @@
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 org.springframework.web.bind.annotation.RequestBody;
import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -53,13 +56,32 @@
private PlatformJobMapper platformJobMapper;
@Autowired
+ private PlatformDeviceMapper platformDeviceMapper;
+
+ @Autowired
private PlatformJobJoinMapper platformJobJoinMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
- private PlatformMapper platformMapper;
+ private PlatformWmsDetailMapper platformWmsDetailMapper;
+
+
+ @Autowired
+ private PlatformJoinMapper platformJoinMapper;
+
+ @Autowired
+ private PlatformLogMapper platformLogMapper;
+
+ @Autowired
+ private PlatformWmsJobMapper platformWmsJobMapper;
+
+ @Autowired
+ private PlatformGroupMapper platformGroupMapper;
+
+ @Autowired
+ private PlatformShowParamMapper platformShowParamMapper;
@Override
@@ -71,6 +93,15 @@
@Override
public void deleteById(Integer id) {
platformJobMapper.deleteById(id);
+ }
+
+
+ @Override
+ public void delete(Integer id) {
+ platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda()
+ .set(PlatformJob::getIsdeleted,Constants.ONE)
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.CANCEL.getKey())
+ .eq(PlatformJob::getId,id));
}
@Override
@@ -122,9 +153,17 @@
@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)
+ .selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)
+ .selectAs(SystemUser::getUsername,PlatformJob::getOutUserName)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
+ .leftJoin(SystemUser.class,SystemUser::getId,PlatformJob::getOutUserId)
.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()))
@@ -183,8 +222,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()))
@@ -197,7 +236,15 @@
.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())
+
+ .apply(pageWrap.getModel().getQueryStatus() != null, " find_in_set(t.`STATUS`,'"+pageWrap.getModel().getQueryStatus()+"')")
+ .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()))
+ .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)
;
+
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -205,9 +252,152 @@
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);
+ this.queryWaitNum(i);
+ });
+ return PageData.from(platformJobIPage);
}
+
+
+ @Override
+ public PageData<PlatformJob> platformCallList(PageWrap<PlatformJob> pageWrap) {
+ IPage<PlatformJob> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<PlatformJob> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper
+ .selectAll(PlatformJob.class)
+ .selectAs(Platform::getName,PlatformJob::getPlatformName)
+ .selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
+ .selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
+ .eq(pageWrap.getModel().getPlatformGroupId() != null, PlatformJob::getPlatformGroupId, pageWrap.getModel().getPlatformGroupId())
+ .like(pageWrap.getModel().getCarCodeFront() != null, PlatformJob::getCarCodeFront, pageWrap.getModel().getCarCodeFront())
+ .eq(Objects.nonNull(pageWrap.getModel().getCallType())
+ &&Constants.equalsInteger(pageWrap.getModel().getCallType(),Constants.ONE),PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey()
+ )
+ .and(Objects.nonNull(pageWrap.getModel().getCallType())
+ &&Constants.equalsInteger(pageWrap.getModel().getCallType(),Constants.TWO),
+ i->i.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey()).or()
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey()).or()
+ .apply(" ( t.status = "+Constants.PlatformJobStatus.TRANSFERING.getKey()+" and t.PLATFORM_ID = "+pageWrap.getModel().getPlatformId()+" ) ")
+ )
+ .and(Objects.nonNull(pageWrap.getModel().getCallType())
+ &&Constants.equalsInteger(pageWrap.getModel().getCallType(),Constants.THREE),
+ i->i.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey()).or()
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey()).or()
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey()).or()
+ .apply(" ( t.status = "+Constants.PlatformJobStatus.TRANSFERING.getKey()+" and t.PLATFORM_GROUP_ID = "+pageWrap.getModel().getPlatformGroupId()+" ) ")
+ )
+// .like(PlatformJob::getArriveDate,DateUtil.dateTypeToString(new Date(),"yyyy-MM-dd"))
+ .orderByDesc(PlatformJob::getStatus)
+ ;
+ IPage<PlatformJob> platformJobIPage = platformJobJoinMapper.selectJoinPage(page,PlatformJob.class,queryWrapper);
+ platformJobIPage.getRecords().forEach(i->{
+ i.dealTime();
+ this.getWmsJobData(i);
+ this.queryWaitNum(i);
+ });
+ return PageData.from(platformJobIPage);
+ }
+
+
+ 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.wxcxh)
+ || Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.wxczh)) {
+
+ 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.dateTypeToString(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());
+ }
+ if(lineUpNum.size()>Constants.ZERO){
+ //璁＄畻棰勮绛夊緟鏃堕棿
+ 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{
+ platformJob.setWaitTime("绛夊緟鍙彿");
+ }
+ }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"));
+ }
+ //澶勭悊浣滀笟鏃堕暱
+ List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>().lambda()
+ .eq(PlatformLog::getJobId,platformJob.getId())
+ .isNotNull(PlatformLog::getParam3)
+ .ne(PlatformLog::getParam3,Constants.ZERO+"")
+ .orderByDesc(PlatformLog::getCreateDate));
+ platformJob.setWorkTime(platformLogList.stream().map(m->Long.valueOf(m.getParam3())).reduce(Long.valueOf(0),Long::sum));
+
+
+ }
+ }
+
+
@Override
public long count(PlatformJob platformJob) {
QueryWrapper<PlatformJob> wrapper = new QueryWrapper<>(platformJob);
@@ -216,21 +406,71 @@
//TODO
@Override
- public DriverHomeVO getDriverHome(Integer memberId){
+ 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);
+ }
- List<PlatformJob> platformJobList = platformJobMapper.selectList(new QueryWrapper<PlatformJob>()
- .lambda()
- .eq(PlatformJob::getDriverId,memberId)
-// .like(PlatformJob::get)
- .orderByDesc(PlatformJob::getId));
+
driverHomeVO.setPlatformJobList(platformJobList);
+ // 鍥尯瀵艰鍥� 鍥剧墖
+ driverHomeVO.setReservationMap(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.PLATFORM_GUIDEMAP).getCode());
+ // 棰勭害鎸囧崡 鏂囨湰
+ driverHomeVO.setBookingTips(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.PLATFORM_BOOKING_TIPS).getCode());
+ driverHomeVO.setSignDistance(new BigDecimal(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_PLACE_DISTANCE).getCode()));
return driverHomeVO;
}
+
+
+ @Override
+ public void confirmTask(ConfirmTaskDTO confirmTaskDTO){
+ if(Objects.isNull(confirmTaskDTO)
+ || Objects.isNull(confirmTaskDTO.getId())
+ || Objects.isNull(confirmTaskDTO.getArriveDate())
+ || StringUtils.isBlank(confirmTaskDTO.getCarCodeBack())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ PlatformJob platformJob = platformJobMapper.selectById(confirmTaskDTO.getId());
+ if(Objects.isNull(platformJob)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(platformJob.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓氬姟鐘舵�佸凡娴佽浆,鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if(confirmTaskDTO.getArriveDate().getTime()<=System.currentTimeMillis()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"棰勮鍒板巶鏃堕棿蹇呴』澶т簬褰撳墠鏃堕棿");
+ }
+
+ PlatformJob oldPlatformJob = new PlatformJob();
+ BeanUtils.copyProperties(platformJob,oldPlatformJob);
+
+ platformJob.setArriveDate(confirmTaskDTO.getArriveDate());
+ platformJob.setStatus(Constants.PlatformJobStatus.WART_SIGN_IN.getKey());
+ platformJob.setEditDate(new Date());
+ platformJobMapper.updateById(platformJob);
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobLogType.CONFIRM_TASK.getKey(),oldPlatformJob,platformJob ,
+ Constants.PlatformJobLogType.CONFIRM_TASK.getInfo());
+ }
/**
* 璺濈绛惧埌
@@ -251,6 +491,9 @@
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)){
@@ -260,6 +503,9 @@
platformJob.setSingType(Constants.ZERO);
platformJob.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());
platformJobMapper.updateById(platformJob);
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobLogType.SIGN.getKey(),oldPlatformJob,platformJob,
+ Constants.PlatformJobLogType.SIGN.getInfo());
}
@@ -272,12 +518,12 @@
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涓偣鐨勮窛绂籜绫�
+ //鑾峰彇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+"]鍏噷]");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瓒呭嚭鍙鍒拌窛绂伙紝鍙鍒拌窛绂讳负["+distance+"]鍏噷]");
}
platformJob.setSignDistance(BigDecimal.valueOf(getDistanceDouble));
}
@@ -316,22 +562,20 @@
}
}else if( Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())
|| Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())
- ){//鏌ヨ鎺掗槦鎯呭喌
- Long lineUpNum = platformJobMapper.selectCount(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())
- .like(PlatformJob::getArriveDate,DateUtil.getDate(platformJob.getArriveDate(),"yyyy-MM-dd")));
- platformJob.setLineUpNum(lineUpNum);
+ ){
+ //鏌ヨ鍓嶆柟鎺掗槦鏁伴噺
+ this.queryWaitNum(platformJob);
}else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
//浣滀笟鏈堝彴淇℃伅
- Platform platform = platformMapper.selectById(platformJob.getPlatformId());
+ Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId());
if(Objects.nonNull(platform)){
platformJob.setPlatformName(platform.getName());
}
+
}
+ platformJob.dealTime();
+ this.getWorkTime(platformJob);
+ this.getWmsJobData(platformJob);
return platformJob;
}
@@ -348,9 +592,9 @@
List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAll(PlatformJob.class)
- .selectAs(PlatformReason::getGroupId,PlatformJob::getGroupId)
- .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
- .leftJoin(PlatformReason.class,PlatformReason::getId,PlatformBooks::getReasonId)
+ .selectAs(Platform::getName,PlatformJob::getPlatformName)
+ .selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.eq(Constants.equalsInteger(lineUpDetailDTO.getQueryType(),Constants.ZERO)
,PlatformJob::getDrivierPhone,lineUpDetailDTO.getMobile())
@@ -361,46 +605,859 @@
Constants.PlatformJobStatus.CALLED.getKey())
.orderByAsc(PlatformJob::getSignDate)
);
- //鑾峰彇鎵�鏈夋湀鍙�
- List<Integer> platformIdList = platformJobList.stream().map(m->m.getGroupId()).collect(Collectors.toList());
- List<Platform> platformList = platformMapper.selectList(new QueryWrapper<Platform>().lambda()
- .eq(Platform::getIsdeleted,Constants.ZERO)
- .in(Platform::getId,platformIdList));
+ //鑾峰彇鎵�鏈夋湀鍙扮粍
+ List<Integer> platformIdList = platformJobList.stream().map(m->m.getPlatformGroupId()).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(platformIdList)){
+ return lineUpVO;
+ }
+ List<PlatformGroup> platformGroupList = platformGroupMapper.selectList(new QueryWrapper<PlatformGroup>().lambda()
+ .eq(PlatformGroup::getIsdeleted,Constants.ZERO)
+ .in(PlatformGroup::getId,platformIdList));
- for (Platform platform:platformList) {
- //鏌ヨ鏈湀鍙颁笅 鑷繁鐨勬暟鎹� 鏈�鏃╃鍒扮殑
- PlatformJob platformJob = platformJobList.stream().filter(i->Constants.equalsInteger(i.getGroupId(),platform.getId())).findFirst().orElse(null);
- //鏌ヨ鍦ㄥ綋鍓嶆湀鍙颁笅 绛惧埌鎺掗槦杞﹁締鏁版嵁
+ for (PlatformGroup platformGroup:platformGroupList) {
+ //鏌ヨ鏈湀鍙扮粍涓� 鑷繁鐨勬暟鎹� 鏈�鏃╃鍒扮殑
+ PlatformJob platformJob = platformJobList.stream().filter(i->Constants.equalsInteger(i.getPlatformGroupId(),platformGroup.getId())).findFirst().orElse(null);
+ //鏌ヨ鍦ㄥ綋鍓嶆湀鍙扮粍涓� 绛惧埌鎺掗槦杞﹁締鏁版嵁
List<PlatformJob> platformJobSignInList = platformJobJoinMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAll(PlatformJob.class)
- .selectAs(PlatformReason::getGroupId,PlatformJob::getGroupId)
- .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
- .leftJoin(PlatformReason.class,PlatformReason::getId,PlatformBooks::getReasonId)
+ .selectAs(Platform::getName,PlatformJob::getPlatformName)
+ .selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
- .ge(Objects.nonNull(platformJob),PlatformJob::getSignDate,DateUtil.getDate(platformJob.getSignDate(),"yyyy-MM-dd HH:mm:ss"))
+ .eq(PlatformJob::getPlatformGroupId,platformGroup.getId())
+ .ge(Objects.nonNull(platformJob),PlatformJob::getSignDate,DateUtil.dateTypeToString(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);
- //鏌ヨ褰撳墠鏈堝彴涓�
+ platformGroup.setSignJobList(platformJobSignInList);
+ //鏌ヨ褰撳墠鏈堝彴缁勪笅
List<PlatformJob> platformJobWorkList = platformJobJoinMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAll(PlatformJob.class)
- .selectAs(PlatformReason::getGroupId,PlatformJob::getGroupId)
- .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
- .leftJoin(PlatformReason.class,PlatformReason::getId,PlatformBooks::getReasonId)
+ .selectAs(Platform::getName,PlatformJob::getPlatformName)
+ .selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformJob::getPlatformGroupId,platformGroup.getId())
.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
.orderByDesc(PlatformJob::getSignDate));
- platform.setSignJobList(platformJobSignInList);
- platform.setWorkJobList(platformJobWorkList);
+ platformGroup.setWorkJobList(platformJobWorkList);
}
- lineUpVO.setPlatformList(platformList);
+ lineUpVO.setPlatformGroupList(platformGroupList);
return lineUpVO;
}
+ /**
+ * 鑾峰彇宸蹭綔涓氭椂闂�
+ * @param platformJob
+ */
+ public Long 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);
+ return 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.PlatformJobLogType.IN_WAIT.getKey(),oldPlatformJob,platformJob,
+ Constants.PlatformJobLogType.IN_WAIT.getInfo());
+
+ }
+
+ /**
+ * 鏈堝彴鍙彿
+ */
+ @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(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
+ }
+
+ Platform platform = platformJoinMapper.selectById(jobOperateDTO.getPlatformId());
+ if(Objects.isNull(platform)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.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.setPlatformId(jobOperateDTO.getPlatformId());
+ //鍒ゆ柇鏄惁闇�瑕佸～鍏呰繘鍘�
+ if(StringUtils.isBlank(platformJob.getPlatforms())){
+ platformJob.setPlatforms(jobOperateDTO.getPlatformId().toString());
+ platformJob.setPlatformNames(platform.getName());
+ }else{
+ platformJob.setPlatforms(platformJob.getPlatforms() + "," +jobOperateDTO.getPlatformId().toString());
+ platformJob.setPlatformNames(platformJob.getPlatformNames() + "," +platform.getName());
+ }
+ platformJob.setEditDate(new Date());
+ platformJobMapper.updateById(platformJob);
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobLogType.CALLED.getKey(),oldPlatformJob,platformJob,
+ Constants.PlatformJobLogType.CALLED.getInfo().replace("{data}",platform.getName()));
+ }
+
+
+ /**
+ * 杞Щ鏈堝彴
+ * @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(),"鏃犳硶杞Щ鏈湀鍙�");
+ }
+ Platform oldPlatform = platformJoinMapper.selectById(platformJob.getPlatformId());
+
+ Platform platform = platformJoinMapper.selectById(jobOperateDTO.getPlatformId());
+ if(Objects.isNull(platform)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏈堝彴淇℃伅");
+ }
+
+ PlatformJob oldPlatformJob = new PlatformJob();
+ BeanUtils.copyProperties(platformJob,oldPlatformJob);
+
+ platformJob.setPlatforms(platformJob.getPlatforms() + "," +jobOperateDTO.getPlatformId().toString());
+ platformJob.setPlatformNames(platformJob.getPlatformNames() + "," +platform.getName());
+
+ 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.PlatformJobLogType.TRANSFERING.getKey(),oldPlatformJob,platformJob,
+ Constants.PlatformJobLogType.TRANSFERING.getInfo().replace("{data}",oldPlatform.getName()));
+ }
+
+
+ /**
+ * 鏈堝彴杩囧彿
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void platformOverNumber(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.CALLED.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.PlatformJobLogType.OVER_NUMBER.getKey(),oldPlatformJob,platformJob,
+ Constants.PlatformJobLogType.OVER_NUMBER.getInfo());
+
+
+ }
+
+
+ /**
+ * 寮傚父鎸傝捣
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void platformErr(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.setErrorDate(new Date());
+ platformJob.setErrorUserId(jobOperateDTO.getLoginUserInfo().getId());
+ platformJob.setStatus(Constants.PlatformJobStatus.EXCEPTION.getKey());
+ platformJob.setEditDate(new Date());
+ platformJobMapper.updateById(platformJob);
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobLogType.EXCEPTION.getKey(),oldPlatformJob,platformJob,
+ Constants.PlatformJobLogType.EXCEPTION.getInfo());
+ }
+
+
+ /**
+ * 寮�濮嬩綔涓�
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void beginWork(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.CALLED.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
+ }
+
+ Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId());
+ if(Objects.isNull(platform)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.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.PlatformJobLogType.WORKING.getKey(),oldPlatformJob,platformJob,
+ Constants.PlatformJobLogType.WORKING.getInfo().replace("{data}",platform.getName()));
+ }
+
+
+ /**
+ * 瀹屾垚浣滀笟
+ */
+ @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.DONE.getKey());
+ platformJob.setEditDate(new Date());
+ platformJobMapper.updateById(platformJob);
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobLogType.DONE.getKey(),oldPlatformJob,platformJob ,
+ Constants.PlatformJobLogType.DONE.getInfo());
+
+ if(Constants.equalsInteger(platformJob.getType(),Constants.TWO)){
+ //TODO 澶栧崗杞﹁璐� 鏌ヨTMS 鐢靛瓙閿佹儏鍐�
+
+ }else if(Constants.equalsInteger(platformJob.getType(),Constants.ONE) || Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){
+ //TODO 澶栧崗杞﹀嵏璐� 鎴栬�� 甯傚叕鍙歌溅鍗歌揣 鍒欐牴鎹换鍔℃儏鍐佃繘琛屼笅鍙戠鍥潈闄�
+
+ }
+ }
+
+
+ /**
+ * 鎺堟潈绂诲洯
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void powerLevel(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.DONE.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
+ }
+ PlatformJob oldPlatformJob = new PlatformJob();
+ BeanUtils.copyProperties(platformJob,oldPlatformJob);
+ platformJob.setOutUserId(jobOperateDTO.getLoginUserInfo().getId());
+ platformJob.setOutHkdate(new Date());
+ platformJob.setStatus(Constants.PlatformJobStatus.AUTHED_LEAVE.getKey());
+ platformJob.setEditDate(new Date());
+ platformJobMapper.updateById(platformJob);
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobLogType.AUTHED_LEAVE.getKey(),oldPlatformJob,platformJob ,
+ Constants.PlatformJobLogType.AUTHED_LEAVE.getInfo());
+
+ //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.PlatformJobLogType.WORKING.getKey(),oldPlatformJob,platformJob ,
+ Constants.PlatformJobLogType.DONE.getInfo());
+ }
+
+
+ /**
+ * 瀛樺偍鎿嶄綔鏃ュ織
+ * @param objType
+ * @param platformJobBefor
+ * @param platformJobAfter
+ */
+ public void savePlatformLog(Integer objType,PlatformJob platformJobBefor,PlatformJob platformJobAfter,String content){
+ PlatformLog platformLog = new PlatformLog();
+ platformLog.setIsdeleted(Constants.ZERO);
+ platformLog.setCreateDate(new Date());
+ platformLog.setJobId(platformJobAfter.getId());
+ platformLog.setObjType(objType);
+ platformLog.setContent(content);
+ platformLog.setParam4(platformJobAfter.getCarCodeFront());
+ platformLog.setBeforeContent(JSONObject.toJSONString(platformJobBefor));
+ platformLog.setAfterContent(JSONObject.toJSONString(platformJobAfter));
+ platformLog.setObjId(platformJobAfter.getId().toString());
+
+ if(Constants.equalsInteger(objType,Constants.PlatformJobLogType.EXCEPTION.getKey())){
+ //鏌ヨ鏈�鍚庝竴娆″紑濮嬩綔涓氱殑鏃ュ織
+ PlatformLog lastBeginPlatform = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda()
+ .eq(PlatformLog::getIsdeleted,Constants.ZERO)
+ .eq(PlatformLog::getObjType,Constants.PlatformJobLogType.WORKING.getKey())
+ .eq(PlatformLog::getJobId,platformLog.getJobId())
+ .orderByDesc(PlatformLog::getCreateDate)
+ .last(" limit 1 ")
+ );
+ //寮傚父鎸傝捣 涓庤浆绉讳腑 璁板綍鏈 浣滀笟鏃堕棿
+ platformLog.setParam1(lastBeginPlatform.getParam1());
+ platformLog.setParam2(DateUtil.dateTypeToString(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
+ String v = Long.toString((platformLog.getCreateDate().getTime() - DateUtil.StringToDate(lastBeginPlatform.getParam1(),"yyyy-MM-dd HH:mm:ss").getTime() )/ 1000) ;
+ platformLog.setParam3(v);
+ }else if(Constants.equalsInteger(objType,Constants.PlatformJobLogType.TRANSFERING.getKey())){
+ //鏌ヨ鏈�鍚庝竴娆℃棩蹇楁槸鍚︿负寮傚父鎸傝捣锛屽紓甯告寕璧峰悗鍙繘琛岃浆绉� 濡傛灉杩涜杞Щ閭ｄ箞涓氬姟灏遍渶瑕侀噸鏂拌繘琛屽紑濮嬪氨涓嶉渶瑕佺壒娈婂鐞� 锛屽鏋滀笉鏄紓甯告寕璧疯繘琛屾暟鎹粨鏉� 鍒欑洿鎺ユ煡璇㈡渶鍚庝竴娆″紑濮嬬殑鏃堕棿
+ 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(!Constants.equalsInteger(lastPlatformLog.getObjType(),Constants.PlatformJobLogType.EXCEPTION.getKey())){
+ //鏌ヨ鏈�鍚庝竴娆″紑濮嬩綔涓氱殑鏃ュ織
+ PlatformLog lastBeginPlatform = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda()
+ .eq(PlatformLog::getIsdeleted,Constants.ZERO)
+ .eq(PlatformLog::getObjType,Constants.PlatformJobLogType.WORKING.getKey())
+ .eq(PlatformLog::getJobId,platformLog.getJobId())
+ .orderByDesc(PlatformLog::getCreateDate)
+ .last(" limit 1 ")
+ );
+ //寮傚父鎸傝捣 涓庤浆绉讳腑 璁板綍鏈 浣滀笟鏃堕棿
+ platformLog.setParam1(lastBeginPlatform.getParam1());
+ platformLog.setParam2(DateUtil.dateTypeToString(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
+ String v = Long.toString((platformLog.getCreateDate().getTime() - DateUtil.StringToDate(lastBeginPlatform.getParam1(),"yyyy-MM-dd HH:mm:ss").getTime() )/ 1000) ;
+ platformLog.setParam3(v);
+ }else{
+ platformLog.setParam3("0");
+ }
+ }else if(Constants.equalsInteger(objType,Constants.PlatformJobLogType.DONE.getKey())){
+ //鏌ヨ鏈�鍚庝竴娆℃棩蹇楁槸鍚︿负寮傚父鎸傝捣锛屽紓甯告寕璧峰悗鍙繘琛岃浆绉� 濡傛灉杩涜杞Щ閭ｄ箞涓氬姟灏遍渶瑕侀噸鏂拌繘琛屽紑濮嬪氨涓嶉渶瑕佺壒娈婂鐞� 锛屽鏋滀笉鏄紓甯告寕璧疯繘琛屾暟鎹粨鏉� 鍒欑洿鎺ユ煡璇㈡渶鍚庝竴娆″紑濮嬬殑鏃堕棿
+ 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.PlatformJobLogType.EXCEPTION.getKey())){
+ platformLog.setParam3("0");
+ }else{
+ //鏌ヨ鏈�鍚庝竴娆″紑濮嬩綔涓氱殑鏃ュ織
+ PlatformLog lastBeginPlatform = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda()
+ .eq(PlatformLog::getIsdeleted,Constants.ZERO)
+ .eq(PlatformLog::getObjType,Constants.PlatformJobLogType.WORKING.getKey())
+ .eq(PlatformLog::getJobId,platformLog.getJobId())
+ .orderByDesc(PlatformLog::getCreateDate)
+ .last(" limit 1 ")
+ );
+ //闈炲紓甯告寕璧� 鍒欑洿鎺ヨ繃鍘绘渶鍚庝竴娆″紑濮嬩綔涓氱殑鏃ュ織鐨勫紑濮嬫椂闂�
+ platformLog.setParam1(lastBeginPlatform.getParam1());
+ platformLog.setParam2(DateUtil.dateTypeToString(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
+ String v = Long.toString((platformJobAfter.getDoneDate().getTime() - DateUtil.StringToDate(lastBeginPlatform.getParam1(),"yyyy-MM-dd HH:mm:ss").getTime()) / 1000) ;
+ platformLog.setParam3(v);
+ }
+ }else if(Constants.equalsInteger(objType,Constants.PlatformJobLogType.WORKING.getKey())){
+ platformLog.setParam1(DateUtil.dateTypeToString(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
+ platformLog.setParam3("0");
+ }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())
+ .in(PlatformJob::getStatus,
+ Constants.PlatformJobStatus.WAIT_CALL.getKey(),
+ Constants.PlatformJobStatus.IN_WAIT.getKey(),
+ Constants.PlatformJobStatus.CALLED.getKey(),
+ Constants.PlatformJobStatus.WORKING.getKey(),
+ Constants.PlatformJobStatus.EXCEPTION.getKey(),
+ Constants.PlatformJobStatus.OVER_NUMBER.getKey()
+ )
+ .like(PlatformJob::getArriveDate, DateUtil.getCurrDate())
+ .orderByDesc(PlatformJob::getId)
+ );
+ for (PlatformJob platformJob:platformJobList) {
+ //澶勭悊WSM鏁伴噺
+ this.getWmsJobData(platformJob);
+ //鏌ヨ鍓嶆柟鎺掗槦鏁伴噺
+ this.queryWaitNum(platformJob);
+ }
+ platform.setWorkJobList(platformJobList);
+ }
+
+ @Override
+ public PlatformWorkVO getPlatformWorkVOById(Integer platformId){
+ //鑾峰彇鏈堝彴涓嬬殑鎵�鏈変綔涓氭暟鎹�
+ 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,platformId)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .in(PlatformJob::getStatus,
+ Constants.PlatformJobStatus.WAIT_CALL.getKey(),
+ Constants.PlatformJobStatus.IN_WAIT.getKey(),
+ Constants.PlatformJobStatus.CALLED.getKey(),
+ Constants.PlatformJobStatus.WORKING.getKey(),
+ Constants.PlatformJobStatus.EXCEPTION.getKey(),
+ Constants.PlatformJobStatus.OVER_NUMBER.getKey()
+ )
+ .like(PlatformJob::getArriveDate, DateUtil.getCurrDate())
+ .orderByDesc(PlatformJob::getId)
+ );
+ for (PlatformJob platformJob:platformJobList) {
+ //澶勭悊WSM鏁伴噺
+ this.getWmsJobData(platformJob);
+ //鏌ヨ鍓嶆柟鎺掗槦鏁伴噺
+ this.queryWaitNum(platformJob);
+ }
+ PlatformWorkVO platformWorkVO = PlatformGroupServiceImpl.getPlatformWorkVO(platformId,platformJobList);
+ return platformWorkVO;
+ }
+
+
+ @Override
+ public PlatformOrderNumByDateResponse orderNumByDate(PlatformOrderNumByDateRequest param){
+ PlatformOrderNumByDateResponse platformOrderNumByDateResponse = new PlatformOrderNumByDateResponse();
+ Date queryDate = (Objects.nonNull(param)&&Objects.nonNull(param.getTimeInfo()))?param.getTimeInfo():new Date();
+ String queryDateStr = DateUtil.getDate(queryDate,"yyyy-MM-dd");
+ //鏌ヨ浠婃棩鍏ㄩ儴浠诲姟
+ platformOrderNumByDateResponse.setTotalNum(
+ platformJobMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .and(i->
+ i.like(PlatformJob::getDoneDate,queryDateStr)
+ .or().ne(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey())
+ )
+ )
+ );
+ //鏌ヨ浠婃棩瀹屾垚浠诲姟
+ platformOrderNumByDateResponse.setDoneNum(
+ platformJobMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .like(PlatformJob::getDoneDate,queryDateStr)
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey())
+ )
+ );
+ return platformOrderNumByDateResponse;
+ }
+
+
+
+ @Override
+ public List<PlatformDataListResponse> platformWorkingDataList(PlatformDataListRequest param){
+ List<PlatformDataListResponse> platformDataListResponseList = new ArrayList<>();
+ List<Platform> platformList = platformJoinMapper.selectList(
+ new MPJLambdaWrapper<Platform>().eq(Platform::getIsdeleted,Constants.ZERO)
+ .eq(Platform::getStatus,Constants.ZERO)
+ );
+ for (Platform platform:platformList) {
+ PlatformDataListResponse platformDataListResponse = new PlatformDataListResponse();
+ platformDataListResponse.setId(platform.getId());
+ platformDataListResponse.setHkId(platform.getHkId());
+ platformDataListResponse.setName(platform.getName());
+ platformDataListResponse.setWorkStatus(Constants.ZERO);
+ //鏌ヨ褰撳墠浣滀笟杞﹁締
+ PlatformJob platformJob = platformJobMapper.selectOne(new QueryWrapper<PlatformJob>().lambda()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
+ .orderByDesc(PlatformJob::getWorkTime)
+ .last(" limit 1")
+ );
+ if(Objects.nonNull(platformJob)){
+ platformDataListResponse.setCarCode(platformJob.getCarCodeFront());
+ platformDataListResponse.setWorkType(
+ Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.zycxh)
+ ||Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.wxcxh)
+ ||Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.sgscxh)?Constants.ZERO:Constants.ONE
+ );
+ platformDataListResponse.setWorkStatus(Constants.ONE);
+ //鏌ヨ浣滀笟鏃堕暱
+ platformDataListResponse.setWorkTime(
+ this.getWorkTime(platformJob)
+ );
+ }
+ }
+ return platformDataListResponseList;
+ }
+
+ @Override
+ public PlatformDataInfoResponse platformWorkingDataList(PlatformDataInfoRequest param){
+ if(Objects.isNull(param)
+ || Objects.isNull(param.getId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ PlatformDataInfoResponse response = new PlatformDataInfoResponse();
+ Platform platform = platformJoinMapper.selectById(param.getId());
+ if(Objects.isNull(platform)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏈堝彴淇℃伅");
+ }
+ response.setId(platform.getId());
+ response.setHkId(platform.getHkId());
+ response.setName(platform.getName());
+
+ PlatformJob platformJob = platformJobJoinMapper.selectJoinOne(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .selectAs(Platform::getName,PlatformJob::getPlatformName)
+ .selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
+ .selectAs(PlatformWmsJob::getId,PlatformJob::getWmsId)
+ .selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)
+ .selectAs(PlatformWmsJob::getRepertotyAddress,PlatformJob::getRepertotyAddress)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
+ .eq(PlatformJob::getPlatformId,platform.getId())
+ .orderByDesc(PlatformJob::getDoneDate)
+ );
+ if(Objects.nonNull(platformJob)){
+ response.setCarCode(platformJob.getCarCodeFront());
+ response.setCarrierName(platformJob.getCarrierName());
+ response.setOrderCode(platformJob.getBillCode());
+ response.setRepertotyAddress(platformJob.getRepertotyAddress());
+ //鏌ヨ渚涘簲鍟嗕俊鎭� 鍙湁瀛樺湪鎵胯繍鍗曞彿鎵嶆湁
+ if(Objects.nonNull(platformJob.getWmsId())){
+ 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)){
+ List<String> stringList = platformWmsDetailList.stream().map(m->m.getInRepertotyCode()).collect(Collectors.toList());
+ response.setInRepertotyCode(stringList);
+ }
+ }
+ }
+ return response;
+ }
+
+
+ @Override
+ public CarNumByStatusResponse carStatusNum(CarNumByStatusRequest param){
+ CarNumByStatusResponse response = new CarNumByStatusResponse();
+ response.setQueuingNum(
+ platformJobMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey())
+ )
+ );
+ response.setInNum(
+ platformJobMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .and(i->i.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey())
+ .or()
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())
+ )
+ )
+ );
+ response.setWorkingNum(
+ platformJobMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
+ )
+ );
+ response.setDoneNum(
+ platformJobMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.LEAVED.getKey())
+ .like(PlatformJob::getOutDate,DateUtil.getDate(new Date(),"yyyy-MM-dd"))
+ )
+ );
+ return response;
+ }
+
+
+ @Override
+ public PlatformQueuingListResponse queueList(PlatformQueuingListRequest param){
+ PlatformQueuingListResponse response = new PlatformQueuingListResponse();
+
+ List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .leftJoin(PlatformGroup.class,PlatformGroup::getId,PlatformJob::getPlatformGroupId)
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey())
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey())
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .isNotNull(PlatformJob::getCarCodeFront)
+ .orderByDesc(PlatformJob::getCreateDate)
+ .eq(PlatformGroup::getType,Constants.ZERO));
+
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){
+ response.setOutboundList(
+ platformJobList.stream().map(m->m.getCarCodeFront()).collect(Collectors.toList())
+ );
+ }
+
+ platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .leftJoin(PlatformGroup.class,PlatformGroup::getId,PlatformJob::getPlatformGroupId)
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey())
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey())
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .isNotNull(PlatformJob::getCarCodeFront)
+ .orderByDesc(PlatformJob::getCreateDate)
+ .eq(PlatformGroup::getType,Constants.ONE));
+
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){
+ response.setInboundList(
+ platformJobList.stream().map(m->m.getCarCodeFront()).collect(Collectors.toList())
+ );
+ }
+
+ platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .leftJoin(PlatformGroup.class,PlatformGroup::getId,PlatformJob::getPlatformGroupId)
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey())
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey())
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .isNotNull(PlatformJob::getCarCodeFront)
+ .orderByDesc(PlatformJob::getCreateDate)
+ .eq(PlatformGroup::getType,Constants.TWO));
+
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){
+ response.setMunicipalComList(
+ platformJobList.stream().map(m->m.getCarCodeFront()).collect(Collectors.toList())
+ );
+ }
+ return response;
+ }
+
+
}
--
Gitblit v1.9.3