From 20aa51767d2bcc0baf30e1eee5ccce05ace9a6fe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 09 十一月 2024 14:07:25 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java | 25 +++++++++++++++++++++++--
1 files changed, 23 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..9e3899c 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,13 @@
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.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;
@@ -38,6 +38,18 @@
}
@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
public Boolean checkIfFinish(Long avoAgv, String currCodeData) {
if (Cools.isEmpty(avoAgv, currCodeData)) {
return null;
@@ -62,7 +74,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