From ada6243ea449891776f4a3865f8bb68ff26f92f6 Mon Sep 17 00:00:00 2001
From: lzh1232 <15120652+lzh1232@user.noreply.gitee.com>
Date: Fri, 7 Nov 2025 20:16:04 +0800
Subject: [PATCH] =?UTF-8?q?11.7=20=E7=9B=91=E6=8E=A7=E8=AF=A6=E7=BB=86?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alops/web/controller/equManagement/EquVlanController.java   | 2 +-
 .../src/main/resources/mapper/system/AlertMessageMapper.xml     | 1 +
 .../src/main/resources/mapper/system/EquInterfaceMapper.xml     | 2 ++
 .../src/main/resources/mapper/system/EquVlanMapper.xml          | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquVlanController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquVlanController.java
index d14901d9..456686be 100644
--- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquVlanController.java
+++ b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquVlanController.java
@@ -57,7 +57,7 @@ public class EquVlanController extends BaseController
     @ApiOperation("获取界面Vlan信息")
     public TableDataInfo listByEquId(@PathVariable("equId") String equId)
     {
-
+        startPage();
         List<EquVlan> list = equVlanService.selectEquVlanListByEquId(equId);
         return getDataTable(list);
     }
diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml
index 1b51f2e1..ac3e2078 100644
--- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml
+++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml
@@ -133,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE equ_id = #{equid}
         )
         GROUP BY a.id
+        ORDER BY a.occur_time DESC
     </select>
 
     <!-- 按设备类型统计 -->
diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquInterfaceMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquInterfaceMapper.xml
index 050c9063..9b70b38f 100644
--- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquInterfaceMapper.xml
+++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquInterfaceMapper.xml
@@ -72,6 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectEquInterfaceByEquId" parameterType="String" resultMap="EquInterfaceResult">
         <include refid="selectEquInterfaceVoJoinGather"/>
         where g.equ_id = #{equId}
+            AND out_flow != 0
+            AND in_flow != 0
     </select>
 
     <insert id="insertEquInterface" parameterType="EquInterface">
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 3d2dc88c..dcbc9305 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
@@ -57,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectEquVlanListByEquId" parameterType="String" resultMap="EquVlanResult">
         <include refid="selectEquVlanVoJoinGather"/>
         where g.equ_id = #{equid}
+        ORDER BY vl.create_time DESC
     </select>
 
     <update id="updateVlanNetworkByVlanId" parameterType="com.alops.system.domain.dto.EquVlanNetworkUpdateDto">