From 462f2809d3309e83419e0476b0eef892faf312ee Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 16 十二月 2024 10:11:47 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java
index 5570441..7b3937e 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java
@@ -7,18 +7,15 @@
import com.zy.acs.common.domain.protocol.AGV_01_UP;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.Cools;
+import com.zy.acs.manager.core.service.MapService;
import com.zy.acs.manager.manager.entity.Action;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.enums.ActionStsType;
import com.zy.acs.manager.manager.enums.StatusType;
-import com.zy.acs.manager.manager.service.ActionService;
-import com.zy.acs.manager.manager.service.AgvDetailService;
-import com.zy.acs.manager.manager.service.AgvService;
-import com.zy.acs.manager.manager.service.CodeService;
+import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -50,6 +47,10 @@
private ConfigService configService;
@Autowired
private CodeService codeService;
+ @Autowired
+ private MapService mapService;
+ @Autowired
+ private JamService jamService;
/**
* 1.AgvDataService.dataProcess [ agvDetail: vol, code, agvAngle, agvStatus ]
@@ -58,7 +59,7 @@
* 4.AgvServiceImpl.judgeOnline
* 5.
*/
- @Scheduled(cron = "0/1 * * * * ? ")
+// @Scheduled(cron = "0/1 * * * * ? ")
public void process() {
Boolean fakeSign = configService.getVal("fakeSign", Boolean.class);
if (null == fakeSign || !fakeSign) {
@@ -68,7 +69,7 @@
List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
// init executorService
if (null == this.executorService) {
- int count = agvList.size() > 30 ? agvList.size() : 20;
+ int count = agvList.size();
this.executorService = Executors.newFixedThreadPool(count);
}
@@ -88,6 +89,8 @@
, agvDetailService
, actionService
, codeService
+ , mapService
+ , jamService
, actionList
));
}
--
Gitblit v1.9.1