From 1313906bb1eb983d3beece810035e7fc28d6a92f Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期二, 20 五月 2025 16:57:11 +0800 Subject: [PATCH] 新增充电桩 --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++------ 1 files changed, 35 insertions(+), 6 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java index 2569b2c..ecd5db2 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java @@ -3,15 +3,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zy.acs.framework.common.Cools; -import com.zy.acs.manager.manager.entity.Agv; import com.zy.acs.manager.manager.entity.Code; import com.zy.acs.manager.manager.entity.Jam; import com.zy.acs.manager.manager.entity.Segment; import com.zy.acs.manager.manager.enums.JamStateType; +import com.zy.acs.manager.manager.enums.SegmentStateType; import com.zy.acs.manager.manager.mapper.JamMapper; import com.zy.acs.manager.manager.service.AgvService; import com.zy.acs.manager.manager.service.CodeService; import com.zy.acs.manager.manager.service.JamService; +import com.zy.acs.manager.manager.service.SegmentService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,6 +28,8 @@ private CodeService codeService; @Autowired private AgvService agvService; + @Autowired + private SegmentService segmentService; @Override public Jam getJam(Long agvId, Long jamCode, Long jamSeg) { @@ -48,7 +51,7 @@ */ @Override public List<Jam> getUnfinishedOriginJamByAvo(Long avoAgv, Long currCode, Long currSeg) { - return this.baseMapper.selectUnfinishedJamByAvo(avoAgv, null, null); + return this.baseMapper.selectUnfinishedJamByAvo(avoAgv, currCode, null); } @Override @@ -56,8 +59,9 @@ List<Jam> jams = this.list(new LambdaQueryWrapper<Jam>() .eq(Jam::getJamAgv, jamAgv) .eq(Jam::getJamSeg, jamSeg) - .eq(Jam::getAvoAgv, agvService.selectByUuid(avoAgvNo).getId()) + .eq(Jam::getAvoAgv, agvService.getAgvId(avoAgvNo)) .eq(Jam::getCycleAvo, 1) + .ne(Jam::getState, JamStateType.DEPRECATED.toString()) // .eq(Jam::getState, JamStateType.RUNNING.toString()) ); if (!Cools.isEmpty(jams)) { @@ -68,8 +72,14 @@ @Override public List<Jam> getJamFromSegmentByAvo(Segment jamSeg, String avoAgvNo) { - Agv avoAgv = agvService.selectByUuid(avoAgvNo); - return this.baseMapper.selectJamFromSegmentByAvo(jamSeg.getId(), avoAgv.getId()); + Long avoAgvId = agvService.getAgvId(avoAgvNo); + return this.baseMapper.selectJamFromSegmentByAvo(jamSeg.getId(), avoAgvId); + } + + @Override + public List<Jam> getUnfinishedAvoSegByAvo(String avoAgvNo, Segment currSeg) { + Long agvId = agvService.getAgvId(avoAgvNo); + return this.baseMapper.selectUnfinishedAvoSegByAvo(agvId, null); } @Override @@ -90,7 +100,10 @@ return null; } Date now = new Date(); - Code code = codeService.selectByData(currCodeData); + Code code = codeService.getCacheByData(currCodeData); + if (null == code) { + return null; + } List<Jam> jams = this.list(new LambdaQueryWrapper<Jam>() .eq(Jam::getAvoAgv, avoAgv) .eq(Jam::getAvoCode, code.getId()) @@ -121,4 +134,20 @@ return this.updateById(jam); } + @Override + public boolean isAvoidSeg(Long currSeg) { + List<Jam> list = this.list(new LambdaQueryWrapper<Jam>() + .eq(Jam::getAvoSeg, currSeg) + .eq(Jam::getState, JamStateType.RUNNING.toString())); + if (!Cools.isEmpty(list)) { + for (Jam jam : list) { + Segment jamSeg = segmentService.getById(jam.getJamSeg()); + if (jamSeg.getState().equals(SegmentStateType.WAITING.toString()) || jamSeg.getState().equals(SegmentStateType.RUNNING.toString())) { + return true; + } + } + } + return false; + } + } -- Gitblit v1.9.1