From 4ed09be8e23b555ee43dfc471020cb4619da20a0 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 17:00:28 +0800
Subject: [PATCH] 月台自动叫号处理问题
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 64 insertions(+), 17 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 cbef80e..be65e03 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
@@ -12,6 +12,7 @@
import com.doumee.core.haikang.model.param.respose.ParkReservationAddResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.dao.business.dao.UserActionMapper;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.third.WmsService;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
@@ -985,7 +986,7 @@
BeanUtils.copyProperties(platformJob,oldPlatformJob);
platformJob.setPlatformId(platform.getId());
platformJob.setInwaitDate(new Date());
- platformJob.setInwaitUserId(jobOperateDTO.getLoginUserInfo().getId());
+ platformJob.setInwaitUserId(Objects.isNull(jobOperateDTO.getLoginUserInfo())?null:jobOperateDTO.getLoginUserInfo().getId());
platformJob.setStatus(Constants.PlatformJobStatus.IN_WAIT.getKey());
platformJob.setEditDate(new Date());
platformJobMapper.updateById(platformJob);
@@ -1226,7 +1227,7 @@
BeanUtils.copyProperties(platformJob,oldPlatformJob);
platformJob.setCallDate(Objects.isNull(platformJob.getCallDate())?new Date():null);
- platformJob.setCallUserId(jobOperateDTO.getLoginUserInfo().getId());
+ platformJob.setCallUserId(Objects.isNull(jobOperateDTO.getLoginUserInfo())?null:jobOperateDTO.getLoginUserInfo().getId());
platformJob.setStatus(Constants.PlatformJobStatus.CALLED.getKey());
platformJob.setPlatformId(jobOperateDTO.getPlatformId());
//鍒ゆ柇鏄惁闇�瑕佸～鍏呰繘鍘�
@@ -2578,12 +2579,14 @@
+ @Override
public void autoPlatformCallCar(WmsService wmsService){
+ log.error("瀹氭椂鑷姩鍒嗛厤鏈堝彴 - 鏈堝彴寮�濮嬭嚜鍔ㄥ垎閰嶅垎閰嶄换鍔★細{}"+DateUtil.getCurrDateTime());
//鏌ヨ褰撳墠寮�鍚殑鏈堝彴鏁版嵁
List<PlatformGroup> allPlatformGroup = platformGroupMapper.selectList(new QueryWrapper<PlatformGroup>().lambda().eq(PlatformGroup::getStatus,Constants.ZERO)
.eq(PlatformGroup::getIsdeleted,Constants.ZERO).eq(PlatformGroup::getAutoCall,Constants.ONE)
);
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(allPlatformGroup)){
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(allPlatformGroup)){
return;
}
//杩囨护褰撳墠鏃堕棿娈典笉鍦ㄦ椂闂村唴鐨勬湀鍙扮粍 AUTO_CALL_END_TIME AUTO_CALL_START_TIME
@@ -2593,7 +2596,7 @@
&& Integer.valueOf(i.getAutoCallStartTime().replaceAll(":","")) < nowHm
&& Integer.valueOf(i.getAutoCallEndTime().replaceAll(":","")) > nowHm
).collect(Collectors.toList());
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(autoCallGroup)){
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(autoCallGroup)){
return;
}
//鏌ヨ鎵�鏈夋湀鍙�
@@ -2601,7 +2604,8 @@
.lambda()
.eq(Platform::getIsdeleted,Constants.ZERO)
.eq(Platform::getStatus,Constants.ZERO)
- .in(Platform::getId,autoCallGroup.stream().map(i->i.getId()).collect(Collectors.toList()))
+ .isNotNull(Platform::getWorkingNum)
+ .in(Platform::getGroupId,autoCallGroup.stream().map(i->i.getId()).collect(Collectors.toList()))
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(platformList)){
return;
@@ -2627,7 +2631,7 @@
}
}
for (Platform platform:platforms) {
-
+ log.error("瀹氭椂鑷姩鍒嗛厤鏈堝彴 - 鏈堝彴寮�濮嬭嚜鍔ㄥ垎閰嶅垎閰嶄换鍔★細{}"+JSONObject.toJSONString(platform));
//鏈堝彴 鍙彿鍏ュ洯鏁伴噺
Integer workingNum = platform.getWorkingNum();
//鏌ヨ褰撳墠鏈堝彴鏄惁瀛樺湪鏈堝彴鍙彿鏁版嵁 濡傛灉澶т簬绛変簬鍙彨鍙锋暟閲� 鍒欒烦杩�
@@ -2645,11 +2649,11 @@
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.eq(PlatformJob::getPlatformGroupId, platformGroup.getId())
.apply(" ( " +
- " ( t.`STATUS` = "+Constants.PlatformJobStatus.WAIT_CALL.getKey()+" and t.PLATFORM_GROUP_ID = "+platformGroup.getId()+" )" +
+ " ( `STATUS` = "+Constants.PlatformJobStatus.WAIT_CALL.getKey()+" and PLATFORM_GROUP_ID = "+platformGroup.getId()+" )" +
" or " +
- " (t.`STATUS` = "+Constants.PlatformJobStatus.IN_WAIT.getKey()+" and and t.PLATFORM_ID = "+platform.getId()+" ) " +
+ " ( `STATUS` = "+Constants.PlatformJobStatus.IN_WAIT.getKey()+" and PLATFORM_ID = "+platform.getId()+" ) " +
" or " +
- " (t.`STATUS` = "+Constants.PlatformJobStatus.TRANSFERING.getKey()+" and t.PLATFORM_ID = "+platform.getId()+" ) " +
+ " ( `STATUS` = "+Constants.PlatformJobStatus.TRANSFERING.getKey()+" and PLATFORM_ID = "+platform.getId()+" ) " +
") "
)
//鎺掑簭鏂瑰紡 鏈堝彴浣滀笟绫诲瀷 锛堣浆绉讳腑 >鍙彿鍏ュ洯锛�> 鍔犳�� > 绛惧埌鏃堕棿
@@ -2660,8 +2664,13 @@
}
for (int i = 0; i < workingNum - workNum ; i++) {
PlatformJob platformJob = this.getAutoCallJob(platformJobList,platform,isDefaul,platformGroup);
+ log.error("瀹氭椂鑷姩鍒嗛厤鏈堝彴 - 鏈堝彴鑷姩鍒嗛厤鍒嗛厤浠诲姟锛歿}"+JSONObject.toJSONString(platformJob));
+ if(Objects.isNull(platformJob)){
+ continue;
+ }
JobOperateDTO jobOperateDTO = new JobOperateDTO();
jobOperateDTO.setJobId(platformJob.getId());
+ jobOperateDTO.setPlatformId(platform.getId());
PlatformJob callPlatformJob = this.platformCallNumber(jobOperateDTO);
platformJobList = platformJobList.stream().filter(j->!Constants.equalsInteger(j.getId(),platformJob.getId())).collect(Collectors.toList());
try{
@@ -2683,12 +2692,13 @@
+ @Override
public void autoCallInParkCar(WmsService wmsService){
//鏌ヨ褰撳墠寮�鍚殑鏈堝彴鏁版嵁
List<PlatformGroup> allPlatformGroup = platformGroupMapper.selectList(new QueryWrapper<PlatformGroup>().lambda().eq(PlatformGroup::getStatus,Constants.ZERO)
.eq(PlatformGroup::getIsdeleted,Constants.ZERO).eq(PlatformGroup::getAutoCall,Constants.ONE)
);
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(allPlatformGroup)){
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(allPlatformGroup)){
return;
}
//杩囨护褰撳墠鏃堕棿娈典笉鍦ㄦ椂闂村唴鐨勬湀鍙扮粍 AUTO_CALL_END_TIME AUTO_CALL_START_TIME
@@ -2698,7 +2708,7 @@
&& Integer.valueOf(i.getAutoCallStartTime().replaceAll(":","")) < nowHm
&& Integer.valueOf(i.getAutoCallEndTime().replaceAll(":","")) > nowHm
).collect(Collectors.toList());
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(autoCallGroup)){
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(autoCallGroup)){
return;
}
//鏌ヨ鎵�鏈夋湀鍙�
@@ -2706,7 +2716,8 @@
.lambda()
.eq(Platform::getIsdeleted,Constants.ZERO)
.eq(Platform::getStatus,Constants.ZERO)
- .in(Platform::getId,autoCallGroup.stream().map(i->i.getId()).collect(Collectors.toList()))
+ .isNotNull(Platform::getCallReadyNum)
+ .in(Platform::getGroupId,autoCallGroup.stream().map(i->i.getId()).collect(Collectors.toList()))
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(platformList)){
return;
@@ -2746,7 +2757,7 @@
.lambda()
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.eq(PlatformJob::getPlatformGroupId, platformGroup.getId())
- .apply(" t.`STATUS` = "+Constants.PlatformJobStatus.WAIT_CALL.getKey()+" and t.PLATFORM_GROUP_ID = "+platformGroup.getId()+" ) ")
+ .apply(" ( `STATUS` = "+Constants.PlatformJobStatus.WAIT_CALL.getKey()+" and PLATFORM_GROUP_ID = "+platformGroup.getId()+" ) ")
//鎺掑簭鏂瑰紡 鏈堝彴浣滀笟绫诲瀷 锛堝紓甯告寕璧�>鍙彿鍏ュ洯锛�> 鍔犳�� > 绛惧埌鏃堕棿
.orderByDesc(PlatformJob::getStatus,PlatformJob::getUrgeTime)
.orderByAsc(PlatformJob::getSignDate));
@@ -2788,6 +2799,7 @@
* @return
*/
public PlatformJob getAutoCallJob(List<PlatformJob> platformJobList, Platform platform,Boolean isDefaul,PlatformGroup platformGroup){
+ log.error("瀹氭椂鑷姩鍒嗛厤鏈堝彴 - 鏈堝彴鑷姩鍒嗛厤浠诲姟锛歿}"+DateUtil.getCurrDateTime());
if(isDefaul){
//鏈堝彴涓嬪彧鏈変竴绫绘湀鍙� 鐩存帴杩斿洖绗竴涓换鍔�
return platformJobList.get(Constants.ZERO);
@@ -2843,7 +2855,7 @@
}
}else{
//鐗╂祦杞﹂绾︾殑浠诲姟 鐩存帴鍒嗛厤 鏁ｆ墭鐩樻湀鍙�
- if(Constants.equalsInteger(platform.getType(),Constants.TWO)){
+ if(Constants.equalsInteger(platform.getType(),Constants.ONE)){
return platformJob;
}
}
@@ -2861,9 +2873,17 @@
if(Objects.isNull(platformWmsJob)){
continue;
}
- //TODO 鏆傛棤鍏ュ簱鐨勬暟鎹�
- if(platformWmsJob.getCarrierName().equals("1") && Constants.equalsInteger(platform.getType(),Constants.ONE)){
- return platformJob;
+ SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.IN_REPERTOTY_CODE);
+ if(Objects.nonNull(systemDictData)){
+ //鍒ゆ柇鏀剧疆浣嶇疆
+ if(platformWmsDetailMapper.selectCount(new QueryWrapper<PlatformWmsDetail>().lambda().eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
+ .eq(PlatformWmsDetail::getWmsJobId,platformWmsJob.getId())
+ .apply(" find_in_set(IN_REPERTOTY_CODE ,'"+systemDictData.getCode()+"')")
+ .eq(PlatformWmsDetail::getInRepertotyCode,"")
+ .isNotNull(PlatformWmsDetail::getInRepertotyCode)
+ ) > Constants.ZERO && Constants.equalsInteger(platform.getType(),Constants.ONE)){
+ return platformJob;
+ }
}
if(Constants.equalsInteger(platform.getType(),Constants.ZERO)){
return platformJob;
@@ -2879,4 +2899,31 @@
return null;
}
+
+ @Override
+ public void jobUrge(Integer jobId,LoginUserInfo loginUserInfo){
+ if(Objects.isNull(jobId)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ PlatformJob platformJob = platformJobMapper.selectById(jobId);
+ if(Objects.isNull(platformJob)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())
+ || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())
+ || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey()))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鐘舵�佸凡娴佽浆");
+ }
+
+ platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda()
+ .set(PlatformJob::getUrgeUser,loginUserInfo.getId())
+ .set(PlatformJob::getUrgeTime,DateUtil.getCurrDateTime())
+ .set(PlatformJob::getEditDate,DateUtil.getCurrDateTime())
+ .eq(PlatformJob::getId,platformJob.getId())
+ );
+ }
+
+
+
+
}
--
Gitblit v1.9.3