增加设备相关表

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotBreaker.java

@@ -0,0 +1,98 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author test
+ * @since 2024-02-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_breaker")
+public class IotBreaker implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机构id
+     */
+    private Long orgId;
+
+    /**
+     * 机构名称
+     */
+    private String orgName;
+
+    /**
+     * 机构path
+     */
+    private String orgPath;
+
+    /**
+     * 
+
+视频物联网检测主机唯一标识
+
+     */
+    private String hostCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备code
+     */
+    private String deviceCode;
+
+    /**
+     * 0：断电 | 1：通电
+     */
+    private Integer status;
+
+    /**
+     * 0正常1删除
+     */
+    private Integer deleted;
+
+    /**
+     * 最后一次状态更新时间
+     */
+    private LocalDateTime statusUpdateTime;
+
+    /**
+     * 更新时间,最后一次数据上传时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+    /**
+     * 设备来源：1：iot推送
+     */
+    private Integer source;
+
+
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotBreakerDataLog.java

@@ -0,0 +1,40 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author test
+ * @since 2024-02-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_breaker_data_log")
+public class IotBreakerDataLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备code
+     */
+    private String deviceCode;
+
+    /**
+     * 0：断电 | 1：通电
+     */
+    private Integer status;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotCommonSensor.java

@@ -0,0 +1,105 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author test
+ * @since 2024-02-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_common_sensor")
+public class IotCommonSensor implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 所属机构
+     */
+    private Long orgId;
+
+    /**
+     * 所属机构名称
+     */
+    private String orgName;
+
+    /**
+     * 所属机构path
+     */
+    private String orgPath;
+
+    /**
+     * 视频物联网检测主机唯一标识
+     */
+    private String hostCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备code
+     */
+    private String deviceCode;
+
+    /**
+     * 设备类型编码
+     */
+    private Long categoryId;
+
+    /**
+     * 资产设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 属性信息数组
+     */
+    private String infos;
+
+    /**
+     * 0:未删除，1：删除
+     */
+    private Integer deleted;
+
+    /**
+     * 来源,0:资产设备，1：iot推送
+     */
+    private Integer source;
+
+    /**
+     * 最后一次状态更新时间
+     */
+    private LocalDateTime statusUpdateTime;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDefenceArea.java

@@ -0,0 +1,105 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 报警防区
+ * </p>
+ *
+ * @author test
+ * @since 2024-02-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_defence_area")
+public class IotDefenceArea implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机构id
+     */
+    private Long orgId;
+
+    /**
+     * 机构名称
+     */
+    private String orgName;
+
+    /**
+     * 机构path
+     */
+    private String orgPath;
+
+    /**
+     * 报警主机唯一标识
+     */
+    private String alarmHostCode;
+
+    /**
+     * 子系统编号
+     */
+    private String subSystemCode;
+
+    /**
+     * 防区名称
+     */
+    private String defenceAreaName;
+
+    /**
+     * 传感器类型
+     */
+    private Integer sensorType;
+
+    /**
+     * 专感器类型名称
+     */
+    private String sensorTypeName;
+
+    /**
+     * 防区序号（在子系统的编号）
+     */
+    private Integer defenceAreaIndex;
+
+    /**
+     * alarm:报警，bypass:旁路，normal:正常，activity：活动，unKnown：未知
+     */
+    private String state;
+
+    /**
+     * 状态变更时间
+     */
+    private LocalDateTime stateUpdateTime;
+
+    /**
+     * 是否删除
+     */
+    private Integer deleted;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDefenceAreaAlarmData.java

@@ -0,0 +1,71 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 防区传感器报警信息报警表，记录报警
+ * </p>
+ *
+ * @author test
+ * @since 2024-02-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_defence_area_alarm_data")
+public class IotDefenceAreaAlarmData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long orgId;
+
+    private String orgName;
+
+    private String orgPath;
+
+    /**
+     * 设备id
+     */
+    private Long defenceAreaId;
+
+    /**
+     * 报警主机子系统唯一标识
+     */
+    private String defenceareaCode;
+
+    /**
+     * 报警主机唯一标识
+     */
+    private String alarmHostCode;
+
+    /**
+     * 输入标识
+     */
+    private Integer inputIndex;
+
+    /**
+     * alarm:报警，bypass:旁路，normal:正常，activity：活动，unKnown：未知
+     */
+    private String inputState;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 报警主机过来的设备id
+     */
+    private String strDeviceId;
+
+    /**
+     * 处理状态 0:未处理,1:已处理(误报),2:已处理(无需处理),3:已处理(运维单)
+     */
+    private Integer isdo;
+
+
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDefenceAreaDataLog.java

