From 4eb9a3a99e21522ede60dcb8bee5b5856b515dc7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 20 十月 2026 14:00:41 +0800
Subject: [PATCH] feat(mes): 添加MES数采功能支持MQTT设备数据采集
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
index a90270a..52303ca 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
@@ -23,6 +23,17 @@
@Mapper
public interface MesProTaskMapper extends BaseMapperX<MesProTaskDO> {
+ /** 鎵�鏈夋帓浜у啓鍏ュ彛浠ョ浉鍚岄『搴忛攣瀹氬伐浣滅珯锛涗簨鍔℃彁浜ゅ悗閲婃斁锛岃法杩涚▼闃叉璧勬簮绔炴�併�� */
+ @org.apache.ibatis.annotations.Select("SELECT id FROM mes_md_workstation WHERE deleted = 0 ORDER BY id FOR UPDATE")
+ List<Long> lockSchedulingResources();
+
+ default List<MesProTaskDO> selectSchedulingTasks() {
+ return selectList(new LambdaQueryWrapperX<MesProTaskDO>()
+ .and(query -> query.isNull(MesProTaskDO::getStatus).or()
+ .notIn(MesProTaskDO::getStatus, MesProTaskStatusEnum.CANCELED.getStatus(), MesProTaskStatusEnum.FINISHED.getStatus()))
+ .orderByAsc(MesProTaskDO::getId));
+ }
+
default PageResult<MesProTaskDO> selectPage(MesProTaskPageReqVO reqVO) {
MPJLambdaWrapperX<MesProTaskDO> query = new MPJLambdaWrapperX<>();
query.selectAll(MesProTaskDO.class);
@@ -69,6 +80,19 @@
return selectPage(reqVO, query);
}
+ /**
+ * 鏌ヨ宸ヤ綔绔欎笂姝ｅ湪杩愯鐨勪换鍔★細鐢熶骇涓�侀儴鍒嗗畬鎴愩�佸凡鍋滃伐
+ */
+ default MesProTaskDO selectRunningTaskByWorkstationId(Long workstationId) {
+ return selectOne(new LambdaQueryWrapperX<MesProTaskDO>()
+ .eq(MesProTaskDO::getWorkstationId, workstationId)
+ .in(MesProTaskDO::getStatus, MesProTaskStatusEnum.PRODUCING.getStatus(),
+ MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus(), MesProTaskStatusEnum.PAUSED.getStatus())
+ .orderByDesc(MesProTaskDO::getLastFeedbackTime)
+ .orderByDesc(MesProTaskDO::getId)
+ .last("LIMIT 1"));
+ }
+
default List<MesProTaskDO> selectListByWorkOrderId(Long workOrderId) {
return selectList(new LambdaQueryWrapperX<MesProTaskDO>()
.eqIfPresent(MesProTaskDO::getWorkOrderId, workOrderId)
--
Gitblit v1.9.3