#

luxiaotao1123

2024-11-11 6324d391d2b0aa5b96128f5e07a612ec7ebf8c20

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.common.enums.AgvStatusType;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.DateUtils;
import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.manager.entity.*;
@@ -16,6 +17,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.Optional;

/**
 * judge whether agv go to funcSta which be charging or standby
@@ -24,6 +26,8 @@
@Slf4j
@Component
public class MaintainScheduler {

    private final RedisSupport redis = RedisSupport.defaultRedisSupport;

    @Autowired
    private AgvService agvService;
@@ -121,15 +125,20 @@
            )) {
                continue;
            }
            // the time between the latest task and now that be must more that 10 seconds
            Integer intervalOfAutoStandby = configService.getVal("intervalOfAutoStandby", Integer.class);
            if (null != intervalOfAutoStandby && intervalOfAutoStandby > 0) {
                Task latestTask = taskService.findLatestTask(agv.getId(), null);
                if (null != latestTask) {
                    long seconds = DateUtils.diffToSeconds(latestTask.getUpdateTime(), new Date());
                    if (seconds < intervalOfAutoStandby) { continue; }
            // the time between the latest task and now that be must more that @{param} seconds
//            if (!Optional.ofNullable((Boolean) redis.getObject(RedisConstant.AGV_TO_STANDBY_FLAG, agv.getUuid())).orElse(false)) {
                Integer intervalOfAutoStandby = configService.getVal("intervalOfAutoStandby", Integer.class);
                if (null != intervalOfAutoStandby && intervalOfAutoStandby > 0) {
                    Task latestTask = taskService.findLatestTask(agv.getId(), null);
                    if (null != latestTask) {
                        long seconds = DateUtils.diffToSeconds(
                                Optional.ofNullable(latestTask.getEndTime()).orElse(latestTask.getUpdateTime())
                                , new Date()
                        );
                        if (seconds < intervalOfAutoStandby) { continue; }
                    }
                }
            }
//            }

            mainService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_STANDBY, null);
        }