From 9daeb6eac6e46710055e625bbbd56331b8890e21 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:10:20 +0800
Subject: [PATCH] revert(energy): 撤销 energy 模块移植(与新高原有 em 模块重复)

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 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 5e39c3d..2ec5c50 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
@@ -11,7 +11,7 @@
 /**
  * MES 璁惧鍙拌处 Mapper
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
  */
 @Mapper
 public interface MesDvMachineryMapper extends BaseMapperX<MesDvMachineryDO> {
@@ -24,6 +24,7 @@
                 .eqIfPresent(MesDvMachineryDO::getMachineryTypeId, reqVO.getMachineryTypeId())
                 .inIfPresent(MesDvMachineryDO::getMachineryTypeId, reqVO.getMachineryTypeIds())
                 .eqIfPresent(MesDvMachineryDO::getWorkshopId, reqVO.getWorkshopId())
+                .eqIfPresent(MesDvMachineryDO::getWorkstationId, reqVO.getWorkstationId())
                 .eqIfPresent(MesDvMachineryDO::getStatus, reqVO.getStatus())
                 .orderByDesc(MesDvMachineryDO::getId));
     }
@@ -36,4 +37,20 @@
         return selectCount(MesDvMachineryDO::getMachineryTypeId, machineryTypeId);
     }
 
+    /**
+     * 鎸夋暟閲囪澶囩紪鍙锋煡璇㈣澶囷紙MQTT devId锛�
+     */
+    default MesDvMachineryDO selectByCollectDeviceCode(String collectDeviceCode) {
+        return selectOne(MesDvMachineryDO::getCollectDeviceCode, collectDeviceCode);
+    }
+
+    /**
+     * 鏌ヨ鎵�鏈夊凡閰嶇疆鏁伴噰璁惧缂栧彿鐨勮澶�
+     */
+    default java.util.List<MesDvMachineryDO> selectListWithCollectDeviceCode() {
+        return selectList(new LambdaQueryWrapperX<MesDvMachineryDO>()
+                .isNotNull(MesDvMachineryDO::getCollectDeviceCode)
+                .orderByAsc(MesDvMachineryDO::getId));
+    }
+
 }

--
Gitblit v1.9.3