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

ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquInterface.java

@@ -29,8 +29,6 @@ public class EquInterface
     private String equId;
 
     /** 采集时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date gatherTime;
 
     /** 端口运行与否(UP/DOWN(true/false)) */

ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorLastDto.java

@@ -1,5 +1,7 @@
 package com.alops.system.domain.dto;
 
+import com.alops.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.sql.Blob;
@@ -25,6 +27,9 @@ public class MonitorLastDto {
     private String deviceLevel;
     private String ip;
     private String location;
+    /** 安装日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "安装日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date installDate;
     private String inCharge;
     private String status;

ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquInterfaceMapper.xml

@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <sql id="selectEquInterfaceVoJoinGather">
-        select i.id, g.equ_id, i.gather_time, running, rate, commuicate_mode, out_flow, in_flow, in_bandwidth, loss_rate, error_rate, equ_gather_id, interface_id, out_bandwidth from equ_interface i LEFT JOIN equ_gather g ON i.equ_gather_id = g.id
+        select i.id, g.equ_id, g.gather_time, running, rate, commuicate_mode, out_flow, in_flow, in_bandwidth, loss_rate, error_rate, equ_gather_id, interface_id, out_bandwidth from equ_interface i LEFT JOIN equ_gather g ON i.equ_gather_id = g.id
     </sql>
 
     <select id="selectEquInterfaceList" parameterType="EquInterface" resultMap="EquInterfaceResult">