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 +++++++++++++++++---
 src/main/java/com/zy/core/MainProcess.java                  |    4 ++++
 src/main/resources/application.yml                          |    2 +-
 3 files changed, 22 insertions(+), 4 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) {
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 4034c7e..3bd7a0f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -10,6 +10,7 @@
 
 import javax.annotation.PreDestroy;
 import java.util.ArrayList;
+import java.util.Date;
 
 /**
  * WCS涓绘祦绋�
@@ -51,6 +52,7 @@
                 try {
                     // 闂撮殧
                     Thread.sleep(200);
+                    System.out.println("寮�濮嬶細"+new Date().getTime());
 
                     // 绯荤粺杩愯鐘舵�佸垽鏂�
                     if (SystemProperties.WCS_RUNNING_STATUS.get()) {
@@ -67,6 +69,8 @@
                     mainService.rgvCompleteWrkMastSta(autoZ);
                     //鏇存柊浣嶇疆淇℃伅
                     mainService.updateStePosition();
+                    System.out.println("缁撴潫锛�"+new Date().getTime());
+
 
                 } catch (Exception e) {
                     e.printStackTrace();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 80cf2b1..807458d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -57,7 +57,7 @@
   # 灏忚溅鏁�
   rgvCount: 10
   # 寤惰繜鏃堕棿
-  rgvDate: 1
+  rgvDate: 0.5
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:

--
Gitblit v1.9.1