@@ -0,0 +1,76 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 防区传感器报警信息，日志
+ * </p>
+ *
+ * @author test
+ * @since 2024-02-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_defence_area_data_log")
+public class IotDefenceAreaDataLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报警主机子系统唯一标识
+     */
+    private String defenceareaCode;
+
+    /**
+     * 报警主机唯一标识
+     */
+    private String alarmHostCode;
+
+    /**
+     * 传感器名称
+     */
+    private String inputName;
+
+    /**
+     * 输入标识
+     */
+    private Integer inputIndex;
+
+    /**
+     * alarm:报警，bypass:旁路，normal:正常，activity：活动，unKnown：未知
+     */
+    private String inputState;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+    private Long orgId;
+
+    private String orgName;
+
+    private String orgPath;
+
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 设备id
+     */
+    private Long sensorData;
+
+    /**
+     * 报警主机过来的设备id
+     */
+    private String strDeviceId;
+
+
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDvrDisk.java

@@ -0,0 +1,105 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author test
+ * @since 2024-02-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_dvr_disk")
+public class IotDvrDisk implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 所属机构
+     */
+    private Long orgId;
+
+    /**
+     * 所属机构名称
+     */
+    private String orgName;
+
+    /**
+     * 所属机构path
+     */
+    private String orgPath;
+
+    /**
+     * 监控主机唯一标识
+     */
+    private String equipmentCode;
+
+    /**
+     * 硬盘名称
+     */
+    private String diskName;
+
+    /**
+     * 硬盘序号
+     */
+    private Integer diskIndex;
+
+    /**
+     * 硬盘总的空间大小(单位：MB)
+     */
+    private String total;
+
+    /**
+     * 硬盘可用空间大小(单位：MB)
+     */
+    private String available;
+
+    /**
+     * 硬盘状态。0：正常，1：异常
+     */
+    private Integer state;
+
+    /**
+     * 最后一次状态更新时间
+     */
+    private LocalDateTime statusUpdateTime;
+
+    /**
+     * 0:未删除，1：删除
+     */
+    private Integer deleted;
+
+    /**
+     * 来源,0:资产设备，1：iot推送
+     */
+    private Integer source;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDvrDiskLog.java

@@ -0,0 +1,97 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author test
+ * @since 2024-02-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_dvr_disk_log")
+public class IotDvrDiskLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long iotDvrDiskId;
+
+    /**
+     * 所属机构
+     */
+    private Long orgId;
+
+    /**
+     * 所属机构名称
+     */
+    private String orgName;
+
+    /**
+     * 所属机构path
+     */
+    private String orgPath;
+
+    /**
+     * 监控主机唯一标识
+     */
+    private String equipmentCode;
+
+    /**
+     * 硬盘名称
+     */
+    private String diskName;
+
+    /**
+     * 硬盘序号
+     */
+    private Integer diskIndex;
+
+    /**
+     * 硬盘状态。0：正常，1：异常
+     */
+    private Integer state;
+
+    /**
+     * 最后一次状态更新时间
+     */
+    private LocalDateTime statusUpdateTime;
+
+    /**
+     * 0:未删除，1：删除
+     */
+    private Integer deleted;
+
+    /**
+     * 来源,0:资产设备，1：iot推送
+     */
+    private Integer source;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotUps.java

@@ -0,0 +1,98 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author test
+ * @since 2024-02-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_ups")
+public class IotUps implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机构id
+     */
+    private Long orgId;
+
+    /**
+     * 机构名称
+     */
+    private String orgName;
+
+    /**
+     * 机构path
+     */
+    private String orgPath;
+
+    /**
+     * 
+
+视频物联网检测主机唯一标识
+
+     */
+    private String hostCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备code
+     */
+    private String deviceCode;
+
+    /**
+     * 属性信息数组
+     */
+    private String info;
+
+    /**
+     * 0正常1删除
+     */
+    private Integer deleted;
+
+    /**
+     * 最后一次状态更新时间
+     */
+    private LocalDateTime statusUpdateTime;
+
+    /**
+     * 更新时间,最后一次数据上传时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+    /**
+     * 设备来源：1：iot推送
+     */
+    private Integer source;
+
+
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotUpsDataLog.java

