访客系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liukangdong
2024-09-25 75310c871f4cb82a6985161fbc7e3c7d86f066a4 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java


@@ -261,7 +261,9 @@


                                    Constants.PlatformJobStatus.CALLED.getKey(),


                                    Constants.PlatformJobStatus.WORKING.getKey(),


                                    Constants.PlatformJobStatus.EXCEPTION.getKey(),


                                    Constants.PlatformJobStatus.OVER_NUMBER.getKey()


                                    Constants.PlatformJobStatus.OVER_NUMBER.getKey(),


                                    Constants.PlatformJobStatus.TRANSFERING.getKey()




                            )


//                    .like(PlatformJob::getArriveDate,DateUtil.getCurrDate())


                    .orderByDesc(PlatformJob::getCreateDate)


@@ -282,7 +284,8 @@


        PlatformWorkVO platformWorkVO = new PlatformWorkVO();


        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){


            //获取月台下的所有作业数据


            List<PlatformJob> platformJobs = platformJobList.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),platformId)).collect(Collectors.toList());


            List<PlatformJob> platformJobs = platformJobList.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),platformId)


             && !Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())).collect(Collectors.toList());


            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobs)){


                platformWorkVO.setWorkNum(


                        platformJobs.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())).collect(Collectors.toList()).size()


@@ -291,7 +294,11 @@


                        platformJobs.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())).collect(Collectors.toList()).size()


                );


                platformWorkVO.setWaitNum(


                        platformJobs.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())).collect(Collectors.toList()).size()


                        platformJobs.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey())


                        ).collect(Collectors.toList()).size()


                        +


                        platformJobList.stream().filter(i->Constants.equalsInteger(platformId,i.getPlatformId())


                                && Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())).collect(Collectors.toList()).size()


                );


                platformWorkVO.setExceptionNum(


                        platformJobs.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey())).collect(Collectors.toList()).size()