Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev

ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertMessageController.java

@@ -111,7 +111,7 @@ public class AlertMessageController extends BaseController
     @ApiOperation("获取界面ALlertMessage信息")
     public TableDataInfo listByEquId(@PathVariable("equId")Long equId)
     {
-        startPage();
+
         List<AlertMessage> list = alertMessageService.selectAlertMessageListByEquId(equId);
         return getDataTable(list);
     }

ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquInterfaceController.java

@@ -89,7 +89,7 @@ public class EquInterfaceController extends BaseController
     @ApiOperation("获取界面Interface接口信息")
     public TableDataInfo listByEquID(@PathVariable("equID") String equID)
     {
-        startPage();
+
         List<EquInterface> list = equInterfaceService.selectEquInterfaceListByEquID(equID);
         return getDataTable(list);
     }

ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquRoutingController.java

@@ -56,7 +56,7 @@ public class EquRoutingController extends BaseController
     @ApiOperation("获取界面Routing信息")
     public TableDataInfo listByEquId(@PathVariable("equId") String equId)
     {
-        startPage();
+
         List<EquRouting> list = equRoutingService.selectEquRoutingListByEquId(equId);
         return getDataTable(list);
     }

ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquVeneerController.java

@@ -56,7 +56,7 @@ public class EquVeneerController extends BaseController
     @ApiOperation("获取界面Venerr信息")
     public TableDataInfo listByEquId(@PathVariable("equID") String equID)
     {
-        startPage();
+
         List<EquVeneer> list = equVeneerService.selectEquVeneerListByEquId(equID);
         return getDataTable(list);
     }

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>
 
     <!-- 按设备类型统计 -->

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">

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">