@@ -0,0 +1,40 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author test
+ * @since 2024-02-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_ups_data_log")
+public class IotUpsDataLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备code
+     */
+    private String deviceCode;
+
+    /**
+     * 属性信息数组
+     */
+    private String info;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/domain/VideoDaysCheck.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/VideoDaysCheck.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.domain;
+package com.xunmei.common.core.domain.iot.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/domain/VideoDiagnosisLog.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/VideoDiagnosisLog.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.domain;
+package com.xunmei.common.core.domain.iot.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/domain/VideoDiagnosisRecord.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/VideoDiagnosisRecord.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.domain;
+package com.xunmei.common.core.domain.iot.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/domain/VideoIntegrityCheck.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/VideoIntegrityCheck.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.domain;
+package com.xunmei.common.core.domain.iot.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/domain/VideoRecorderHardDiskDetection.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/VideoRecorderHardDiskDetection.java

@@ -1,9 +1,9 @@
-package com.xunmei.iot.domain;
+package com.xunmei.common.core.domain.iot.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.xunmei.common.core.enums.iot.AlarmStatus;
 import com.xunmei.common.core.web.domain.BaseEntity;
-import com.xunmei.iot.enums.AlarmStatus;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/domain/VideoRecorderHardDiskDetectionLog.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/VideoRecorderHardDiskDetectionLog.java

@@ -1,9 +1,9 @@
-package com.xunmei.iot.domain;
+package com.xunmei.common.core.domain.iot.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.xunmei.common.core.enums.iot.AlarmStatus;
 import com.xunmei.common.core.web.domain.BaseEntity;
-import com.xunmei.iot.enums.AlarmStatus;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/enums/AlarmStatus.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/iot/AlarmStatus.java

@@ -1,4 +1,4 @@
-package com.xunmei.iot.enums;
+package com.xunmei.common.core.enums.iot;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.xunmei.common.core.json.EnumSerializer;
@@ -9,8 +9,8 @@ import lombok.Getter;
  */
 @JsonSerialize(using = EnumSerializer.class)
 public enum AlarmStatus {
-    ALARM("正在报警"),
-    RECOVERY("报警结束");
+    NORMAL("未报警"),
+    ALARM("正在报警");
 
     @Getter
     private final String text;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/domain/DvrDisk.java

@@ -1,74 +0,0 @@
-package com.xunmei.iot.domain;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.xunmei.common.core.web.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-@AllArgsConstructor
-@Builder
-@TableName("mediator_dvrdisk")
-public class DvrDisk extends BaseEntity {
-    @TableId
-    private Long id;
-
-//    @Column(
-//            columnDefinition = "bigint comment '机构id'"
-//    )
-    /**
-     * 机构id
-     */
-    private Long orgId;
-
-//    @Column(
-//            columnDefinition = "varchar(100) comment '主机编号'"
-//    )
-    /**
-     * 主机编号
-     */
-    private String hostCode;
-
-//    @Column(
-//            columnDefinition = "varchar(50) comment ''"
-//    )
-    /**
-     *
-     */
-    private String strName;
-
-//    @Column(
-//            columnDefinition = "varchar(50) comment '录像机的名称' default ''"
-//    )
-    /**
-     * 录像机的名称
-     */
-    private String diskSerialNum;
-
-//    @Column(
-//            columnDefinition = "varchar(50) comment '硬盘总的空间大小(单位：MB)' "
-//    )
-    /**
-     * 硬盘总的空间大小(单位：MB)
-     */
-    private String total;
-
-//    @Column(
-//            columnDefinition = "varchar(50) comment '硬盘可用空间大小(单位：MB)'"
-//    )
-    /**
-     * 硬盘可用空间大小(单位：MB)
-     */
-    private String available;
-
-    public DvrDisk() {
-    }
-
-    public DvrDisk(final Long id) {
-        this.id = id;
-    }
-}