From ce95462d74e787653ef6a04f3df6bb631956725f Mon Sep 17 00:00:00 2001 From: gaoyutao Date: Fri, 7 Nov 2025 10:21:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E9=A1=B9=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rocketmq/InitialSwitchOtherCollectDataMapper.xml | 8 ++++---- .../rocketmq/InitialSystemOtherCollectDataMapper.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml index 7ee8304..67adb1c 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml +++ b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml @@ -94,12 +94,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" MAX(CASE WHEN t.collect_type = 'entPhysicalName' THEN t.collect_value END) as entPhysicalName, MAX(CASE WHEN t.collect_type = 'entPhysicalSoftwareRev' THEN t.collect_value END) as entPhysicalSoftwareRev FROM `initial_switch_other_collect_data` t - LEFT JOIN ( - SELECT client_id, MAX(create_time) as max_time + INNER JOIN ( + SELECT collect_type, MAX(create_time) as max_time FROM `initial_switch_other_collect_data` WHERE client_id = #{clientId} - GROUP BY client_id - ) latest ON t.client_id = latest.client_id AND t.create_time = latest.max_time + GROUP BY collect_type + ) latest ON t.collect_type = latest.collect_type AND t.create_time = latest.max_time WHERE t.client_id = #{clientId} \ No newline at end of file diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemOtherCollectDataMapper.xml b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemOtherCollectDataMapper.xml index 503a9ac..93626e6 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemOtherCollectDataMapper.xml +++ b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemOtherCollectDataMapper.xml @@ -93,12 +93,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" MAX(CASE WHEN t.collect_type = 'systemLocaltimeCollect' THEN t.collect_value END) as systemLocaltimeCollect, MAX(CASE WHEN t.collect_type = 'systemUptimeCollect' THEN t.collect_value END) as systemUptimeCollect FROM `initial_system_other_collect_data` t - LEFT JOIN ( - SELECT client_id, MAX(create_time) as max_time + INNER JOIN ( + SELECT collect_type, MAX(create_time) as max_time FROM `initial_system_other_collect_data` WHERE client_id = #{clientId} - GROUP BY client_id - ) latest ON t.client_id = latest.client_id AND t.create_time = latest.max_time + GROUP BY collect_type + ) latest ON t.collect_type = latest.collect_type AND t.create_time = latest.max_time WHERE t.client_id = #{clientId} \ No newline at end of file