From de364ecdcbee20a85e1e80025f8f686e359e88ef Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 17 七月 2025 18:46:29 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java b/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java
index 09352e4..eff1591 100644
--- a/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java
@@ -2,12 +2,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.ReportToDismantleTheStackHandler;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.protocol.StaProtocol;
+import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -28,29 +30,29 @@
@Autowired
private WrkMastService wrkMastService;
- @Autowired
- private BasDevpService basDevpService;
@Scheduled(cron = "0/1 * * * * ? ")
private void execute(){//鎷嗗灈淇℃伅涓婁紶
int[] staNos =new int[]{118,120,121};
List<Integer> integersStaArr = new ArrayList<>();
List<Long[]> stalistArr = new ArrayList<>();
for(Integer staNo : staNos){
- BasDevp basDevp = basDevpService.selectById(staNo);
- if (Cools.isEmpty(basDevp) || basDevp.getWrkNo()==0){
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = devpThread.getStation().get(staNo);
+ if (staProtocol == null || !staProtocol.isAutoing() || staProtocol.getWorkNo()==0) {
continue;
}
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()));
if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("0")){
continue;
}
Date modiTime = wrkMast.getModiTime();
stalistArr.add(new Long[]{staNo.longValue(), modiTime.getTime()});
}
- if (!stalistArr.isEmpty() && stalistArr.size()>1){
+ if (!stalistArr.isEmpty()){
// Collections.sort(stalistArr, (a, b) -> a[1] - b[1]); // 闄嶅簭鎺掑垪
-
- Collections.sort(stalistArr, Comparator.comparingLong(arr -> arr[1]));
+ if (stalistArr.size()>1){
+ Collections.sort(stalistArr, Comparator.comparingLong(arr -> arr[1]));
+ }
for (Long[] staNowArr : stalistArr){
integersStaArr.add(staNowArr[0].intValue());
}
--
Gitblit v1.9.1