From a561494b84d6c3511a96a9cbce638ad61fda7a4c Mon Sep 17 00:00:00 2001
From: lzh1232 <15120652+lzh1232@user.noreply.gitee.com>
Date: Sat, 1 Nov 2025 15:15:01 +0800
Subject: [PATCH] =?UTF-8?q?11.1=20=E6=96=B0=E5=A2=9E=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/alops/system/domain/dto/MonitorLastDto.java  | 1 +
 .../main/java/com/alops/system/domain/dto/MonitorListDto.java  | 1 +
 .../src/main/resources/mapper/system/EquBaseMapper.xml         | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorLastDto.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorLastDto.java
index 3a571f1f..4cf5d6f9 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorLastDto.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorLastDto.java
@@ -28,6 +28,7 @@ public class MonitorLastDto {
     private Date installDate;
     private String inCharge;
     private String status;
+    private String brand;
 
     private int warranty;
     private String equImage;
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorListDto.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorListDto.java
index bf07d07c..c9bc90a9 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorListDto.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorListDto.java
@@ -26,6 +26,7 @@ public class MonitorListDto {
     private String health;
     private int fanSpeed;
     private String contWorkPeriod;
+    private String brand;
 
     private int AlertCount;;
     private int unhandledAlertCount;
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 04ce9591..528dee53 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
@@ -259,6 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             c.health,
             c.fanSpeed,
             c.contWorkPeriod,
+            c.brand,
             c.unhandledAlertCount,
             c.AlertCount
         FROM (
@@ -279,6 +280,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                      g.health,
                      g.fan_speed AS fanSpeed,
                      g.cont_work_period AS contWorkPeriod,
+                     b.brand,
                      (SELECT COUNT(1)
                       FROM alert_message a
                       WHERE a.equ_id = b.id AND a.status = 'UNHANDLED') AS unhandledAlertCount,
@@ -351,6 +353,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.equ_type as equTypeId,
             t.name as equTypeName,
             b.status,
+            b.brand,
 
             b.manufacture as equManuId,
             m.name as equManuName,