*

lsh

2025-06-06 83023a878d2f54a6abf6524aa49eeca13a774341

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -234,7 +234,7 @@
                return;
            }
            long differenceInSeconds = TimeCalculatorUtils.differenceInMilliseconds(wrkMasts.get(0).getModiTime(), new Date());
            if (differenceInSeconds <= 100) {
            if (differenceInSeconds <= 1000) {
                return;
            }

@@ -270,6 +270,8 @@
            try {
                List<WrkMast> wrkMastlistA = new ArrayList<>();
                List<WrkMast> wrkMastlistB = new ArrayList<>();
                List<WrkMast> wrkMastlistC = new ArrayList<>();
                List<WrkMast> wrkMastlistD = new ArrayList<>();
                for (BasDevpPosition basDevpPosition : basDevpPositionsListUN) {
                    List<WrkMast> wrkMastList = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", basDevpPosition.getDevNo()).eq("wrk_sts", 1L).orderBy("modi_time", true));
                    for (WrkMast wrkMast : wrkMastList) {
@@ -283,12 +285,22 @@
                                } else {
                                    continue;
                                }
                                long differenceInSeconds = TimeCalculatorUtils.differenceInMilliseconds(wrkMast.getModiTime(), new Date());

                                if (SortTheExecutionOfTheCarUtil.devpNoSortbj(basDevpPositionsListUN, wrkMast.getSourceStaNo(), wrkMast.getStaNo())) {
                                    sourceStaNoList.add(wrkMast.getSourceStaNo());
                                    wrkMastlistA.add(wrkMast);
                                    if (differenceInSeconds>600000){
                                        wrkMastlistA.add(wrkMast);
                                    } else {
                                        wrkMastlistC.add(wrkMast);
                                    }
                                } else {
                                    sourceStaNoList.add(wrkMast.getSourceStaNo());
                                    wrkMastlistB.add(wrkMast);
                                    if (differenceInSeconds>600000){
                                        wrkMastlistB.add(wrkMast);
                                    } else {
                                        wrkMastlistD.add(wrkMast);
                                    }
                                }
                            }
                        }
@@ -296,6 +308,8 @@
                }
                wrkMastLists.add(wrkMastlistA);
                wrkMastLists.add(wrkMastlistB);
                wrkMastLists.add(wrkMastlistC);
                wrkMastLists.add(wrkMastlistD);
//                return wrkMastLists;
                wrkMastListAll.add(wrkMastLists);
            } catch (Exception e) {
@@ -602,7 +616,7 @@
                        && rgvProtocol.getStatusType() == RgvStatusType.IDLE
                        && rgvProtocol.getTaskNo1() == 0
                        && rgvProtocol.getAlarm() == 0) {
                    if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(4,devperimeter))) {
                    if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(5,devperimeter))) {
                        log.error("RGV漫游启动命令下发失败，RGV号={}，任务数据={}", rgvNo, "漫游指令");
                        break;
                    }
@@ -661,7 +675,7 @@
                                    wrkMastService.updateById(wrkMast);
                                    continue;
                                }else {
                                    log.error("工作号"+wrkMast.getWrkNo()+"任务完成信息上传处理失败");
                                    log.error("工作号"+wrkMast.getWrkNo()+"任务完成信息上传处理失败1");
                                }
                            } else {
                                //测试用