月台自动叫号处理问题

rk

2 天以前 2a8c4e590db641bbb3c1f5fc016a0b99bb52cdff

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java

@@ -696,10 +696,10 @@
        savePlatformLog(Constants.PlatformJobLogType.SIGN.getKey(),oldPlatformJob,platformJob,
                Constants.PlatformJobLogType.SIGN.getInfo());
        //签到微信通知 2025年3月26日14:25:00
        logger.info("签到微信通知=========================>开始====签到类型=>"+signInDTO.getSignType()+"===>人员主键=>"+platformGroup.getSignInNoticeUsers());
        log.info("签到微信通知=========================>开始====签到类型=>"+signInDTO.getSignType()+"===>人员主键=>"+platformGroup.getSignInNoticeUsers());
        if(!Constants.equalsInteger(signInDTO.getSignType(),Constants.TWO)&&
                StringUtils.isNotBlank(platformGroup.getSignInNoticeUsers())){
            logger.info("签到微信通知=========================>进入");
            log.info("签到微信通知=========================>进入");
            List<SystemUser> systemUserList = systemUserMapper.selectList(new QueryWrapper<SystemUser>().lambda()
                    .eq(SystemUser::getDeleted,Constants.ZERO).eq(SystemUser::getStatus,Constants.ZERO).isNotNull(SystemUser::getOpenid)
                    .in(SystemUser::getMemberId,Arrays.asList(platformGroup.getSignInNoticeUsers().split(",")))
@@ -712,7 +712,7 @@
                );
            }
        }
        logger.info("签到微信通知=========================>结束");
        log.info("签到微信通知=========================>结束");
    }


@@ -1036,7 +1036,6 @@



    private Logger logger = LoggerFactory.getLogger(PlatformJobServiceImpl.class);

    @Override
    public void sendInPark(PlatformJob platformJob){
@@ -1710,7 +1709,7 @@
                               jobIds.add(job.getJobId());
                           }
                       }catch (Exception e){
                           logger.error("=============更新电子锁状态信息异常："+e.getMessage());
                           log.error("=============更新电子锁状态信息异常："+e.getMessage());
                       }
                   }
               }
@@ -2576,9 +2575,6 @@
        return platformJob;
    }




    @Override
    public void autoPlatformCallCar(WmsService wmsService){
        //查询当前开启的月台数据
@@ -2586,6 +2582,7 @@
                .eq(PlatformGroup::getIsdeleted,Constants.ZERO).eq(PlatformGroup::getAutoCall,Constants.ONE)
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(allPlatformGroup)){
            log.error("========月台自动叫号============结束：无自动叫号月台组");
            return;
        }
        //过滤当前时间段不在时间内的月台组  AUTO_CALL_END_TIME AUTO_CALL_START_TIME
@@ -2596,6 +2593,7 @@
                && Integer.valueOf(i.getAutoCallEndTime().replaceAll(":","")) > nowHm
        ).collect(Collectors.toList());
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(autoCallGroup)){
            log.error("========月台自动叫号============结束：无工作时间内 自动叫号月台组");
            return;
        }
        //查询所有月台
@@ -2607,12 +2605,14 @@
                .in(Platform::getGroupId,autoCallGroup.stream().map(i->i.getId()).collect(Collectors.toList()))
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(platformList)){
            log.error("========月台自动叫号============结束：无自动叫号月台");
            return;
        }
        //循环所有自动叫号月台
        for (PlatformGroup platformGroup:autoCallGroup) {
            List<Platform> platforms = platformList.stream().filter(i->Constants.equalsInteger(i.getGroupId(),platformGroup.getId())).collect(Collectors.toList());
            if(CollectionUtils.isEmpty(platforms)){
                log.error("========月台自动叫号============结束：无自动叫号月台-"+platformGroup.getName());
                continue;
            }
            Boolean isDefaul = false;
@@ -2630,7 +2630,6 @@
                }
            }
            for (Platform platform:platforms) {

                //月台 叫号入园数量
                Integer workingNum = platform.getWorkingNum();
                //查询当前月台是否存在月台叫号数据 如果大于等于可叫号数量 则跳过
@@ -2639,6 +2638,7 @@
                        .eq(PlatformJob::getPlatformId,platform.getId())
                        .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())).intValue();
                if(workNum>=workingNum){
                    log.error("========月台自动叫号============结束：超过自动叫号作业限制-"+platform.getName());
                    continue;
                };

@@ -2659,11 +2659,13 @@
                        .orderByDesc(PlatformJob::getStatus,PlatformJob::getUrgeTime)
                        .orderByAsc(PlatformJob::getSignDate));
                if(CollectionUtils.isEmpty(platformJobList)){
                    log.error("========月台自动叫号============结束：无满足条件的作业1-"+platform.getName());
                    continue;
                }
                for (int i = 0; i < workingNum - workNum ; i++) {
                    PlatformJob platformJob  = this.getAutoCallJob(platformJobList,platform,isDefaul,platformGroup);
                    if(Objects.isNull(platformJob)){
                        log.error("========月台自动叫号============结束：无满足条件的作业2-"+platform.getName());
                        continue;
                    }
                    JobOperateDTO jobOperateDTO = new JobOperateDTO();
@@ -2681,7 +2683,7 @@
                            wmsService.orderPlatformBind(callPlatformJob);
                        }
                    }catch (Exception e){
                        logger.error("月台自动叫号权限下发失败：{}"+JSONObject.toJSONString(platform));
                        log.error("月台自动叫号权限下发失败：{}"+JSONObject.toJSONString(platform));
                    }
                }
            }
@@ -2779,7 +2781,7 @@
                            wmsService.orderPlatformBind(callPlatformJob);
                        }
                    }catch (Exception e){
                        logger.error("自动叫号入园权限下发失败：{}"+JSONObject.toJSONString(platform));
                        log.error("自动叫号入园权限下发失败：{}"+JSONObject.toJSONString(platform));
                    }
                }
            }
@@ -2814,7 +2816,7 @@
            // 3）如若不满足以上两点，则自动分配至散件月台进行作业；
            if(Constants.equalsInteger(platformGroup.getType(),Constants.ONE)){
                //装货月台 - 出库
                if(Objects.nonNull(platformJob.getWmsId())){
                if(Constants.equalsInteger(platformJob.getOrigin(),Constants.ONE)){
                    // WM推送任务
                    List<PlatformWmsDetail> platformWmsDetailList = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>().lambda()
                            .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
@@ -2846,10 +2848,11 @@
                            }
                        }
                    }
                    //循环WMS任务 未分配至整托盘月台则直接分配到散托盘月台
                    if(Constants.equalsInteger(platform.getType(),Constants.ONE)){
                        return platformJob;
                    }
                    return null;
//                    //循环WMS任务 未分配至整托盘月台则直接分配到散托盘月台
//                    if(Constants.equalsInteger(platform.getType(),Constants.ONE)){
//                        return platformJob;
//                    }
                }else{
                    //物流车预约的任务 直接分配 散托盘月台
                    if(Constants.equalsInteger(platform.getType(),Constants.TWO)){