From a96d6e291e5f4b3f455e9f2230a28d1834550ad1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 14 十一月 2024 14:58:42 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 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 b495c0a..af8c23b 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
@@ -2,13 +2,14 @@
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.Code;
import com.zy.acs.manager.manager.entity.Jam;
import com.zy.acs.manager.manager.enums.JamStateType;
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.framework.common.Cools;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -22,6 +23,8 @@
@Autowired
private CodeService codeService;
+ @Autowired
+ private AgvService agvService;
@Override
public Jam getJam(Long agvId, Long jamCode, Long jamSeg) {
@@ -35,6 +38,33 @@
return jams.stream().findFirst().orElse(null);
}
return null;
+ }
+
+ @Override
+ public Jam getCycleJam(Long jamAgv, Long jamSeg, String avoAgvNo) {
+ 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::getCycleAvo, 1)
+// .eq(Jam::getState, JamStateType.RUNNING.toString())
+ );
+ if (!Cools.isEmpty(jams)) {
+ return jams.stream().findFirst().orElse(null);
+ }
+ return null;
+ }
+
+ @Override
+ public List<Jam> queryByAvoid(Long avoAgv, JamStateType jamState) {
+ if (null == avoAgv) {
+ return null;
+ }
+ LambdaQueryWrapper<Jam> wrapper = new LambdaQueryWrapper<Jam>().eq(Jam::getAvoAgv, avoAgv);
+ if (null != jamState) {
+ wrapper.eq(Jam::getState, jamState.toString());
+ }
+ return this.list(wrapper);
}
@Override
@@ -62,7 +92,16 @@
@Override
public boolean deprecate(Long id, Long loginUserId) {
- return false;
+ Jam jam = this.getById(id);
+ if (null == jam) {
+ return false;
+ }
+ Date now = new Date();
+ jam.setState(JamStateType.DEPRECATED.toString());
+ jam.setUpdateTime(now);
+ jam.setEndTime(now);
+ jam.setUpdateBy(loginUserId);
+ return this.updateById(jam);
}
}
--
Gitblit v1.9.1