From 9cf46e9207c7635065ab85dfb171946ba7e6ba02 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 六月 2025 11:07:40 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 27e2d7b..03c9dbe 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/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) {
--
Gitblit v1.9.1