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-fake/src/main/java/com/zy/acs/fake/FakeBoot.java                                 |    2 ++
 /dev/null                                                                               |   23 -----------------------
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java        |    2 +-
 zy-acs-fake/src/main/resources/application.yml                                          |    2 +-
 zy-acs-fake/src/main/java/com/zy/acs/fake/config/BeanFacConfig.java                     |   24 ++++++++++++++++++++++++
 zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java                 |    3 +--
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/BlockSeverityType.java |    2 +-
 7 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/zy-acs-fake/src/main/java/com/zy/acs/fake/FakeBoot.java b/zy-acs-fake/src/main/java/com/zy/acs/fake/FakeBoot.java
index 713e191..2bb8631 100644
--- a/zy-acs-fake/src/main/java/com/zy/acs/fake/FakeBoot.java
+++ b/zy-acs-fake/src/main/java/com/zy/acs/fake/FakeBoot.java
@@ -3,6 +3,7 @@
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 //@MapperScan("com.zy.**.mapper")
 //@ComponentScan(value = "com.zy.acs.common.config")
@@ -24,6 +25,7 @@
 //@SpringBootApplication(exclude = {org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class})
 @SpringBootApplication
 @MapperScan("com.zy.**.mapper")
+@EnableScheduling
 public class FakeBoot {
 
     public static void main(String[] args) {
diff --git a/zy-acs-fake/src/main/java/com/zy/acs/fake/TestController.java b/zy-acs-fake/src/main/java/com/zy/acs/fake/TestController.java
deleted file mode 100644
index 4edc985..0000000
--- a/zy-acs-fake/src/main/java/com/zy/acs/fake/TestController.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.zy.acs.fake;
-
-import com.zy.acs.fake.service.AgvService;
-import com.zy.acs.framework.common.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by vincent on 12/13/2024
- */
-@RestController
-public class TestController {
-
-    @Autowired
-    private AgvService agvService;
-
-    @GetMapping("/fake")
-    public R fake() {
-        return R.ok().add(agvService.list());
-    }
-
-}
diff --git a/zy-acs-fake/src/main/java/com/zy/acs/fake/config/BeanFacConfig.java b/zy-acs-fake/src/main/java/com/zy/acs/fake/config/BeanFacConfig.java
new file mode 100644
index 0000000..c0e9f59
--- /dev/null
+++ b/zy-acs-fake/src/main/java/com/zy/acs/fake/config/BeanFacConfig.java
@@ -0,0 +1,24 @@
+package com.zy.acs.fake.config;
+
+import com.zy.acs.framework.common.SpringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * Created by vincent on 2023/3/14
+ */
+@Configuration
+public class BeanFacConfig {
+
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    @PostConstruct
+    public void handleInitSpringCtx() {
+        SpringUtils.init(applicationContext);
+    }
+
+}
diff --git a/zy-acs-fake/src/main/resources/application.yml b/zy-acs-fake/src/main/resources/application.yml
index 19b0ffe..3a76b2c 100644
--- a/zy-acs-fake/src/main/resources/application.yml
+++ b/zy-acs-fake/src/main/resources/application.yml
@@ -56,7 +56,7 @@
 
 
 mybatis-plus:
-  mapper-locations: classpath:mapper/*/*.xml
+  mapper-locations: classpath:mapper/*.xml
 #  global-config:
 #    field-strategy: 0
   configuration:
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/BlockSeverityType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/BlockSeverityType.java
index f36a0b5..b8bb92b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/BlockSeverityType.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/BlockSeverityType.java
@@ -6,7 +6,7 @@
 
 //    NONE(0),
     NONE(0),
-    SEVERE(7 * MapDataConstant.MAX_JAM_TIMEOUT),
+    SEVERE(5 * MapDataConstant.MAX_JAM_TIMEOUT),
     ;
 
     public long duration;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
index 3cd06a6..db6cd89 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
@@ -279,7 +279,7 @@
                         if (!Cools.isEmpty(jam.getAvoAgv())
                                 && BlockVehicleDto.customContain(blockVehicleList, agvService.getById(jam.getAvoAgv()).getUuid())) {
 
-                            maxJamTimeoutFactor = 5;
+                            maxJamTimeoutFactor = 4;
 
                         } else {
 
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 5eeab25..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
@@ -16,7 +16,6 @@
 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;
@@ -60,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) {

--
Gitblit v1.9.1