From 17efddc6a667670dca682bf36b51a43e99615e6d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 十月 2024 15:59:38 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 632 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 573 insertions(+), 59 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 11d0117..30c9d7c 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,17 +4,21 @@
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.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;
-import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DateUtil;
-import com.doumee.core.utils.PositionUtil;
-import com.doumee.core.utils.Utils;
+import com.doumee.core.utils.*;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.PlatformJobJoinMapper;
import com.doumee.dao.business.join.PlatformJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.vo.LargeScreenDataVO;
import com.doumee.dao.openapi.request.*;
import com.doumee.dao.openapi.response.*;
import com.doumee.dao.system.model.SystemUser;
@@ -27,21 +31,25 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.business.impl.hksync.HkSyncPushServiceImpl;
+import com.doumee.service.business.impl.thrid.WmsServiceImpl;
+import com.doumee.service.business.third.EmayService;
+import com.doumee.service.business.third.WmsService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
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.*;
import java.util.Date;
-import java.util.List;
-import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -50,6 +58,7 @@
* @date 2024/06/28 10:03
*/
@Service
+@Slf4j
public class PlatformJobServiceImpl implements PlatformJobService {
@Autowired
@@ -83,6 +92,25 @@
@Autowired
private PlatformShowParamMapper platformShowParamMapper;
+ @Autowired
+ private ParksMapper parksMapper;
+
+ @Autowired
+ private VisitParkMapper visitParkMapper;
+
+ @Autowired
+ private SmsConfigMapper smsConfigMapper;
+
+ @Autowired
+ private SmsEmailMapper smsEmailMapper;
+
+ @Autowired
+ private EmayService emayService;
+
+ @Autowired
+ private PlatformBroadcastLogMapper platformBroadcastLogMapper;
+ @Autowired
+ private PlatformWarnEventServiceImpl platformWarnEventService;
@Override
public Integer create(PlatformJob platformJob) {
@@ -161,11 +189,14 @@
.selectAs(PlatformGroup::getName,PlatformJob::getPlatformGroupName)
.selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
.selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)
- .selectAs(SystemUser::getUsername,PlatformJob::getOutUserName)
+ .selectAs(PlatformWmsJob::getIoCreatedate,PlatformJob::getIoCreatedate)
+ .selectAs(SystemUser::getRealname,PlatformJob::getOutUserName)
+ .selectAs(PlatformBooks::getId,PlatformJob::getBookId)
.leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
.leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId)
.leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
.leftJoin(SystemUser.class,SystemUser::getId,PlatformJob::getOutUserId)
+ .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
.eq(pageWrap.getModel().getId() != null, PlatformJob::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, PlatformJob::getCreator, pageWrap.getModel().getCreator())
.ge(pageWrap.getModel().getCreateDate() != null, PlatformJob::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
@@ -189,6 +220,7 @@
.eq(pageWrap.getModel().getSingType() != null, PlatformJob::getSingType, pageWrap.getModel().getSingType())
.eq(pageWrap.getModel().getSignDistance() != null, PlatformJob::getSignDistance, pageWrap.getModel().getSignDistance())
.eq(pageWrap.getModel().getPlatformNames() != null, PlatformJob::getPlatformNames, pageWrap.getModel().getPlatformNames())
+ .like(pageWrap.getModel().getPlatformName() != null, Platform::getName, pageWrap.getModel().getPlatformName())
.eq(pageWrap.getModel().getPlatforms() != null, PlatformJob::getPlatforms, pageWrap.getModel().getPlatforms())
.eq(pageWrap.getModel().getPlatformId() != null, PlatformJob::getPlatformId, pageWrap.getModel().getPlatformId())
.ge(pageWrap.getModel().getInwaitDate() != null, PlatformJob::getInwaitDate, Utils.Date.getStart(pageWrap.getModel().getInwaitDate()))
@@ -241,13 +273,17 @@
.eq(pageWrap.getModel().getPlatformGroupId() != null, PlatformJob::getPlatformGroupId, pageWrap.getModel().getPlatformGroupId())
.apply(pageWrap.getModel().getQueryStatus() != null, " find_in_set(t.`STATUS`,'"+pageWrap.getModel().getQueryStatus()+"')")
+ .apply(pageWrap.getModel().getQueryStatusForPower() != null, " find_in_set(t.`STATUS`,'"+pageWrap.getModel().getQueryStatusForPower()+"')")
+ .apply(pageWrap.getModel().getQueryType() != null, " find_in_set(t.TYPE,'"+pageWrap.getModel().getQueryType()+"')")
.ge(pageWrap.getModel().getBeginWorkDateStart() != null, PlatformJob::getStartDate, Utils.Date.getStart(pageWrap.getModel().getBeginWorkDateStart()))
.le(pageWrap.getModel().getBeginWorkDateEnd() != null, PlatformJob::getStartDate, Utils.Date.getEnd(pageWrap.getModel().getBeginWorkDateEnd()))
+ .ge(pageWrap.getModel().getBeginDoneDateStart() != null, PlatformJob::getDoneDate, Utils.Date.getStart(pageWrap.getModel().getBeginDoneDateStart()))
+ .le(pageWrap.getModel().getBeginDoneDateEnd() != null, PlatformJob::getDoneDate, Utils.Date.getEnd(pageWrap.getModel().getBeginDoneDateEnd()))
- .ge(pageWrap.getModel().getCreateDateStart() != null, 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)
+ .ge(pageWrap.getModel().getCreateDateStart() != null, PlatformWmsJob::getIoCreatedate, Utils.Date.getStart(pageWrap.getModel().getCreateDateStart()))
+ .le(pageWrap.getModel().getCreateDateEnd() != null, PlatformWmsJob::getIoCreatedate, Utils.Date.getEnd(pageWrap.getModel().getCreateDateEnd()))
+ .isNotNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getJobType()), PlatformJob::getContractNum)
+ .isNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()), PlatformJob::getContractNum)
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
@@ -275,17 +311,17 @@
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper
.selectAll(PlatformJob.class)
+ .selectAs(PlatformBooks::getId,PlatformJob::getBookId)
.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)
+ .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .apply("( t1.isdeleted = 0 or t.PLATFORM_ID is null )")
.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),
@@ -311,7 +347,7 @@
&&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()
+// .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"))
@@ -345,12 +381,30 @@
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);
+
+ if(Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.zyczh)
+ || Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.wxczh)){
+
+ Integer unLockCount = platformWmsDetailList.stream().filter(i->Constants.equalsInteger(i.getLockStatus(),Constants.ZERO)).collect(Collectors.toList()).size();
+ if(Constants.equalsInteger(unLockCount,Constants.ZERO)){
+ platformJob.setLockStatus(Constants.TWO); //鍏ㄩ儴涓婇攣
+ }else if(Constants.equalsInteger(unLockCount,platformWmsDetailList.size())){
+ platformJob.setLockStatus(Constants.ZERO); //鏈笂閿�
+ }else{
+ platformJob.setLockStatus(Constants.ONE); //閮ㄥ垎涓婇攣
+ }
+
+ }
+
+
+
}
}
}
@@ -392,7 +446,7 @@
platformJob.setWaitTime(waitTime);
}
}else{
- platformJob.setWaitTime("绛夊緟鍙彿");
+ platformJob.setWaitTime("棰勮绛夊緟锛�-灏忔椂-鍒嗛挓");
}
}else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())
|| Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){
@@ -414,7 +468,6 @@
.ne(PlatformLog::getParam3,Constants.ZERO+"")
.orderByDesc(PlatformLog::getCreateDate));
platformJob.setWorkTime(platformLogList.stream().map(m->Long.valueOf(m.getParam3())).reduce(Long.valueOf(0),Long::sum));
-
}
}
@@ -447,7 +500,6 @@
//鏌ヨ鍓嶆柟鎺掗槦鏁伴噺
this.queryWaitNum(platformJob);
}
-
driverHomeVO.setPlatformJobList(platformJobList);
@@ -536,6 +588,23 @@
}else{
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"绛惧埌绫诲瀷閿欒");
}
+ //鏌ヨ鏈堝彴缁勬暟鎹�
+ PlatformGroup platformGroup = platformGroupMapper.selectById(platformJob.getPlatformGroupId());
+ if(Objects.isNull(platformGroup)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鏈堝彴缁勪俊鎭�");
+ }
+ if(System.currentTimeMillis() > DateUtil.getDateByString(DateUtil.getCurrDate() + " " + platformGroup.getEndTime() + ":59" ).getTime()
+ || System.currentTimeMillis() < DateUtil.getDateByString(DateUtil.getCurrDate() + " " + platformGroup.getStartTime() + ":00" ).getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈湪宸ヤ綔鏃堕棿["+platformGroup.getStartTime() + "-" + platformGroup.getEndTime() +"]锛屾棤娉曡繘琛岀鍒�");
+ }
+ //鏌ヨ浠婃棩鏈�澶х殑绛惧埌鏁�
+ List<PlatformJob> signList = platformJobMapper.selectList(new QueryWrapper<PlatformJob>().lambda().apply(" DATE(SIGN_DATE) = DATE(NOW()) and sign_date is not null "));
+ if(CollectionUtils.isEmpty(signList)){
+ platformJob.setSignNum(Constants.ONE);
+ } else{
+ int maxNumber = Collections.max(signList.stream().map(i->i.getSignNum()).collect(Collectors.toList()));
+ platformJob.setSignNum(maxNumber + Constants.ONE);
+ }
platformJob.setSignDate(new Date());
platformJob.setSingType(signInDTO.getSignType());
platformJob.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());
@@ -603,13 +672,16 @@
){
//鏌ヨ鍓嶆柟鎺掗槦鏁伴噺
this.queryWaitNum(platformJob);
+ Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId());
+ if(Objects.nonNull(platform)){
+ platformJob.setPlatformName(platform.getName());
+ }
}else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
//浣滀笟鏈堝彴淇℃伅
Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId());
if(Objects.nonNull(platform)){
platformJob.setPlatformName(platform.getName());
}
-
}
platformJob.dealTime();
this.getWorkTime(platformJob);
@@ -641,6 +713,7 @@
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(),
Constants.PlatformJobStatus.IN_WAIT.getKey(),
Constants.PlatformJobStatus.CALLED.getKey())
+ .orderByDesc(PlatformJob::getStatus)
.orderByAsc(PlatformJob::getSignDate)
);
//鑾峰彇鎵�鏈夋湀鍙扮粍
@@ -664,10 +737,11 @@
.leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.eq(PlatformJob::getPlatformGroupId,platformGroup.getId())
- .ge(Objects.nonNull(platformJob),PlatformJob::getSignDate,DateUtil.dateTypeToString(platformJob.getSignDate(),"yyyy-MM-dd HH:mm:ss"))
+ .le(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::getStatus)
.orderByDesc(PlatformJob::getSignDate));
platformGroup.setSignJobList(platformJobSignInList);
//鏌ヨ褰撳墠鏈堝彴缁勪笅
@@ -728,7 +802,7 @@
*/
@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.getPlatformId())){
@@ -767,17 +841,143 @@
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());
+ //鍙戦�佺煭淇′俊鎭�
+ SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
+ SmsConstants.platformJobContent.platformJobCallIn,null,null
+ );
+
+ return platformJob;
+ }
+
+ private Logger logger = LoggerFactory.getLogger(PlatformJobServiceImpl.class);
+
+ @Override
+ public void sendInPark(PlatformJob platformJob){
+ log.info("銆愪笅鍙戝仠杞﹀満鏉冮檺銆�================寮�濮�===="+platformJob.getCarCodeFront());
+ 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> cancelParkList = visitParkMapper.selectList(new QueryWrapper<VisitPark>().lambda()
+ .eq(VisitPark::getCarCode,platformJob.getCarCodeFront())
+ .eq(VisitPark::getObjType,Constants.ONE)
+ .eq(VisitPark::getHkStatus,Constants.ONE)
+ .isNotNull(VisitPark::getHkId)
+ );
+
+ log.info("銆愪笅鍙戝仠杞﹀満鏉冮檺銆�================寮�濮嬪彇娑堝綋鍓嶈溅杈嗘墍鏈夋潈闄�===="+JSONObject.toJSONString(cancelParkList));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(cancelParkList)){
+ for (VisitPark visitPark:cancelParkList) {
+ 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.setRemark("鍐嶆涓嬪彂娓呯┖鏉冮檺");
+ visitPark.setEditDate(new Date());
+ visitParkMapper.updateById(visitPark);
+ }
+ }
+ }
+
+ 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::getCarCode,platformJob.getCarCodeFront())
+ .eq(VisitPark::getObjType,Constants.ONE)
+ .eq(VisitPark::getHkStatus,Constants.ONE)
+ .isNotNull(VisitPark::getHkId)
+ );
+ 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);
+ }
+ }
+ }
+ }
}
/**
@@ -785,7 +985,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);
@@ -810,7 +1010,7 @@
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()){
+ )>=platform.getWorkingNum()){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瓒呭嚭鏈堝彴鍙悓鏃朵綔涓氭暟閲廩"+platform.getWorkingNum()+"杈哴");
};
@@ -833,9 +1033,89 @@
}
platformJob.setEditDate(new Date());
platformJobMapper.updateById(platformJob);
+
+
//瀛樺偍鎿嶄綔鏃ュ織
savePlatformLog(Constants.PlatformJobLogType.CALLED.getKey(),oldPlatformJob,platformJob,
Constants.PlatformJobLogType.CALLED.getInfo().replace("{data}",platform.getName()));
+
+ //鍙戦�佺煭淇′俊鎭�
+ SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
+ SmsConstants.platformJobContent.platformJobSingIn,platform.getName(),null
+ );
+
+ //骞挎挱 led閫氱煡
+ platformJob.setPlatformName(platform.getName());
+ this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.CALLING.getInfo(),
+ Constants.PlatformBroadcastContent.CALLING.getInfo()
+ );
+
+ platformJob.setPlatformWmsCode(platform.getCode());
+ return platformJob;
+ }
+
+
+ public void broadcastAndLEed(PlatformJob model,String ledContent,String broadcastContent){
+ int speed = 13;
+ try {
+ speed = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LED_CONTENT_SPEED).getCode());
+ }catch (Exception e){
+
+ }
+ log.error("鏌ヨLED涓庡箍鎾暟鎹�------------------------------------------------------------------------------------------");
+ List<PlatformDevice> deviceList = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda()
+ .eq(PlatformDevice::getPlatformId,model.getPlatformId())
+ .eq(PlatformDevice::getIsdeleted,Constants.ZERO)
+ );
+ if(deviceList ==null || deviceList.size() == 0){
+ return;
+ }
+
+ Boolean sendLed = StringUtils.isBlank(ledContent)?false:true;
+ Boolean sendBroadcast = StringUtils.isBlank(broadcastContent)?false:true;
+
+ if (sendLed) {
+ //骞挎挱 param2 = 杞︾墝鍙� param = 鏈堝彴
+ ledContent = ledContent.replace("${param}",model.getPlatformName());
+ ledContent = ledContent.replace("${param2}",model.getCarCodeFront());
+ }
+ if(sendBroadcast){
+ //骞挎挱 param2 = 鏈堝彴 param = 杞︾墝鍙�
+ broadcastContent = broadcastContent.replace("${param2}",model.getPlatformName());
+ broadcastContent = broadcastContent.replace("${param}",model.getCarCodeFront());
+ }
+
+ List<String> broadcastList = new ArrayList<>();
+ List<String> ledList = new ArrayList<>();
+ String bNames = "";
+ List<PlatformBroadcastLog> logList = new ArrayList<>();
+ log.error("寰幆璋冭捣led涓庡箍鎾�------------------------------------------------------------------------------------------");
+ for(PlatformDevice device : deviceList){
+ if(StringUtils.isBlank(device.getHkId())){
+ continue;
+ }
+ if(Constants.equalsInteger(device.getType(),Constants.ZERO)&&sendLed){
+ log.error("璋冭捣led------------------------------------------------------------------------------------------");
+ //濡傛灉鏄疞ED
+ PlatformBroadcastLog log = HkSyncPushServiceImpl.dealLedContentBiz(model.getId(),device.getHkNo(),device.getName(),ledContent,speed,1);
+ logList.add(log);
+ ledList.add(device.getHkId());
+ }else if(Constants.equalsInteger(device.getType(),Constants.TWO)&&sendBroadcast){
+ log.error("璋冭捣骞挎挱------------------------------------------------------------------------------------------");
+ //濡傛灉鏄箍鎾偣
+ bNames += device.getName()+";";
+ broadcastList.add(device.getHkId());
+ }
+ }
+ if(broadcastList.size()>0){
+ PlatformBroadcastLog log = HkSyncPushServiceImpl.dealBroadcastBiz(model,broadcastList,bNames,broadcastContent);
+ logList.add(log);
+ }
+ if(logList.size()>0){
+ platformBroadcastLogMapper.insert(logList);
+ }
+
}
@@ -887,6 +1167,19 @@
//瀛樺偍鎿嶄綔鏃ュ織
savePlatformLog(Constants.PlatformJobLogType.TRANSFERING.getKey(),oldPlatformJob,platformJob,
Constants.PlatformJobLogType.TRANSFERING.getInfo().replace("{data}",oldPlatform.getName()));
+
+
+ //鍙戦�佺煭淇′俊鎭�
+ SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
+ SmsConstants.platformJobContent.platformJobMove,oldPlatform.getName(),platform.getName()
+ );
+
+ platformJob.setPlatformName(platform.getName());
+ this.broadcastAndLEed(platformJob, StringUtils.isBlank(oldPlatform.getRemark())?Constants.PlatformLedContent.IDEL_CONTNET.getName():oldPlatform.getLedContent(),
+ null
+ );
+
}
@@ -895,7 +1188,7 @@
*/
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void platformOverNumber(JobOperateDTO jobOperateDTO){
+ public PlatformJob platformOverNumber(JobOperateDTO jobOperateDTO){
if(Objects.isNull(jobOperateDTO)
|| Objects.isNull(jobOperateDTO.getJobId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -916,8 +1209,14 @@
//瀛樺偍鎿嶄綔鏃ュ織
savePlatformLog(Constants.PlatformJobLogType.OVER_NUMBER.getKey(),oldPlatformJob,platformJob,
Constants.PlatformJobLogType.OVER_NUMBER.getInfo());
+ //鍙戦�佺煭淇′俊鎭�
+ SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
+ SmsConstants.platformJobContent.platformJobOverNum,null,null
+ );
+ return platformJob;
}
@@ -939,6 +1238,8 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
}
+ Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId());
+
PlatformJob oldPlatformJob = new PlatformJob();
BeanUtils.copyProperties(platformJob,oldPlatformJob);
@@ -950,6 +1251,12 @@
//瀛樺偍鎿嶄綔鏃ュ織
savePlatformLog(Constants.PlatformJobLogType.EXCEPTION.getKey(),oldPlatformJob,platformJob,
Constants.PlatformJobLogType.EXCEPTION.getInfo());
+
+ //鍙戦�佺煭淇′俊鎭�
+ SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
+ SmsConstants.platformJobContent.platformJobError,platform.getName(),null
+ );
}
@@ -958,7 +1265,7 @@
*/
@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())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -975,8 +1282,7 @@
if(Objects.isNull(platform)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏈堝彴淇℃伅");
}
-
-
+
PlatformJob oldPlatformJob = new PlatformJob();
BeanUtils.copyProperties(platformJob,oldPlatformJob);
if(Objects.isNull(platformJob.getStartDate())){
@@ -989,6 +1295,20 @@
//瀛樺偍鎿嶄綔鏃ュ織
savePlatformLog(Constants.PlatformJobLogType.WORKING.getKey(),oldPlatformJob,platformJob,
Constants.PlatformJobLogType.WORKING.getInfo().replace("{data}",platform.getName()));
+
+ //鍙戦�佺煭淇′俊鎭�
+ SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
+ SmsConstants.platformJobContent.platformJobWorking,platform.getName(),null
+ );
+
+ //骞挎挱 led閫氱煡
+ platformJob.setPlatformName(platform.getName());
+ this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.WORKING.getInfo(),
+ null
+ );
+
+ return platformJob;
}
@@ -997,7 +1317,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);
@@ -1006,9 +1326,16 @@
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.WORKING.getKey())
+ ||Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey()) )){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
}
+
+ Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId());
+ if(Objects.isNull(platform)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏈堝彴淇℃伅");
+ }
+
PlatformJob oldPlatformJob = new PlatformJob();
BeanUtils.copyProperties(platformJob,oldPlatformJob);
@@ -1024,9 +1351,21 @@
//TODO 澶栧崗杞﹁璐� 鏌ヨTMS 鐢靛瓙閿佹儏鍐�
}else if(Constants.equalsInteger(platformJob.getType(),Constants.ONE) || Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){
- //TODO 澶栧崗杞﹀嵏璐� 鎴栬�� 甯傚叕鍙歌溅鍗歌揣 鍒欐牴鎹换鍔℃儏鍐佃繘琛屼笅鍙戠鍥潈闄�
+ //TODO 澶栧崗杞﹀嵏璐� 鎴栬�� 甯傚叕鍙歌溅鍗歌揣 鍒欐牴鎹换鍔℃儏鍐�
}
+
+ //鍙戦�佺煭淇′俊鎭�
+ SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
+ SmsConstants.platformJobContent.platformJobFinish,platform.getName(),null
+ );
+
+ //骞挎挱 led閫氱煡
+ platformJob.setPlatformName(platform.getName());
+ this.broadcastAndLEed(platformJob,null,
+ Constants.PlatformBroadcastContent.DONE.getInfo());
+ return platformJob;
}
@@ -1035,7 +1374,7 @@
*/
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void powerLevel(JobOperateDTO jobOperateDTO){
+ public PlatformJob powerLevel(JobOperateDTO jobOperateDTO){
if(Objects.isNull(jobOperateDTO)
|| Objects.isNull(jobOperateDTO.getJobId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -1053,11 +1392,12 @@
platformJob.setOutHkdate(new Date());
platformJob.setStatus(Constants.PlatformJobStatus.AUTHED_LEAVE.getKey());
platformJob.setEditDate(new Date());
+ platformJob.setRemark(jobOperateDTO.getRemark());
platformJobMapper.updateById(platformJob);
//瀛樺偍鎿嶄綔鏃ュ織
savePlatformLog(Constants.PlatformJobLogType.AUTHED_LEAVE.getKey(),oldPlatformJob,platformJob ,
Constants.PlatformJobLogType.AUTHED_LEAVE.getInfo());
- //TODO 鎺堟潈杞﹁締绂诲満鏉冮檺
+ return platformJob;
}
@@ -1140,6 +1480,7 @@
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);
+ platformLog.setRemark(platformJobBefor.getPlatformId().toString());
}else if(Constants.equalsInteger(objType,Constants.PlatformJobLogType.TRANSFERING.getKey())){
//鏌ヨ鏈�鍚庝竴娆℃棩蹇楁槸鍚︿负寮傚父鎸傝捣锛屽紓甯告寕璧峰悗鍙繘琛岃浆绉� 濡傛灉杩涜杞Щ閭ｄ箞涓氬姟灏遍渶瑕侀噸鏂拌繘琛屽紑濮嬪氨涓嶉渶瑕佺壒娈婂鐞� 锛屽鏋滀笉鏄紓甯告寕璧疯繘琛屾暟鎹粨鏉� 鍒欑洿鎺ユ煡璇㈡渶鍚庝竴娆″紑濮嬬殑鏃堕棿
PlatformLog lastPlatformLog = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda()
@@ -1162,6 +1503,7 @@
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);
+ platformLog.setRemark(platformJobBefor.getPlatformId().toString());
}else{
platformLog.setParam3("0");
}
@@ -1189,10 +1531,12 @@
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);
+ platformLog.setRemark(platformJobBefor.getPlatformId().toString());
}
}else if(Constants.equalsInteger(objType,Constants.PlatformJobLogType.WORKING.getKey())){
platformLog.setParam1(DateUtil.dateTypeToString(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
- platformLog.setParam3("0");
+ platformLog.setParam3("0");
+ platformLog.setRemark(platformJobBefor.getPlatformId().toString());
}else{
platformLog.setParam3("0");
}
@@ -1290,7 +1634,9 @@
.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::getJobId,PlatformJob::getId)
.eq(PlatformJob::getPlatformId,platformId)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getStatus,
@@ -1310,7 +1656,7 @@
//鏌ヨ鍓嶆柟鎺掗槦鏁伴噺
this.queryWaitNum(platformJob);
}
- PlatformWorkVO platformWorkVO = PlatformGroupServiceImpl.getPlatformWorkVO(platformId,platformJobList);
+ PlatformWorkVO platformWorkVO = PlatformGroupServiceImpl.getPlatformWorkVO(platformJoinMapper.selectById(platformId),platformJobList);
return platformWorkVO;
}
@@ -1325,8 +1671,7 @@
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())
+ i.like(PlatformJob::getArriveDate,queryDateStr)
)
)
);
@@ -1351,31 +1696,53 @@
.eq(Platform::getStatus,Constants.ZERO)
);
for (Platform platform:platformList) {
- PlatformDataListResponse platformDataListResponse = new PlatformDataListResponse();
+ 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)
+
+ PlatformJob platformJob = platformJobJoinMapper.selectJoinOne(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .selectAs(Platform::getWorkRate, PlatformJob::getWorkRate)
+ .selectAs(Platform::getName, PlatformJob::getPlatformName)
+ .select(" case when t.total_num is null then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id ) else t.total_num end workNum ")
+ .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 5 order by pl.CREATE_DATE desc limit 1 ) as newStartDate ")
+ .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 4 order by pl.CREATE_DATE desc limit 1 ) as newCallDate ")
+ .leftJoin(Platform.class, Platform::getId, PlatformJob::getPlatformId)
+ .eq(PlatformJob::getStatus, Constants.PlatformJobStatus.WORKING.getKey())
+ .eq(PlatformJob::getPlatformId, platform.getId())
+ .orderByDesc(PlatformJob::getStatus)
+ .orderByDesc(PlatformJob::getStartDate)
.last(" limit 1")
);
- if(Objects.nonNull(platformJob)){
+
+ 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
+ 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);
//鏌ヨ浣滀笟鏃堕暱
+// Long workTime = this.getWorkTime(platformJob);
+ Long min = (System.currentTimeMillis() - platformJob.getNewStartDate().getTime())/1000/60;
platformDataListResponse.setWorkTime(
- this.getWorkTime(platformJob)
+ min
);
+
+ //璁＄畻宸蹭綔涓氭椂闀� 鏍规嵁鏈堝彴宸ヤ綔鏁堢巼 璁＄畻浠诲姟閲忛渶瑕佹椂闂�
+ if (Objects.isNull(platformJob.getWorkNum()) || Objects.isNull(platformJob.getWorkRate())) {
+ platformDataListResponse.setFinishTime(null);
+ } else {
+ Integer workMinute = platformJob.getWorkNum().multiply(new BigDecimal(60)).divide(platformJob.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue();
+ Date overDate = DateUtil.getXMinuteAfterDate(platformJob.getNewStartDate(), workMinute);
+ platformDataListResponse.setFinishTime(overDate);
+ }
}
+ platformDataListResponseList.add(platformDataListResponse);
}
return platformDataListResponseList;
}
@@ -1481,9 +1848,8 @@
.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())
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(),
+ Constants.PlatformJobStatus.IN_WAIT.getKey(),Constants.PlatformJobStatus.CALLED.getKey())
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.isNotNull(PlatformJob::getCarCodeFront)
.orderByDesc(PlatformJob::getCreateDate)
@@ -1534,5 +1900,153 @@
}
+ @Override
+ public LargeScreenDataVO getLargeScreenData(){
+ LargeScreenDataVO largeScreenDataVO = new LargeScreenDataVO();
+ List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
+ .selectAs(Platform::getName,PlatformJob::getPlatformName)
+ .selectAs(PlatformGroup::getWaitCallTime,PlatformJob::getWorktimeOutAlarmTime)
+ .select(" case when t.total_num is null then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id ) else t.total_num end workNum ")
+ .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 5 order by pl.CREATE_DATE desc limit 1 ) as newStartDate ")
+ .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 4 order by pl.CREATE_DATE desc limit 1 ) as newCallDate ")
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .in(PlatformJob::getStatus,
+ Constants.PlatformJobStatus.WAIT_CALL.getKey(),
+ Constants.PlatformJobStatus.WORKING.getKey(),
+ Constants.PlatformJobStatus.CALLED.getKey(),
+ Constants.PlatformJobStatus.IN_WAIT.getKey()
+ )
+ .orderByDesc(PlatformJob::getStatus)
+ .orderByAsc(PlatformJob::getSignDate)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){
+ for (PlatformJob platformJob:platformJobList) {
+ //杞︾墝鍙疯劚鏁�
+ platformJob.setCarCodeFront(Constants.carCodeTuominStr(platformJob.getCarCodeFront()));
+ if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
+ //璁＄畻宸蹭綔涓氭椂闀� 鏍规嵁鏈堝彴宸ヤ綔鏁堢巼 璁＄畻浠诲姟閲忛渶瑕佹椂闂�
+ if(Objects.isNull(platformJob.getWorkNum()) || Objects.isNull(platformJob.getWorkRate())){
+ platformJob.setOptTime(0L);
+ }else{
+ Integer workMinute = platformJob.getWorkNum().multiply(new BigDecimal(60)).divide(platformJob.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue();
+ Date overDate = DateUtil.getXMinuteAfterDate(platformJob.getNewStartDate(),workMinute);
+ platformJob.setOptTime(overDate.getTime());
+ }
+ }else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){
+ platformJob.setOptTime(DateUtil.getXMinuteAfterDate(platformJob.getNewCallDate(),platformJob.getWorktimeOutAlarmTime()).getTime());
+ }
+ }
+ largeScreenDataVO.setAllList(platformJobList);
+ List<PlatformJob> calledList = platformJobList.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())).collect(Collectors.toList());
+ largeScreenDataVO.setWaitWorkList(calledList);
+ }
+ largeScreenDataVO.setQrCode(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE).getCode());
+ return largeScreenDataVO;
+
+ }
+
+
+ /**
+ * 浣滀笟瀹屾垚瓒呮椂
+ */
+ @Override
+ public void timeOutReport(){
+ //鏌ヨ瓒呮椂鏁版嵁
+ List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .selectAs(Platform::getName,PlatformJob::getPlatformName)
+ .select(" ( now() > DATE_ADD(t.DONE_DATE ,INTERVAL t1.STAY_TIMEOUT_ALARM_TIME MINUTE) ) as isTimeOut ")
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
+ .eq(PlatformJob::getInOut,Constants.ONE)
+ .isNotNull(PlatformJob::getDoneDate)
+ );
+ //濡傛灉瓒呮椂 澶勭悊鏁版嵁 骞跺彂閫乴ed涓庡箍鎾�
+ for (PlatformJob platformJob:platformJobList) {
+ if(Constants.equalsInteger(platformJob.getIsTimeOut(),Constants.ONE)){
+ //骞挎挱 led閫氱煡
+ this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.TIMEOUT_IN.getInfo(),
+ Constants.PlatformBroadcastContent.TIMEOUT_IN.getInfo());
+ //鏇存柊鐘舵��
+ platformJobJoinMapper.update(new UpdateWrapper<PlatformJob>().lambda().set(PlatformJob::getInOut,Constants.ZERO).eq(PlatformJob::getId,platformJob.getId()));
+
+ SavePlatformWarnEventDTO savePlatformWarnEventDTO = new SavePlatformWarnEventDTO();
+ savePlatformWarnEventDTO.setPlatformJobId(platformJob.getId());
+ savePlatformWarnEventDTO.setPlatformId(platformJob.getPlatformId());
+ savePlatformWarnEventDTO.setCarCode(platformJob.getCarCodeFront());
+ savePlatformWarnEventDTO.setEventType(Constants.PlatformWarnEvent.STOP_TIMEOUT.getKey());
+ platformWarnEventService.savePlatformWarnEvent(savePlatformWarnEventDTO);
+ }
+ }
+ }
+
+
+ /**
+ * 鑷姩杩囧彿 鑷姩鏇存柊鑷充唬绛惧埌鐘舵��
+ */
+ @Override
+ public void timeOutCallIn(){
+ //鏌ヨ瓒呮椂鏁版嵁
+ List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .selectAs(Platform::getName,PlatformJob::getPlatformName)
+ .select(" ( now() > DATE_ADD( ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 4 order by pl.CREATE_DATE desc limit 1 ) ,INTERVAL t2.WAIT_CALL_TIME MINUTE) ) as isTimeOut ")
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId)
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())
+ .isNotNull(PlatformJob::getCallDate)
+ );
+ //濡傛灉瓒呮椂 澶勭悊鏁版嵁 骞跺彂閫乴ed涓庡箍鎾�
+ for (PlatformJob platformJob:platformJobList) {
+ JobOperateDTO jobOperateDTO = new JobOperateDTO();
+ jobOperateDTO.setJobId(platformJob.getId());
+ this.platformOverNumber(jobOperateDTO);
+ this.cancelInPark(platformJob);
+ }
+ }
+
+
+ /**
+ * 浣滀笟瓒呮椂
+ */
+ @Override
+ public void timeOutWork(){
+ //鏌ヨ瓒呮椂鏁版嵁
+ List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .selectAs(Platform::getName,PlatformJob::getPlatformName)
+ .selectAs(Platform::getWorkRate, PlatformJob::getWorkRate)
+ .selectAs(Platform::getWorkTimeoutAlarmTime, PlatformJob::getWorktimeOutAlarmTime)
+ .select(" case when t.total_num is null then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id ) else t.total_num end workNum ")
+ .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 5 order by pl.CREATE_DATE desc limit 1 ) as newStartDate ")
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
+ .eq(PlatformJob::getInOut,Constants.ONE)
+ );
+ //濡傛灉瓒呮椂 澶勭悊鏁版嵁 骞跺彂閫乴ed涓庡箍鎾�
+ for (PlatformJob platformJob:platformJobList) {
+
+ Integer workMinute = platformJob.getWorkNum().multiply(new BigDecimal(60)).divide(platformJob.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue();
+ Date overDate = DateUtil.getXMinuteAfterDate(platformJob.getNewStartDate(),workMinute + platformJob.getWorktimeOutAlarmTime());
+ if(overDate.getTime() < System.currentTimeMillis() ){
+ //骞挎挱 led閫氱煡
+ this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.TIMEOUT_WORK.getInfo(),
+ Constants.PlatformBroadcastContent.TIMEOUT_WORK.getInfo());
+
+ SavePlatformWarnEventDTO savePlatformWarnEventDTO = new SavePlatformWarnEventDTO();
+ savePlatformWarnEventDTO.setPlatformJobId(platformJob.getId());
+ savePlatformWarnEventDTO.setPlatformId(platformJob.getPlatformId());
+ savePlatformWarnEventDTO.setCarCode(platformJob.getCarCodeFront());
+ savePlatformWarnEventDTO.setEventType(Constants.PlatformWarnEvent.WORK_TIMEOUT.getKey());
+ platformWarnEventService.savePlatformWarnEvent(savePlatformWarnEventDTO);
+ }
+
+ }
+ }
+
}
--
Gitblit v1.9.3