From 9569af2a6abcccc3f312abff0a7e660c0f2be2c8 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 26 十二月 2025 17:23:19 +0800
Subject: [PATCH] 电压改电量
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 2 +-
zy-acs-flow/src/map/insight/agv/AgvMain.jsx | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java | 2 +-
zy-acs-manager/src/main/resources/mapper/manager/AgvDetailMapper.xml | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zy-acs-flow/src/map/insight/agv/AgvMain.jsx b/zy-acs-flow/src/map/insight/agv/AgvMain.jsx
index d15684b..9a2f5c6 100644
--- a/zy-acs-flow/src/map/insight/agv/AgvMain.jsx
+++ b/zy-acs-flow/src/map/insight/agv/AgvMain.jsx
@@ -178,7 +178,7 @@
<KeyValuePair label={translate('common.field.status')} value={info?.agvStatus} />
</Grid>
<Grid item xs={12}>
- <KeyValuePair label={translate('table.field.agvDetail.vol')} value={info?.vol} />
+ <KeyValuePair label={translate('table.field.agvDetail.soc')} value={info?.soc} />
</Grid>
{/* <Grid item xs={12}>
<KeyValuePair label={translate('table.field.agvDetail.soc')} value={info?.soc} />
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java
index b109ac2..fb6de98 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java
@@ -155,7 +155,7 @@
agvDetail.setCode(code.getId());
agvDetail.setStatus(AgvStatusType.IDLE.val);
agvDetail.setAgvAngle(workDirection);
- agvDetail.setVol(5000);
+ agvDetail.setSoc(80);
agvDetailService.updateById(agvDetail);
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
index d5b5c73..4b285d7 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
@@ -54,7 +54,7 @@
for (Agv agv : agvList) {
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
- if (null == agvDetail || null == agvDetail.getVol() || null == agvDetail.getAgvStatus()) {
+ if (null == agvDetail || null == agvDetail.getSoc() || null == agvDetail.getAgvStatus()) {
continue;
}
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
index 9f155e7..ed29f17 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
@@ -206,7 +206,7 @@
log.warn("[{}]鍙稟gv鏈敹鍒扮姸鎬佸寘......", agvNo);
return false;
}
- if (agvDetail.getVol() == 0) {
+ if (null == agvDetail.getSoc() || agvDetail.getSoc() == 0) {
return false;
}
if (!agvDetail.getAgvStatus().equals(AgvStatusType.IDLE) && !agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
@@ -214,7 +214,7 @@
return false;
}
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
- if (agvDetail.getVol() < agvModel.getQuaBattery()) {
+ if (agvDetail.getSoc() < agvModel.getQuaBattery()) {
return false;
}
}
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 aa83f0b..7044fea 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
@@ -94,7 +94,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 {
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/AgvDetailMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/AgvDetailMapper.xml
index 2e36048..135e69b 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/AgvDetailMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/AgvDetailMapper.xml
@@ -27,7 +27,7 @@
</sql>
<select id="selectMajorByAgvId" resultType="com.zy.acs.manager.manager.entity.AgvDetail">
- SELECT id, agv_id, pos, code, last_code, agv_angle, vol, backpack, status, deleted
+ SELECT id, agv_id, pos, code, last_code, agv_angle, vol,soc, backpack, status, deleted
FROM man_agv_detail
WHERE agv_id = #{agvId}
LIMIT 1
--
Gitblit v1.9.1