From a118b94933287e2705af0258f24565251e23acf3 Mon Sep 17 00:00:00 2001
From: YYD-YY <2962062657@qq.com>
Date: Fri, 10 Oct 2025 21:55:00 +0800
Subject: [PATCH] =?UTF-8?q?10.10=E4=BF=AE=E6=AD=A3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/alops/system/domain/EquBase.java | 12 +--
 .../com/alops/system/domain/EquInterface.java |  2 +-
 .../com/alops/system/domain/EquRouting.java   |  2 +-
 .../com/alops/system/domain/EquVeneer.java    |  5 +-
 .../system/domain/dto/EquBaseQueryDto.java    |  3 +-
 .../system/domain/dto/EquMonitorHomeDto.java  |  1 +
 .../system/domain/dto/MonitorLastDto.java     | 14 +++-
 .../system/domain/dto/MonitorListDto.java     |  9 +-
 .../resources/mapper/system/EquBaseMapper.xml | 83 ++++++++++---------
 .../resources/mapper/system/EquVlanMapper.xml |  2 +-
 10 files changed, 75 insertions(+), 58 deletions(-)

diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java
index 52ce8d3f..4b7302fb 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java
@@ -42,7 +42,7 @@ public class EquBase
 
     /** 设备厂商 id */
     @Excel(name = "设备厂商 id")
-    private String manufacture;
+    private String equManuId;
 
 
     private EquManu manufactureVO;
@@ -53,7 +53,7 @@ public class EquBase
 
     /** 设备类型 id */
     @Excel(name = "设备类型 id")
-    private String equType;
+    private String equTypeId;
 
 
 
@@ -162,12 +162,12 @@ public class EquBase
 
     public void setManufacture(String manufacture)
     {
-        this.manufacture = manufacture;
+        this.equManuId = manufacture;
     }
 
     public String getManufacture()
     {
-        return manufacture;
+        return equManuId;
     }
 
     public void setLocation(String location) 
@@ -182,12 +182,12 @@ public class EquBase
 
     public void setEquType(String equType) 
     {
-        this.equType = equType;
+        this.equTypeId = equType;
     }
 
     public String getEquType() 
     {
-        return equType;
+        return equTypeId;
     }
 
     public void setInCharge(String inCharge)
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquInterface.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquInterface.java
index b88d2466..85619033 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquInterface.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquInterface.java
@@ -17,7 +17,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2025-08-20
  */
 @Data
-public class EquInterface extends BaseEntity
+public class EquInterface
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquRouting.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquRouting.java
index 3982896b..c3a24392 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquRouting.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquRouting.java
@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2025-08-15
  */
 @Data
-public class EquRouting extends BaseEntity
+public class EquRouting
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquVeneer.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquVeneer.java
index b45d8e71..b5195d57 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquVeneer.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquVeneer.java
@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2025-08-15
  */
 @Data
