#
vincentlu
2025-02-24 572b447708c47d2208632b76b72555f06721091b
#
4个文件已修改
1个文件已添加
73 ■■■■■ 已修改文件
zy-acs-framework/src/main/java/com/zy/acs/framework/common/DateUtils.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/BlockSeverityType.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AnnealedScheduler.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/FuncStaService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-framework/src/main/java/com/zy/acs/framework/common/DateUtils.java
@@ -77,6 +77,10 @@
        return Math.abs(date2.getTime() - date1.getTime())/1000;
    }
    public static long diffToMilliseconds(Date date1, Date date2) {
        return Math.abs(date2.getTime() - date1.getTime());
    }
    private static int getDaysByTimestamp(long timestamp){
        double daysPoint = Arith.divides(2, timestamp, (1000 * 3600 * 24));
        int daysPoint1 = (int) daysPoint;
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/BlockSeverityType.java
@@ -6,7 +6,7 @@
//    NONE(0),
    NONE(0),
    SEVERE(5 * MapDataConstant.MAX_JAM_TIMEOUT),
    SEVERE(5L * MapDataConstant.MAX_JAM_TIMEOUT),
    ;
    public long duration;
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AnnealedScheduler.java
New file
@@ -0,0 +1,34 @@
package com.zy.acs.manager.core.scheduler;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.enums.SegmentStateType;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.SegmentService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@Slf4j
@Component
public class AnnealedScheduler {
    @Autowired
    private AgvService agvService;
    @Autowired
    private SegmentService segmentService;
//    @Scheduled(cron = "0/1 * * * * ? ")
    private void init() throws InterruptedException {
    }
}
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/FuncStaService.java
@@ -16,6 +16,8 @@
    FuncSta checkoutClosestFunSta(Long codeId, List<FuncSta> funcStaList);
    FuncSta checkoutFurthestFunSta(Long codeId, List<FuncSta> funcStaList);
    Boolean isCanBeIdle(FuncSta funcSta);
}
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
@@ -171,6 +171,37 @@
    }
    @Override
    public FuncSta checkoutFurthestFunSta(Long codeId, List<FuncSta> funcStaList) {
        if (Cools.isEmpty(funcStaList)) {
            return null;
        }
        if (null != codeId) {
            Code currCode = codeService.getCacheById(codeId);
            Double[] startPos = new Double[]{currCode.getX(), currCode.getY()};
            // checkout one funSta which is the closest
            // compare => compare返回负数,则排在集合前面 (asc)
            funcStaList.sort(new Comparator<FuncSta>() {
                @Override
                public int compare(FuncSta o1, FuncSta o2) {
                    Code o1Code = codeService.getCacheById(o1.getCode());
                    int o1Distance = CommonUtil.calcDistance(startPos, new Double[]{o1Code.getX(), o1Code.getY()});
                    Code o2Code = codeService.getCacheById(o2.getCode());
                    int o2Distance = CommonUtil.calcDistance(startPos, new Double[]{o2Code.getX(), o2Code.getY()});
                    return o2Distance - o1Distance;
                }
            });
        }
        return funcStaList.stream().findFirst().orElse(null);
    }
    @Override
    public Boolean isCanBeIdle(FuncSta funcSta) {
        Agv agv;
        switch (Objects.requireNonNull(FuncStaType.query(funcSta.getType()))) {