9.24更新变动

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

@@ -5,6 +5,7 @@ import java.util.Date;
 import com.alops.common.annotation.Excel;
 import com.alops.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,13 +15,17 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author ruoyi
  * @date 2025-09-04
  */
-public class AlertMessage extends BaseEntity
+@Data
+public class AlertMessage
 {
     private static final long serialVersionUID = 1L;
 
     /** ID */
     private Long id;
 
+    /** 批次 */
+    private int batch;
+
     /** 设备ID */
     @Excel(name = "设备ID")
     private String equId;

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

@@ -6,6 +6,7 @@ import java.util.Date;
 import com.alops.common.annotation.Excel;
 import com.alops.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -16,7 +17,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author ruoyi
  * @date 2025-08-01
  */
-public class EquBase extends BaseEntity
+@Data
+public class EquBase
 {
     private static final long serialVersionUID = 1L;
 
@@ -36,9 +38,18 @@ public class EquBase extends BaseEntity
     private String ip;
 
     /** 设备厂商  */
-    @Excel(name = "设备厂商id ")
     private String manufacture;
 
+    public EquManu getManufactureVO() {
+        return manufactureVO;
+    }
+
+    public void setManufactureVO(EquManu manufactureVO) {
+        this.manufactureVO = manufactureVO;
+    }
+
+    private EquManu manufactureVO;
+
     /** 安装位置 id */
     @Excel(name = "安装位置 id")
     private String location;
@@ -47,6 +58,16 @@ public class EquBase extends BaseEntity
     @Excel(name = "设备类型 id")
     private String equType;
 
+    public EquType getEquTypeVO() {
+        return equTypeVO;
+    }
+
+    public void setEquTypeVO(EquType equTypeVO) {
+        this.equTypeVO = equTypeVO;
+    }
+
+    private EquType equTypeVO;
+
     /** 设备管理员 id */
     @Excel(name = "设备管理员 id")
     private Long inCharge;
@@ -99,7 +120,7 @@ public class EquBase extends BaseEntity
     @Excel(name = "累积维修金额(元)")
     private BigDecimal repairCost;
 
-    public void setId(String id) 
+    public void setId(String id)
     {
         this.id = id;
     }
@@ -307,9 +328,9 @@ public class EquBase extends BaseEntity
             .append("serviceTime", getServiceTime())
             .append("warranty", getWarranty())
 
-            .append("createBy", getCreateBy())
+            //.append("createBy", getCreateBy())
             .append("createDate", getCreateDate())
-            .append("updateBy", getUpdateBy())
+            //.append("updateBy", getUpdateBy())
             .append("updateDate", getUpdateDate())
             .append("status", getStatus())
                 .append("failureFrequency", getFailureFrequency())