From f02d7400dfdf6bcd6022a45c06fd40c5ca23ecda Mon Sep 17 00:00:00 2001 From: YYD-YY <2962062657@qq.com> Date: Mon, 13 Oct 2025 21:25:38 +0800 Subject: [PATCH 1/2] 10.13 --- .../main/java/com/alops/system/domain/dto/EquBaseQueryDto.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquBaseQueryDto.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquBaseQueryDto.java index 33f696dd..76c7ce07 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquBaseQueryDto.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquBaseQueryDto.java @@ -18,8 +18,7 @@ public class EquBaseQueryDto implements Serializable { private String id; /** 设备类型 (equ_type, varchar) */ private String equTypeId; - /** 设备类型 (equ_type, varchar) */ - private String equTypeId; + /** 设备类型 (equ_type, varchar) */ private String equType; /** 设备名称 (name, varchar) */ From 2387f668f8809c140c3facfbabfcda22dc40e588 Mon Sep 17 00:00:00 2001 From: YYD-YY <2962062657@qq.com> Date: Wed, 15 Oct 2025 21:20:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?10.15=20=E4=BF=AE=E6=94=B9=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2last=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/system/EquBaseMapper.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml index 70a53d5d..1fe44e47 100644 --- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml +++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml @@ -324,9 +324,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN equ_supplier s ON b.supplier_id = s.id LEFT JOIN equ_gather g ON b.id = g.equ_id - where g.cpu_utilization is not null - and b.id = #{id} - + where b.id = #{id} ORDER BY g.gather_time desc limit 1