From 24f6766a113090fb97f9dd399586b61a364702ae Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 31 三月 2026 16:36:47 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
index bb6dfe4..485040c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.xingshuangs.iot.protocol.modbus.service.ModbusTcp;
import com.zy.acs.common.enums.AgvStatusType;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.common.utils.CommonUtil;
@@ -10,12 +11,16 @@
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.mapper.FuncStaMapper;
import com.zy.acs.manager.manager.service.*;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
+@Slf4j
@Service("funcStaService")
public class FuncStaServiceImpl extends ServiceImpl<FuncStaMapper, FuncSta> implements FuncStaService {
@@ -31,6 +36,9 @@
private TaskService taskService;
@Autowired
private AgvAreaDispatcher agvAreaDispatcher;
+
+
+
@Override
public FuncSta getByCodeAndType(Long codeId, String type) {
@@ -61,15 +69,17 @@
}
// area limit
- List<String> areaCodeList = agvAreaDispatcher.getCodesByAgvId(agvId);
- if (Cools.isEmpty(areaCodeList)) {
- funcStaList.clear();
- } else {
- funcStaList.removeIf(funcSta -> {
- Code code = codeService.getCacheById(funcSta.getCode());
- if (Cools.isEmpty(code, code.getData())) { return true; }
- return !areaCodeList.contains(code.getData());
- });
+ if (agvAreaDispatcher.isAgvExistsInAnyArea(agvId)) {
+ List<String> areaCodeList = agvAreaDispatcher.getCodesByAgvId(agvId);
+ if (Cools.isEmpty(areaCodeList)) {
+ funcStaList.clear();
+ } else {
+ funcStaList.removeIf(funcSta -> {
+ Code code = codeService.getCacheById(funcSta.getCode());
+ if (Cools.isEmpty(code, code.getData())) { return true; }
+ return !areaCodeList.contains(code.getData());
+ });
+ }
}
if (!Cools.isEmpty(funcStaList)) {
@@ -92,7 +102,7 @@
AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
- if (agvDetail.getVol() < agvModel.getQuaBattery()) {
+ if (agvDetail.getSoc() < agvModel.getQuaBattery()) {
return false;
}
} else {
--
Gitblit v1.9.1