-public class EquVeneer extends BaseEntity
+public class EquVeneer
 {
     private static final long serialVersionUID = 1L;
 
@@ -34,8 +34,7 @@ public class EquVeneer extends BaseEntity
     @Excel(name = "采集id")
     private String equGatherId;
 
-    @Excel(name = "采集+预警同一批标志")
-    private String batchId;
+
 
     public void setId(String id) 
     {
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 22de5c60..30b67a12 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
@@ -17,9 +17,10 @@ public class  EquBaseQueryDto implements Serializable {
 
     private String id;
 
+    /** 设备类型 (equ_type, varchar) */
+    private String equTypeId;
     /** 设备类型 (equ_type, varchar) */
     private String equType;
-
     /** 设备名称 (name, varchar) */
     private String name;
 
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquMonitorHomeDto.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquMonitorHomeDto.java
index f7d51901..b49b12df 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquMonitorHomeDto.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquMonitorHomeDto.java
@@ -10,6 +10,7 @@ import java.util.Date;
 @Data
 public class EquMonitorHomeDto {
     private String id;
+    private String equNumber;      //设备编号
     private String name;           // 设备名称
     private String location;       // 设备位置
     private Float cpuUtilization;  // CPU 使用率
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 10d15e95..3a571f1f 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
@@ -18,7 +18,8 @@ public class MonitorLastDto {
     private String temperature;
 
     // equ_base 表
-    private Long id;
+    private String id;
+    private String equNumber;
     private String name;
     private String version;
     private String deviceLevel;
@@ -26,19 +27,24 @@ public class MonitorLastDto {
     private String location;
     private Date installDate;
     private String inCharge;
-    private int failureFrequency;
+    private String status;
+
     private int warranty;
     private String equImage;
     // equ_type
-    private String equType;
+    private String equTypeId;
+    private String equTypeName;
 
     // equ_manu
-    private String manufacture;
+    private String equManuId;
+    private String equManuName;
     private String ContactBy;
     private String ContactWay;
 
     // equ_supplier
     private String supplierId;
+    private String supplierName;
 
+    private int AlertCount;
     private String unhandledAlertCount;
 }
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 c8fb5e33..6c146d16 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
@@ -12,19 +12,22 @@ public class MonitorListDto {
     private String id;
     private String name;
     private String ip;
-    private String equType;
-    private String manufacture;
+    private String equTypeId;
+    private String equTypeName;
+    private String equManuId;
+    private String equManuName;
     private String version;
     private String deviceLevel;
     private String location;
     private String status;
-    private int failureFrequency;
 
     // 监控指标
     private Float cpuUtilization;
     private String health;
     private int fanSpeed;
     private String contWorkPeriod;
+
+    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 928c5144..5adf8701 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
@@ -9,9 +9,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="name"    column="name"    />
         <result property="version"    column="version"    />
         <result property="ip"    column="ip"    />
-        <result property="manufacture"    column="manufacture"    />
+        <result property="equManuId"    column="manufacture"    />
         <result property="location"    column="location"    />
-        <result property="equType"    column="equ_type"    />
+        <result property="equTypeId"    column="equ_type"    />
         <result property="inCharge"    column="in_charge"    />
         <result property="installDate"    column="install_date"    />
         <result property="lifeCycle"    column="life_cycle"    />
@@ -54,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="cpuUtilization" column="cpu_utilization"/>
         <result property="memoryUtilization" column="memory_utilization"/>
         <result property="health" column="health"/>
+        <result property="equImage"    column="equ_image"    />
+        <result property="equNumber"    column="equ_number"    />
         <result property="contWorkPeriod" column="cont_work_period"/>
         <association property="manufactureVO"   columnPrefix="equ_manu_"  autoMapping="true"   />
         <association property="equTypeVO"   columnPrefix="equ_type_"  autoMapping="true"   />
@@ -134,48 +136,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) tmp ON eg.equ_id = tmp.equ_id AND eg.gather_time = tmp.max_time
         ) g ON b.id = g.equ_id
         <where>
-            <if test="name != null and name != ''">
-                AND b.name LIKE CONCAT('%', #{name}, '%')
-            </if>
-            <if test="location != null and location != ''">
-                AND b.location LIKE CONCAT('%', #{location}, '%')
-            </if>
             <if test="minTime != null">
                 AND b.create_date &gt;= #{minTime}
             </if>
             <if test="maxTime != null">
                 AND b.create_date &lt;= #{maxTime}
             </if>
-            <if test="status != null">
-                AND b.status = #{status}
-            </if>
         </where>
     </select>
 
     <select id="selectEquMonitorListPaged" resultType="MonitorListDto">
         SELECT
-            t.id,
-            t.name,
-            t.ip,
-            t.equType,
-            t.manufacture,
-            t.version,
-            t.deviceLevel,
-            t.location,
-            t.status,
-            t.cpuUtilization,
-            t.health,
-            t.fanSpeed,
-            t.contWorkPeriod,
-            t.failureFrequency,
-            t.unhandledAlertCount
+            c.id,
+            c.name,
+            c.ip,
+            c.equTypeId,
+            c.equTypeName,
+            c.equManuId,
+            c.equManuName,
+            c.version,
+            c.deviceLevel,
+            c.location,
+            c.status,
+            c.cpuUtilization,
+            c.health,
+            c.fanSpeed,
+            c.contWorkPeriod,
+            c.unhandledAlertCount,
+            c.AlertCount
         FROM (
                  SELECT
                      b.id,
                      b.name,
                      b.ip,
-                     t.name AS equType,
-                     m.name AS manufacture,
+                     b.equ_type AS equTypeId,
+                     t.name AS equTypeName,
+                     b.manufacture AS equManuId,
+                     m.name AS equManuName,
                      b.version,
                      b.device_level AS deviceLevel,
                      b.location,
@@ -184,23 +181,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                      g.health,
                      g.fan_speed AS fanSpeed,
                      g.cont_work_period AS contWorkPeriod,
-                     b.failure_frequency AS failureFrequency,
                      (SELECT COUNT(1)
                       FROM alert_message a
-                      WHERE a.equ_id = b.id AND a.status = 'HANDLED') AS unhandledAlertCount,
+                      WHERE a.equ_id = b.id AND a.status = 'UNHANDLED') AS unhandledAlertCount,
+                     (SELECT COUNT(1)
+                      FROM alert_message a
+                      WHERE a.equ_id = b.id ) AS AlertCount,
                      ROW_NUMBER() OVER (PARTITION BY b.id ORDER BY g.gather_time DESC) AS rn
                  FROM equ_base b
                           LEFT JOIN equ_type t ON b.equ_type = t.id
                           LEFT JOIN equ_manu m ON b.manufacture = m.id
                           LEFT JOIN equ_gather g ON b.id = g.equ_id
-             ) t
-        WHERE t.rn = 1
-        ORDER BY t.id
+             ) c
+        WHERE c.rn = 1
+        ORDER BY c.id
     </select>
 
     <select id="selectLatestEquMonitorList" resultType="com.alops.system.domain.dto.EquMonitorHomeDto">
         SELECT
             t.id,
+            t.equNumber,
             t.name,
             t.location,
             t.cpuUtilization,
@@ -212,6 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM (
                  SELECT
                      b.id,
+                     b.equ_number as equNumber,
                      b.name,
                      b.location,
                      g.cpu_utilization AS cpuUtilization,
@@ -234,14 +235,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             g.cont_work_period AS contWorkPeriod,
             b.equ_image AS equImage,
             b.id,
+            b.equ_number as equNumber,
             b.name,
             b.version,
             b.device_level AS deviceLevel,
-            t.name as equType,
+            b.equ_type as equTypeId,
+            t.name as equTypeName,
             b.status,
 
-            m.name as manufacture,
-            s.name as supplierId,
+            b.manufacture as equManuId,
+            m.name as equManuName,
+            b.supplier_id as supplierId,
+            s.name as supplierName,
             s.contact_by AS ContactBy,
             s.contact_way AS ContactWay,
             b.warranty,
@@ -251,11 +256,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.install_date AS installDate,
             b.in_charge AS inCharge,
 
-            b.failure_frequency AS failureFrequency,
+            (SELECT COUNT(1)
+             FROM alert_message a
+             WHERE a.equ_id = b.id ) AS AlertCount,
             -- 新增列：统计未处理告警数量
             (SELECT COUNT(1)
              FROM alert_message a
-             WHERE a.equ_id = b.id AND a.status = 'HANDLED') AS unhandledAlertCount,
+             WHERE a.equ_id = b.id AND a.status = 'UNHANDLED') AS unhandledAlertCount,
 
             g.fan_speed AS fanSpeed,
             g.cpu_utilization AS cpuUtilization,
diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquVlanMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquVlanMapper.xml
index 9c27c008..0e86ff32 100644
--- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquVlanMapper.xml
+++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquVlanMapper.xml
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <sql id="selectEquVlanVoJoinGather">
-        select vl.id, g.equ_id, equ_gather_id, main_id, ip_address, subnet_mask, create_time, update_by, vlan_id from equ_vlan vl LEFT JOIN equ_gather g ON vl.equ_gather_id = g.id
+        select vl.id, g.equ_id as equId, equ_gather_id, main_id, ip_address, subnet_mask, create_time, update_by, vlan_id from equ_vlan vl LEFT JOIN equ_gather g ON vl.equ_gather_id = g.id
     </sql>
 
     <select id="selectEquVlanList" parameterType="EquVlan" resultMap="EquVlanResult">