From 7161f1002609e1d9db0a18fe0f6833c23c391c65 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 25 九月 2024 17:44:35 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 881 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 766 insertions(+), 115 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 2544ffb..771f5c1 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
@@ -4,6 +4,13 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.CarChargeAddRequest;
+import com.doumee.core.haikang.model.param.request.ParkReservationAddRequest;
+import com.doumee.core.haikang.model.param.request.ParkReservationDelRequest;
+import com.doumee.core.haikang.model.param.respose.ParkReservationAddResponse;
+import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -15,12 +22,13 @@
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.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;
@@ -33,9 +41,11 @@
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;
@@ -61,6 +71,9 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private PlatformWmsDetailMapper platformWmsDetailMapper;
+
@Autowired
private PlatformJoinMapper platformJoinMapper;
@@ -72,13 +85,16 @@
private PlatformWmsJobMapper platformWmsJobMapper;
@Autowired
- private PlatformWmsDetailMapper platformWmsDetailMapper;
-
- @Autowired
private PlatformGroupMapper platformGroupMapper;
@Autowired
private PlatformShowParamMapper platformShowParamMapper;
+
+ @Autowired
+ private ParksMapper parksMapper;
+
+ @Autowired
+ private VisitParkMapper visitParkMapper;
@Override
@@ -90,6 +106,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
@@ -146,8 +171,14 @@
queryWrapper
.selectAll(PlatformJob.class)
.selectAs(Platform::getName,PlatformJob::getPlatformName)
+ .selectAs(PlatformGroup::getName,PlatformJob::getPlatformGroupName)
.selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
+ .selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)
+ .selectAs(SystemUser::getUsername,PlatformJob::getOutUserName)
.leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId)
+ .leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
+ .leftJoin(SystemUser.class,SystemUser::getId,PlatformJob::getOutUserId)
.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()))
@@ -221,6 +252,15 @@
.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()))
+
+ .ge(pageWrap.getModel().getCreateDateStart() != null, PlatformJob::getStartDate, Utils.Date.getStart(pageWrap.getModel().getCreateDateStart()))
+ .le(pageWrap.getModel().getCreateDateEnd() != null, PlatformJob::getStartDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDateEnd()))
+ .eq(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getJobType()), PlatformJob::getType, Constants.platformJobType.sgscxh)
+ .ne(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()), PlatformJob::getType, Constants.platformJobType.sgscxh)
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
@@ -234,21 +274,77 @@
platformJobIPage.getRecords().forEach(i->{
i.dealTime();
this.getWmsJobData(i);
+ this.queryWaitNum(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;
+ }
+
+
+
+ @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()
+// )
+
+ .apply(Objects.nonNull(pageWrap.getModel().getCallType())
+ &&Constants.equalsInteger(pageWrap.getModel().getCallType(),Constants.ONE),
+ " ( " +
+ " ( t.`STATUS` = "+Constants.PlatformJobStatus.WAIT_CALL.getKey()+" and t.PLATFORM_GROUP_ID = ( SELECT p.group_id FROM platform p WHERE p.id = "+pageWrap.getModel().getPlatformId()+" LIMIT 1 ) )" +
+ ") "
+ )
+
+
+ .apply(Objects.nonNull(pageWrap.getModel().getCallType())
+ &&Constants.equalsInteger(pageWrap.getModel().getCallType(),Constants.TWO),
+ " ( " +
+ " ( t.`STATUS` = "+Constants.PlatformJobStatus.WAIT_CALL.getKey()+" and t.PLATFORM_GROUP_ID = ( SELECT p.group_id FROM platform p WHERE p.id = "+pageWrap.getModel().getPlatformId()+" LIMIT 1 ) )" +
+ " or " +
+ " (t.`STATUS` = "+Constants.PlatformJobStatus.IN_WAIT.getKey()+" and t.PLATFORM_ID = "+pageWrap.getModel().getPlatformId()+" )" +
+ " or " +
+ " (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.sgscxh)) {
+ || 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)
@@ -283,31 +379,36 @@
,Constants.PlatformJobStatus.TRANSFERING.getKey())
.gt(PlatformJob::getSignDate,platformJob.getSignDate())
.eq(PlatformJob::getPlatformGroupId,platformJob.getPlatformGroupId())
- .like(PlatformJob::getArriveDate,DateUtil.getDate(platformJob.getArriveDate(),"yyyy-MM-dd")));
+ .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());
}
- //璁＄畻棰勮绛夊緟鏃堕棿
- 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(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);
}
- 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())){
+ }else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())
+ || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){
//鏌ヨ鏈�鍚庡紑濮嬩换鍔＄殑鏈堝彴璁板綍 鏃ュ織琛� 鍥犱负瀛樺湪寮傚父鎸傝捣 杞Щ 绛夐棶棰�
PlatformLog platformLog = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda()
.eq(PlatformLog::getJobId,platformJob.getId())
@@ -319,6 +420,15 @@
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));
+
+
}
}
@@ -334,7 +444,6 @@
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)
@@ -342,7 +451,7 @@
.leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.eq(PlatformJob::getDrivierPhone,loginUserInfo.getMobile())
- .like(PlatformJob::getArriveDate,DateUtil.getCurrDate())
+// .like(PlatformJob::getArriveDate,DateUtil.getCurrDate())
.orderByDesc(PlatformJob::getId)
);
for (PlatformJob platformJob:platformJobList) {
@@ -359,10 +468,45 @@
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.setConfirmTaskDate(new Date());
+ platformJob.setArriveDate(confirmTaskDTO.getArriveDate());
+ platformJob.setCarCodeBack(confirmTaskDTO.getCarCodeBack());
+ 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());
+ }
/**
* 璺濈绛惧埌
@@ -380,46 +524,62 @@
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)){
+ if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓氬姟鐘舵�佸凡娴佽浆锛岃鍒锋柊鏌ョ湅");
+ }
this.distanceSignIn(signInDTO,platformJob);
}else if(Constants.equalsInteger(signInDTO.getSignType(),Constants.ONE)){
+ if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓氬姟鐘舵�佸凡娴佽浆锛岃鍒锋柊鏌ョ湅");
+ }
this.sceneSignIn(signInDTO);
+ }else if(Constants.equalsInteger(signInDTO.getSignType(),Constants.TWO)){
+ if(!(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())||
+ Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey()))
+ ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓氬姟鐘舵�佸凡娴佽浆锛岃鍒锋柊鏌ョ湅");
+ }
+ platformJob.setArriveDate(Objects.isNull(platformJob.getArriveDate())?new Date():null);
+ platformJob.setConfirmTaskDate(Objects.isNull(platformJob.getConfirmTaskDate())?new Date():null);
+ }else{
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"绛惧埌绫诲瀷閿欒");
}
platformJob.setSignDate(new Date());
- platformJob.setSingType(Constants.ZERO);
+ platformJob.setSingType(signInDTO.getSignType());
platformJob.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());
platformJobMapper.updateById(platformJob);
//瀛樺偍鎿嶄綔鏃ュ織
- savePlatformLog(Constants.PlatformJobStatus.WAIT_CALL.getKey(),oldPlatformJob,platformJob);
+ savePlatformLog(Constants.PlatformJobLogType.SIGN.getKey(),oldPlatformJob,platformJob,
+ Constants.PlatformJobLogType.SIGN.getInfo());
}
-
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涓偣鐨勮窛绂籜绫�
+ //鑾峰彇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));
}
public void sceneSignIn(SignInDTO signInDTO){
+
if( StringUtils.isNotBlank(signInDTO.getQrCodeKey())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -483,6 +643,9 @@
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(Constants.equalsInteger(lineUpDetailDTO.getQueryType(),Constants.ZERO)
,PlatformJob::getDrivierPhone,lineUpDetailDTO.getMobile())
@@ -495,36 +658,45 @@
);
//鑾峰彇鎵�鏈夋湀鍙扮粍
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));
+ 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) {
+ for (PlatformGroup platformGroup:platformGroupList) {
//鏌ヨ鏈湀鍙扮粍涓� 鑷繁鐨勬暟鎹� 鏈�鏃╃鍒扮殑
- PlatformJob platformJob = platformJobList.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),platform.getId())).findFirst().orElse(null);
+ 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(Platform::getName,PlatformJob::getPlatformName)
+ .selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
.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"))
+ .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(Platform::getName,PlatformJob::getPlatformName)
+ .selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
- .eq(PlatformJob::getPlatformGroupId,platform.getGroupId())
+ .eq(PlatformJob::getPlatformGroupId,platformGroup.getId())
.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
.orderByDesc(PlatformJob::getSignDate));
- platform.setWorkJobList(platformJobWorkList);
+ platformGroup.setWorkJobList(platformJobWorkList);
}
- lineUpVO.setPlatformList(platformList);
+ lineUpVO.setPlatformGroupList(platformGroupList);
return lineUpVO;
}
@@ -533,7 +705,7 @@
* 鑾峰彇宸蹭綔涓氭椂闂�
* @param platformJob
*/
- public void getWorkTime(PlatformJob 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())
@@ -561,6 +733,7 @@
}
}
platformJob.setWorkTime(optTime);
+ return optTime;
}
/**
@@ -568,9 +741,10 @@
*/
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void platformInPark(JobOperateDTO jobOperateDTO){
+ public PlatformJob platformInPark(JobOperateDTO jobOperateDTO){
if(Objects.isNull(jobOperateDTO)
- || Objects.isNull(jobOperateDTO.getJobId())){
+ || Objects.isNull(jobOperateDTO.getJobId())
+ || Objects.isNull(jobOperateDTO.getPlatformId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId());
@@ -580,25 +754,136 @@
if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.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(),"鏈煡璇㈠埌鏈堝彴淇℃伅");
+ }
+
+ //鍒ゆ柇鏄惁闇�瑕佸～鍏呰繘鍘�
+ if(StringUtils.isBlank(platformJob.getPlatforms())){
+ platformJob.setPlatforms(jobOperateDTO.getPlatformId().toString());
+ platformJob.setPlatformNames(platform.getName());
+ }else{
+ if(!Constants.equalsInteger(platform.getId(),platformJob.getPlatformId())){
+ platformJob.setPlatforms(platformJob.getPlatforms() + "," +jobOperateDTO.getPlatformId().toString());
+ platformJob.setPlatformNames(platformJob.getPlatformNames() + "," +platform.getName());
+ }
+ }
+
PlatformJob oldPlatformJob = new PlatformJob();
BeanUtils.copyProperties(platformJob,oldPlatformJob);
-
+ platformJob.setPlatformId(platform.getId());
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);
+ savePlatformLog(Constants.PlatformJobLogType.IN_WAIT.getKey(),oldPlatformJob,platformJob,
+ Constants.PlatformJobLogType.IN_WAIT.getInfo());
+ return platformJob;
+ }
+
+
+ @Override
+ public void sendInPark(PlatformJob platformJob){
+ if(Constants.equalsInteger(platformJob.getType(),Constants.TWO)
+ || Constants.equalsInteger(platformJob.getType(),Constants.THREE)
+ || Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){
+ //鏌ヨ褰撳墠鍚敤鐨勫仠杞﹀満
+ List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>()
+ .lambda()
+ .isNotNull(Parks::getHkId)
+ .eq(Parks::getIsdeleted,Constants.ZERO));
+ List<VisitPark> visitParkList = new ArrayList<>();
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(parksList)){
+ Boolean sendStatus = true;
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(parksList)){
+ for (Parks parks:parksList) {
+ VisitPark visitPark = new VisitPark();
+ visitPark.setIsdeleted(Constants.ZERO);
+ visitPark.setCreateDate(new Date());
+ visitPark.setVisitApplyId(platformJob.getId().toString());
+ visitPark.setCarCode(platformJob.getCarCodeFront());
+ visitPark.setParkId(parks.getId().toString());
+ visitPark.setStartTime(new Date());
+ visitPark.setEndTime(DateUtil.getXMinuteAfterDate(visitPark.getStartTime(),Integer.valueOf(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.POWER_MINUTE).getCode())));
+ visitPark.setParkHkId(parks.getHkId());
+ visitPark.setObjType(Constants.ONE);
+
+ ParkReservationAddRequest request = new ParkReservationAddRequest();
+ request.setPlateNo(visitPark.getCarCode());
+ request.setParkSyscode(visitPark.getParkHkId());
+ request.setPhoneNo(platformJob.getDrivierPhone());
+ request.setOwner(platformJob.getDriverName());
+ request.setAllowTimes(Constants.ONE+"");
+ request.setIsCharge(Constants.ONE+"");
+ request.setStartTime(Objects.isNull(visitPark.getStartTime())?DateUtil.getISO8601Timestamp2(new Date()):DateUtil.getISO8601Timestamp2(visitPark.getStartTime()));
+ request.setEndTime(Objects.isNull(visitPark.getEndTime())?"2999-12-31T00:00:00+08:00":DateUtil.getISO8601Timestamp2(visitPark.getEndTime()));
+ BaseResponse response = HKService.parkReservationAddition(request);
+
+ visitPark.setHkDate(new Date());
+ if(response!=null
+ && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ ParkReservationAddResponse parkReservationAddResponse = (ParkReservationAddResponse) response.getData();
+ visitPark.setHkId(parkReservationAddResponse.getReserveOrderNo());
+ visitPark.setHkStatus(Constants.ONE);
+ visitPark.setRemark("鍖呮湡鎴愬姛");
+ }else{
+ visitPark.setHkStatus(Constants.TWO);
+ visitPark.setRemark("鍖呮湡澶辫触~");
+ //涓嬪彂澶辫触 鏍囪涓讳笟鍔＄姸鎬佷负涓嬪彂澶辫触
+ sendStatus = false;
+ }
+ visitParkList.add(visitPark);
+
+ }
+ visitParkMapper.insert(visitParkList);
+ platformJob.setInHkdate(new Date());
+ if(sendStatus){
+ platformJob.setInHkstatus(Constants.TWO);
+ }else{
+ platformJob.setInHkstatus(Constants.THREE);
+ }
+ platformJobMapper.updateById(platformJob);
+ }
+
+ }
+ }
+ }
+
+
+ @Override
+ public void cancelInPark(PlatformJob platformJob){
+ if(Constants.equalsInteger(platformJob.getType(),Constants.TWO)
+ || Constants.equalsInteger(platformJob.getType(),Constants.THREE)
+ || Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){
+
+ List<VisitPark> visitParkList = visitParkMapper.selectList(new QueryWrapper<VisitPark>().lambda()
+ .eq(VisitPark::getVisitApplyId,platformJob.getId())
+ .eq(VisitPark::getObjType,Constants.ONE)
+ .eq(VisitPark::getHkStatus,Constants.ONE)
+ .isNotNull(VisitPark::getHkId)
+ .apply(" END_TIME > now() ")
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(visitParkList)){
+ for (VisitPark visitPark:visitParkList) {
+ ParkReservationDelRequest param = new ParkReservationDelRequest();
+ param.setReserveOrderNo(visitPark.getHkId());
+ BaseResponse response = HKService.parkReservationDeletion(param);
+ if(response!=null
+ && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ visitPark.setHkStatus(Constants.THREE);
+ visitPark.setIsdeleted(Constants.ONE);
+ visitPark.setEditDate(new Date());
+ visitParkMapper.updateById(visitPark);
+ }
+ }
+ }
+ }
}
/**
@@ -606,7 +891,7 @@
*/
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void platformCallNumber(JobOperateDTO jobOperateDTO){
+ public PlatformJob platformCallNumber(JobOperateDTO jobOperateDTO){
if(Objects.isNull(jobOperateDTO)
|| Objects.isNull(jobOperateDTO.getJobId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -621,17 +906,43 @@
) ){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
}
+
+ Platform platform = platformJoinMapper.selectById(jobOperateDTO.getPlatformId());
+ if(Objects.isNull(platform)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏈堝彴淇℃伅");
+ }
+
+ //鏌ヨ鏈堝彴浠诲姟绛夊緟浣滀笟鏁伴噺
+ if(platformJobMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
+ .eq(PlatformJob::getPlatformId,platform.getId())
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey(),Constants.PlatformJobStatus.WORKING.getKey())
+ )>platform.getWorkingNum()){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瓒呭嚭鏈堝彴鍙悓鏃朵綔涓氭暟閲廩"+platform.getWorkingNum()+"杈哴");
+ };
PlatformJob oldPlatformJob = new PlatformJob();
BeanUtils.copyProperties(platformJob,oldPlatformJob);
- platformJob.setCallDate(new Date());
+ platformJob.setCallDate(Objects.isNull(platformJob.getCallDate())?new Date():null);
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{
+ if(!Constants.equalsInteger(platform.getId(),platformJob.getPlatformId())){
+ platformJob.setPlatforms(platformJob.getPlatforms() + "," +jobOperateDTO.getPlatformId().toString());
+ platformJob.setPlatformNames(platformJob.getPlatformNames() + "," +platform.getName());
+ }
+ }
platformJob.setEditDate(new Date());
platformJobMapper.updateById(platformJob);
//瀛樺偍鎿嶄綔鏃ュ織
- savePlatformLog(Constants.PlatformJobStatus.CALLED.getKey(),oldPlatformJob,platformJob);
+ savePlatformLog(Constants.PlatformJobLogType.CALLED.getKey(),oldPlatformJob,platformJob,
+ Constants.PlatformJobLogType.CALLED.getInfo().replace("{data}",platform.getName()));
+ return platformJob;
}
@@ -659,9 +970,18 @@
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());
@@ -672,7 +992,8 @@
//TODO 璋冭捣WMS 閫氱煡鏈堝彴杞Щ
//瀛樺偍鎿嶄綔鏃ュ織
- savePlatformLog(Constants.PlatformJobStatus.TRANSFERING.getKey(),oldPlatformJob,platformJob);
+ savePlatformLog(Constants.PlatformJobLogType.TRANSFERING.getKey(),oldPlatformJob,platformJob,
+ Constants.PlatformJobLogType.TRANSFERING.getInfo().replace("{data}",oldPlatform.getName()));
}
@@ -683,18 +1004,16 @@
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void platformOverNumber(JobOperateDTO jobOperateDTO){
if(Objects.isNull(jobOperateDTO)
- || Objects.isNull(jobOperateDTO.getJobId())
- || Objects.isNull(jobOperateDTO.getPlatformId())){
+ || 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())){
+ if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
}
-
PlatformJob oldPlatformJob = new PlatformJob();
BeanUtils.copyProperties(platformJob,oldPlatformJob);
@@ -702,7 +1021,8 @@
platformJob.setEditDate(new Date());
platformJobMapper.updateById(platformJob);
//瀛樺偍鎿嶄綔鏃ュ織
- savePlatformLog(Constants.PlatformJobStatus.WART_SIGN_IN.getKey(),oldPlatformJob,platformJob);
+ savePlatformLog(Constants.PlatformJobLogType.OVER_NUMBER.getKey(),oldPlatformJob,platformJob,
+ Constants.PlatformJobLogType.OVER_NUMBER.getInfo());
}
@@ -715,8 +1035,7 @@
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void platformErr(JobOperateDTO jobOperateDTO){
if(Objects.isNull(jobOperateDTO)
- || Objects.isNull(jobOperateDTO.getJobId())
- || Objects.isNull(jobOperateDTO.getPlatformId())){
+ || Objects.isNull(jobOperateDTO.getJobId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId());
@@ -736,7 +1055,8 @@
platformJob.setEditDate(new Date());
platformJobMapper.updateById(platformJob);
//瀛樺偍鎿嶄綔鏃ュ織
- savePlatformLog(Constants.PlatformJobStatus.EXCEPTION.getKey(),oldPlatformJob,platformJob);
+ savePlatformLog(Constants.PlatformJobLogType.EXCEPTION.getKey(),oldPlatformJob,platformJob,
+ Constants.PlatformJobLogType.EXCEPTION.getInfo());
}
@@ -745,10 +1065,9 @@
*/
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void beginWork(JobOperateDTO jobOperateDTO){
+ public PlatformJob beginWork(JobOperateDTO jobOperateDTO){
if(Objects.isNull(jobOperateDTO)
- || Objects.isNull(jobOperateDTO.getJobId())
- || Objects.isNull(jobOperateDTO.getPlatformId())){
+ || Objects.isNull(jobOperateDTO.getJobId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId());
@@ -758,13 +1077,12 @@
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())
- );
+
+ 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);
@@ -774,8 +1092,12 @@
platformJob.setStatus(Constants.PlatformJobStatus.WORKING.getKey());
platformJob.setEditDate(new Date());
platformJobMapper.updateById(platformJob);
+
//瀛樺偍鎿嶄綔鏃ュ織
- savePlatformLog(Constants.PlatformJobStatus.WORKING.getKey(),oldPlatformJob,platformJob);
+ savePlatformLog(Constants.PlatformJobLogType.WORKING.getKey(),oldPlatformJob,platformJob,
+ Constants.PlatformJobLogType.WORKING.getInfo().replace("{data}",platform.getName()));
+
+ return platformJob;
}
@@ -784,7 +1106,7 @@
*/
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void finishWork(JobOperateDTO jobOperateDTO){
+ public PlatformJob finishWork(JobOperateDTO jobOperateDTO){
if(Objects.isNull(jobOperateDTO)
|| Objects.isNull(jobOperateDTO.getJobId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -800,19 +1122,52 @@
BeanUtils.copyProperties(platformJob,oldPlatformJob);
platformJob.setDoneDate(new Date());
- platformJob.setStatus(Constants.PlatformJobStatus.EXCEPTION.getKey());
+ platformJob.setStatus(Constants.PlatformJobStatus.DONE.getKey());
platformJob.setEditDate(new Date());
platformJobMapper.updateById(platformJob);
//瀛樺偍鎿嶄綔鏃ュ織
- savePlatformLog(Constants.PlatformJobStatus.EXCEPTION.getKey(),oldPlatformJob,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 澶栧崗杞﹀嵏璐� 鎴栬�� 甯傚叕鍙歌溅鍗歌揣 鍒欐牴鎹换鍔℃儏鍐佃繘琛屼笅鍙戠鍥潈闄�
+ //TODO 澶栧崗杞﹀嵏璐� 鎴栬�� 甯傚叕鍙歌溅鍗歌揣 鍒欐牴鎹换鍔℃儏鍐�
}
+ return platformJob;
+ }
+
+
+ /**
+ * 鎺堟潈绂诲洯
+ */
+ @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 鎺堟潈杞﹁締绂诲満鏉冮檺
}
@@ -858,7 +1213,8 @@
platformJob.setEditDate(new Date());
platformJobMapper.updateById(platformJob);
//瀛樺偍鎿嶄綔鏃ュ織
- savePlatformLog(Constants.PlatformJobStatus.WORKING.getKey(),oldPlatformJob,platformJob);
+ savePlatformLog(Constants.PlatformJobLogType.WORKING.getKey(),oldPlatformJob,platformJob ,
+ Constants.PlatformJobLogType.DONE.getInfo());
}
@@ -868,34 +1224,33 @@
* @param platformJobBefor
* @param platformJobAfter
*/
- public void savePlatformLog(Integer objType,PlatformJob platformJobBefor,PlatformJob 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());
- //鏌ヨ鏈�鍚庝竴娆″紑濮嬩綔涓氱殑鏃ュ織
- 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())){
+
+ 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(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.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.PlatformJobStatus.DONE.getKey())){
+ }else if(Constants.equalsInteger(objType,Constants.PlatformJobLogType.TRANSFERING.getKey())){
//鏌ヨ鏈�鍚庝竴娆℃棩蹇楁槸鍚︿负寮傚父鎸傝捣锛屽紓甯告寕璧峰悗鍙繘琛岃浆绉� 濡傛灉杩涜杞Щ閭ｄ箞涓氬姟灏遍渶瑕侀噸鏂拌繘琛屽紑濮嬪氨涓嶉渶瑕佺壒娈婂鐞� 锛屽鏋滀笉鏄紓甯告寕璧疯繘琛屾暟鎹粨鏉� 鍒欑洿鎺ユ煡璇㈡渶鍚庝竴娆″紑濮嬬殑鏃堕棿
PlatformLog lastPlatformLog = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda()
.eq(PlatformLog::getIsdeleted,Constants.ZERO)
@@ -903,15 +1258,51 @@
.orderByDesc(PlatformLog::getCreateDate)
.last(" limit 1 ")
);
- if(Objects.nonNull(lastPlatformLog) && Constants.equalsInteger(lastPlatformLog.getObjType(),Constants.PlatformJobStatus.EXCEPTION.getKey())){
+ 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(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.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");
}
@@ -982,6 +1373,14 @@
.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)
);
@@ -994,4 +1393,256 @@
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);
+ List<PlatformDataWmsInfoResponse> platformDataWmsInfoResponseList = new ArrayList<>();
+ for (PlatformWmsDetail platformWmsDetail:platformWmsDetailList) {
+ PlatformDataWmsInfoResponse platformDataWmsInfoResponse = new PlatformDataWmsInfoResponse();
+ platformDataWmsInfoResponse.setMaterialName(platformWmsDetail.getMaterialName());
+ platformDataWmsInfoResponse.setIoQty(platformWmsDetail.getIoQty());
+ platformDataWmsInfoResponseList.add(platformDataWmsInfoResponse);
+ }
+ response.setPlatformDataWmsInfoResponseList(platformDataWmsInfoResponseList);
+ }
+
+ }
+ }
+ 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