From 16f4bb3c28fc85cffcc511718c903ada9fdab134 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 26 十二月 2025 16:59:45 +0800
Subject: [PATCH] 调用mes导入工程参数修改，Excel表数据流程卡号一致;增加读取层号/工程号方法; 工程号一致覆盖更新
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/mapper/DeviceGroupRelationMapper.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 48a403a..354cae1 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
@@ -58,12 +58,12 @@
*/
@Select("SELECT d.id, d.device_name as deviceName, d.device_code as deviceCode, " +
"d.device_type as deviceType, d.plc_ip as plcIp, dgr.role, d.status, " +
- "ds.last_heartbeat as lastHeartbeat, " +
+ "ds.last_heartbeat as lastHeartbeat, d.enabled, " +
"CASE WHEN ds.status = 'ONLINE' THEN TRUE ELSE FALSE END as isOnline " +
"FROM device_config d " +
"INNER JOIN device_group_relation dgr ON d.id = dgr.device_id " +
- "LEFT JOIN device_status ds ON d.device_id = ds.device_id " +
- " AND ds.id = (SELECT MAX(id) FROM device_status WHERE device_id = d.device_id) " +
+ "LEFT JOIN device_status ds ON CAST(d.id AS CHAR) = ds.device_id " +
+ " AND ds.id = (SELECT MAX(id) FROM device_status WHERE device_id = CAST(d.id AS CHAR)) " +
"WHERE dgr.group_id = #{groupId} AND dgr.is_deleted = 0 AND d.is_deleted = 0 " +
"ORDER BY dgr.connection_order ASC")
List<DeviceGroupVO.DeviceInfo> getGroupDevices(@Param("groupId") Long groupId);
@@ -107,8 +107,8 @@
@Select("SELECT COUNT(DISTINCT d.id) " +
"FROM device_config d " +
"INNER JOIN device_group_relation dgr ON d.id = dgr.device_id " +
- "LEFT JOIN device_status ds ON d.device_id = ds.device_id " +
- " AND ds.id = (SELECT MAX(id) FROM device_status WHERE device_id = d.device_id) " +
+ "LEFT JOIN device_status ds ON CAST(d.id AS CHAR) = ds.device_id " +
+ " AND ds.id = (SELECT MAX(id) FROM device_status WHERE device_id = CAST(d.id AS CHAR)) " +
"WHERE dgr.group_id = #{groupId} " +
" AND dgr.is_deleted = 0 " +
" AND d.is_deleted = 0 " +
--
Gitblit v1.8.0