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/dv/machinery/MesDvMachineryMapper.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java
index 56c2161..6c3904b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java
@@ -8,6 +8,8 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
/**
* MES 璁惧鍙拌处 Mapper
*
@@ -25,6 +27,8 @@
.inIfPresent(MesDvMachineryDO::getMachineryTypeId, reqVO.getMachineryTypeIds())
.eqIfPresent(MesDvMachineryDO::getWorkshopId, reqVO.getWorkshopId())
.eqIfPresent(MesDvMachineryDO::getWorkstationId, reqVO.getWorkstationId())
+ .eqIfPresent(MesDvMachineryDO::getCollectDeviceCode, reqVO.getCollectDeviceCode())
+ .eqIfPresent(MesDvMachineryDO::getCollectEnabled, reqVO.getCollectEnabled())
.eqIfPresent(MesDvMachineryDO::getStatus, reqVO.getStatus())
.orderByDesc(MesDvMachineryDO::getId));
}
@@ -33,6 +37,16 @@
return selectOne(MesDvMachineryDO::getCode, code);
}
+ default MesDvMachineryDO selectByCollectDeviceCode(String collectDeviceCode) {
+ return selectOne(MesDvMachineryDO::getCollectDeviceCode, collectDeviceCode);
+ }
+
+ default List<MesDvMachineryDO> selectListWithCollectDeviceCode() {
+ return selectList(new LambdaQueryWrapperX<MesDvMachineryDO>()
+ .isNotNull(MesDvMachineryDO::getCollectDeviceCode)
+ .orderByAsc(MesDvMachineryDO::getId));
+ }
+
default Long selectCountByMachineryTypeId(Long machineryTypeId) {
return selectCount(MesDvMachineryDO::getMachineryTypeId, machineryTypeId);
}
--
Gitblit v1.9.3