From 1566e4c7604d85737ea67fe6757e71b8185fa48e Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 18 十一月 2025 16:52:42 +0800
Subject: [PATCH] 添加设备管理页面，添加测试设备任务监控页面
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/mapper/DeviceGroupRelationMapper.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/mapper/DeviceGroupRelationMapper.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/mapper/DeviceGroupRelationMapper.java
index 6ae3625..f9eb11f 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/mapper/DeviceGroupRelationMapper.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/mapper/DeviceGroupRelationMapper.java
@@ -1,6 +1,7 @@
package com.mes.device.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.device.entity.DeviceConfig;
import com.mes.device.entity.DeviceGroupRelation;
import com.mes.device.vo.DeviceGroupVO;
import org.apache.ibatis.annotations.Mapper;
@@ -77,4 +78,19 @@
"INNER JOIN device_group_relation dgr ON dgc.id = dgr.group_id " +
"WHERE dgr.device_id = #{deviceId} AND dgr.is_deleted = 0 AND dgc.is_deleted = 0")
List<DeviceGroupVO.GroupInfo> getDeviceGroups(@Param("deviceId") Long deviceId);
+
+ /**
+ * 鑾峰彇鎸夎繛鎺ラ『搴忔帓搴忕殑璁惧閰嶇疆鍒楄〃
+ *
+ * @param groupId 璁惧缁処D
+ * @return 璁惧閰嶇疆闆嗗悎
+ */
+ @Select("SELECT d.* " +
+ "FROM device_group_relation dgr " +
+ "INNER JOIN device_config d ON dgr.device_id = d.id " +
+ "WHERE dgr.group_id = #{groupId} " +
+ " AND dgr.is_deleted = 0 " +
+ " AND d.is_deleted = 0 " +
+ "ORDER BY IFNULL(dgr.connection_order, 0) ASC, dgr.id ASC")
+ List<DeviceConfig> getOrderedDeviceConfigs(@Param("groupId") Long groupId);
}
\ No newline at end of file
--
Gitblit v1.8.0