添加修改删除设备校验

device-manager-ui/admin/src/views/alarm/config/list.vue

@@ -28,9 +28,9 @@ export default {
       this.$refs.drawerform.edit(row);
     },
     /** 重写查看方法 */
-    // toView(row) {
-    //     this.$refs.dialogform.view(row);
-    // },
+    toView(row) {
+        this.$refs.drawerform.view(row);
+    },
     // 操作菜单状态
     changeStatus(row, column) {
       return (

device-manager-ui/admin/src/views/device/module/list.vue

@@ -25,9 +25,9 @@ export default {
       this.$refs.dialogform.edit(row);
     },
     /** 重写查看方法 */
-    // toView(row) {
-    //     this.$refs.dialogform.view(row);
-    // },
+    toView(row) {
+        this.$refs.dialogform.view(row);
+    },
   },
   data() {
     return {
@@ -65,4 +65,4 @@ export default {
     };
   },
 };
-</script>
+</script>
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceAlarmInfoEntity.java

 package com.mortals.xhx.module.device.model;
-
+import java.util.Date;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.device.model.vo.DeviceAlarmInfoVo;
 import lombok.Data;
-
-import java.util.Date;
 /**
  * 设备告警日志实体对象
  *
  * @author zxfei
- * @date 2023-07-19
+ * @date 2023-12-08
  */
 @Data
 public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
@@ -17,6 +23,7 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
     /**
      * 告警时间
      */
+    @Excel(name = "告警时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date alarmTime;
     /**
      * 告警设备Id
@@ -25,18 +32,22 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
     /**
      * 告警类型,(0.离线)
      */
+    @Excel(name = "告警类型,", readConverterExp = "告警类型,(0.离线)")
     private Integer alarmType;
     /**
      * 告警级别(0.危险，1.次要，2.一般)
      */
+    @Excel(name = "告警级别", readConverterExp = "0=危险,1=次要,2=一般")
     private Integer alarmLevel;
     /**
      * 接收人员[设备管理的责任人]
      */
+    @Excel(name = "接收人员[设备管理的责任人]")
     private String alarmReceivePersonnel;
     /**
      * 接收人员电话
      */
+    @Excel(name = "接收人员电话")
     private String receivePersonnelTelephone;
     /**
      * 告警状态,来自工单系统(0.未清除，1.清除未确认，2.清除已确认)
@@ -45,6 +56,7 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
     /**
      * 告警详细内容
      */
+    @Excel(name = "告警详细内容")
     private String alarmContent;
     /**
      * 站点Id，来源基础服务平台
@@ -53,10 +65,12 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
     /**
      * 设备编码
      */
+    @Excel(name = "设备编码")
     private String deviceCode;
     /**
      * 设备名称
      */
+    @Excel(name = "设备名称")
     private String deviceName;
     /**
      * 是否推送
@@ -73,6 +87,7 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
     /**
      * 产品名称
      */
+    @Excel(name = "产品名称")
     private String productName;
     @Override
     public int hashCode() {
@@ -91,35 +106,20 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
     }
 
     public void initAttrValue(){
-
-        this.alarmTime = null;
-
-        this.alarmDevice = -1L;
-
-        this.alarmType = -1;
-
-        this.alarmLevel = -1;
-
+        this.alarmTime = new Date();
+        this.alarmDevice = null;
+        this.alarmType = 0;
+        this.alarmLevel = 0;
         this.alarmReceivePersonnel = "";
-
         this.receivePersonnelTelephone = "";
-
         this.alarmStatus = 0;
-
         this.alarmContent = "";
-
-        this.siteId = -1L;
-
+        this.siteId = null;
         this.deviceCode = "";
-
         this.deviceName = "";
-
         this.push = 0;
-
-        this.productId = -1L;
-
+        this.productId = null;
         this.productCode = "";
-
         this.productName = "";
     }
 }
\ No newline at end of file