#

luxiaotao1123

2024-12-16 462f2809d3309e83419e0476b0eef892faf312ee

#

 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) {

 zy-acs-fake/src/main/java/com/zy/acs/fake/TestController.java

File was deleted

 zy-acs-fake/src/main/java/com/zy/acs/fake/config/BeanFacConfig.java

New file
@@ -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);
    }

}

 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:

 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;

 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 {


 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) {