From ebd2f4397a92c6a5096de1b86d59154363344720 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 13 五月 2025 08:48:15 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java | 94 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 86 insertions(+), 8 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
index cce6d63..07c84af 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
@@ -6,6 +6,9 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.framework.exception.CoolException;
+import com.zy.acs.manager.common.domain.BaseParam;
+import com.zy.acs.manager.common.domain.PageParam;
+import com.zy.acs.manager.common.domain.PageResult;
import com.zy.acs.manager.common.exception.BusinessException;
import com.zy.acs.manager.core.domain.Lane;
import com.zy.acs.manager.core.service.LaneService;
@@ -25,6 +28,8 @@
public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements TaskService {
@Autowired
+ private BusService busService;
+ @Autowired
private CodeService codeService;
@Autowired
private LocService locService;
@@ -36,6 +41,11 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private LaneService laneService;
+
+ @Override
+ public PageResult<Task> pageRel(PageParam<Task, BaseParam> pageParam) {
+ return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.checkoutMap()), pageParam.getTotal());
+ }
@Override
public synchronized String generateSeqNum() {
@@ -94,6 +104,7 @@
if (!this.updateById(task)) {
throw new CoolException(BaseRes.ERROR);
}
+ busService.checkoutComplete(task.getBusId());
return Boolean.TRUE;
}
@@ -112,6 +123,7 @@
if (!this.updateById(task)) {
throw new CoolException(BaseRes.ERROR);
}
+ busService.checkoutComplete(task.getBusId());
return Boolean.TRUE;
}
@@ -135,7 +147,7 @@
if (null == codeId) {
return null;
}
- return laneService.search(codeService.getById(codeId).getData());
+ return laneService.search(codeService.getCacheById(codeId).getData());
}
@Override
@@ -158,15 +170,54 @@
if (null == codeId) {
return null;
}
- return laneService.search(codeService.getById(codeId).getData());
+ return laneService.search(codeService.getCacheById(codeId).getData());
}
@Override
- public List<Task> findTasksByLaneHash(String laneHash) {
+ public List<Task> findRunningTasksByLaneHash(String laneHash) {
if (Cools.isEmpty(laneHash)) {
return new ArrayList<>();
}
- return this.list(new LambdaQueryWrapper<Task>().eq(Task::getOriLaneHash, laneHash).or().eq(Task::getDestLaneHash, laneHash));
+ return this.list(new LambdaQueryWrapper<Task>()
+ .in(Task::getTaskSts, TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val())
+ .and(i -> {
+ i.eq(Task::getOriLaneHash, laneHash).or().eq(Task::getDestLaneHash, laneHash);
+ })
+
+ );
+ }
+
+ @Override
+ public List<Task> findTransportTasksByAgv(Long agvId) {
+ if (null == agvId) {
+ return new ArrayList<>();
+ }
+ LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<Task>().eq(Task::getAgvId, agvId);
+ wrapper.in(Task::getTaskSts, TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val());
+ wrapper.notIn(Task::getTaskType, TaskTypeType.MOVE.val(), TaskTypeType.TO_CHARGE.val(), TaskTypeType.TO_STANDBY.val());
+ return this.list(wrapper);
+ }
+
+ @Override
+ public Integer findTransportTasksCountByAgv(Long agvId) {
+ LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<Task>().eq(Task::getAgvId, agvId);
+ wrapper.in(Task::getTaskSts, TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val());
+ wrapper.notIn(Task::getTaskType, TaskTypeType.MOVE.val(), TaskTypeType.TO_CHARGE.val(), TaskTypeType.TO_STANDBY.val());
+ return this.count(wrapper);
+ }
+
+ @Override
+ public Task findLatestTask(Long agvId, TaskStsType taskSts) {
+ LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<Task>()
+ .orderByDesc(Task::getCreateTime)
+ .last("limit 0, 1");
+ if (null != agvId) {
+ wrapper.eq(Task::getAgvId, agvId);
+ }
+ if (null != taskSts) {
+ wrapper.eq(Task::getTaskSts, taskSts.val());
+ }
+ return this.list(wrapper).stream().findFirst().orElse(null);
}
@Transactional
@@ -183,13 +234,13 @@
oriLoc.setLocSts(complete?LocStsType.IDLE.val():LocStsType.STOCK.val());
oriLoc.setUpdateTime(now);
if (!locService.updateById(oriLoc)) {
- throw new BusinessException("Loc [" + task.getOriLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ throw new BusinessException("Loc [" + oriLoc.getLocNo() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
}
destLoc.setLocSts(complete?LocStsType.STOCK.val():LocStsType.IDLE.val());
destLoc.setUpdateTime(now);
if (!locService.updateById(destLoc)) {
- throw new BusinessException("Loc [" + task.getDestLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ throw new BusinessException("Loc [" + destLoc.getLocNo() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
}
break;
case LOC_TO_STA:
@@ -197,18 +248,45 @@
oriLoc.setLocSts(complete?LocStsType.IDLE.val():LocStsType.STOCK.val());
oriLoc.setUpdateTime(now);
if (!locService.updateById(oriLoc)) {
- throw new BusinessException("Loc [" + task.getOriLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ throw new BusinessException("Loc [" + oriLoc.getLocNo() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ }
+
+ destSta = staService.getById(task.getDestSta());
+ destSta.setStaSts(complete?StaStsType.STOCK.val():StaStsType.IDLE.val());
+ destSta.setUpdateTime(now);
+ if (!staService.updateById(destSta)) {
+ throw new BusinessException("Sta [" + destSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
}
break;
case STA_TO_LOC:
+ oriSta = staService.getById(task.getOriSta());
+ oriSta.setStaSts(complete?StaStsType.IDLE.val():StaStsType.STOCK.val());
+ oriSta.setUpdateTime(now);
+ if (!staService.updateById(oriSta)) {
+ throw new BusinessException("Sta [" + oriSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ }
+
destLoc = locService.getById(task.getDestLoc());
destLoc.setLocSts(complete?LocStsType.STOCK.val():LocStsType.IDLE.val());
destLoc.setUpdateTime(now);
if (!locService.updateById(destLoc)) {
- throw new BusinessException("Loc [" + task.getDestLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ throw new BusinessException("Loc [" + destLoc.getLocNo() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
}
break;
case STA_TO_STA:
+ oriSta = staService.getById(task.getOriSta());
+ oriSta.setStaSts(complete?StaStsType.IDLE.val():StaStsType.STOCK.val());
+ oriSta.setUpdateTime(now);
+ if (!staService.updateById(oriSta)) {
+ throw new BusinessException("Sta [" + oriSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ }
+
+ destSta = staService.getById(task.getDestSta());
+ destSta.setStaSts(complete?StaStsType.STOCK.val():StaStsType.IDLE.val());
+ destSta.setUpdateTime(now);
+ if (!staService.updateById(destSta)) {
+ throw new BusinessException("Sta [" + destSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ }
break;
case TO_CHARGE:
case TO_STANDBY:
--
Gitblit v1.9.1