北向硬盘检测 网络检测代码提交

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysDevice.java

@@ -94,19 +94,10 @@ public class SysDevice extends BaseEntity {
     @ApiModelProperty(value = "设备型号")
     private String type;
 
-    @ApiModelProperty(value = "设备ip")
-    private String ip;
-
     /**
      * @see com.xunmei.system.api.enums.DeviceOnlineStatus
      */
     @ApiModelProperty(value = "在线状态")
     private Integer online;
 
-    @ApiModelProperty(value = "是否报警,0:未报警,1:报警中")
-    private Integer isAlarm;
-
-    @ApiModelProperty(value = "告警信息处理状态,0未处理,1:已处理")
-    private Integer doStatus;
-
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/NetworkDeviceDetectionEditDto.java

@@ -16,24 +16,23 @@ import java.util.Date;
 @Builder
 @ApiModel("网络设备检测信息")
 public class NetworkDeviceDetectionEditDto {
-   @ApiModelProperty("编号")
-   private Long id;
    @ApiModelProperty("组织机构的唯一标识")
-   @Length(
-      max = 64,
-      message = "名称长度不能超过64"
-   )
+   @Length(max = 64, message = "名称长度不能超过64")
    private String organizationGuid;
+
    @ApiModelProperty("录像机的唯一标识")
    private String equipmentCode;
+
    @ApiModelProperty("录像机的名称")
    private String equipmentName;
+
    @ApiModelProperty("网络状态标识")
    private Integer netStatus;
+
    @ApiModelProperty("更新时间")
-   @Length(
-      max = 64,
-      message = "更新时间长度不能超过64"
-   )
+   @Length( max = 64, message = "更新时间长度不能超过64")
    private Date updateTime;
+
+   @ApiModelProperty(" 1:监控主机 | 2:对讲设备 | 3:报警设备 | 4:门禁设备| 5:视频物联网检测主机 ")
+   private Integer equipmentType;
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/VideoRecorderHardDiskDetectionEditDto.java

@@ -20,18 +20,23 @@ import java.util.Map;
 public class VideoRecorderHardDiskDetectionEditDto {
    @ApiModelProperty("编号")
    private Long id;
+
    @ApiModelProperty("组织机构的唯一标识")
    @Length( max = 64, message = "名称长度不能超过64" )
    private String organizationGuid;
+
    @ApiModelProperty("录像机的唯一标识")
    private String equipmentCode;
+
    @ApiModelProperty("录像机的名称")
    private String equipmentName;
-   @ApiModelProperty("报警状态标识 0：正在报警 | 1：报警结束")
-   private Integer isAlarm;
-   @ApiModelProperty("报警/恢复时间")
-   @Length( max = 64, message = "报警/恢复时间长度不能超过64" )
-   private Date alarmTime;
+
+   @ApiModelProperty("检测状态；0：检测成功、1：检测失败")
+   private Integer checkStatus;
+
+   @ApiModelProperty("检测时间")
+   private Date checkTime;
+
    @ApiModelProperty("硬盘当前状态信息")
    private List<Map<String, Object>> detailInfo;
 }

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

@@ -98,6 +98,10 @@ public class IotDevice implements Serializable {
     @TableField("source")
     private Integer source;
 
+    @ApiModelProperty(value = "网络状态: 0：正常,1：异常,2.中断")
+    @TableField("net_status")
+    private Integer netStatus;
+
     @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private LocalDateTime createTime;

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

@@ -16,12 +16,12 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author oygj
- * @since 2024-01-31
+ * @since 2024-02-23
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("iot_device_detection")
-@ApiModel(value="iot_device_detection对象", description=" 网络设备检测")
+@ApiModel(value="IotDeviceDetection对象", description=" 网络设备检测")
 public class IotDeviceDetection implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -50,26 +50,28 @@ public class IotDeviceDetection implements Serializable {
     private String equipmentName;
 
     @ApiModelProperty(value = "网络状态")
-    @TableField("status")
-    private Integer status;
+    @TableField("state")
+    private Integer state;
 
-    @ApiModelProperty(value = "状态变更时间")
+    @ApiModelProperty(value = "网络状态变更时间")
     @TableField("state_update_time")
     private LocalDateTime stateUpdateTime;
 
-    @ApiModelProperty(value = "创建时间")
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty(value = "创建人名称")
     @TableField("create_time")
     private LocalDateTime createTime;
 
-    @ApiModelProperty(value = "最后修改人id")
-    @TableField("modified_id")
-    private Long modifiedId;
-
     @ApiModelProperty(value = "修改人名称")
-    @TableField("modified_name")
-    private String modifiedName;
+    @TableField("update_by")
+    private String updateBy;
 
-    @ApiModelProperty(value = "更新时间")
+    @ApiModelProperty(value = "修改时间")
     @TableField("update_time")
     private LocalDateTime updateTime;
+
+
 }

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

@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author oygj
- * @since 2024-01-31
+ * @since 2024-02-23
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -29,7 +29,6 @@ public class IotDeviceDetectionLog implements Serializable {
     @TableId("id")
     private Long id;
 
-
     @ApiModelProperty(value = "机构")
     @TableField("org_id")
     private Long orgId;
@@ -42,10 +41,6 @@ public class IotDeviceDetectionLog implements Serializable {
     @TableField("org_path")
     private String orgPath;
 
-    @ApiModelProperty(value = "网络设备检测ID")
-    @TableField("network_device_detection_id")
-    private Long networkDeviceDetectionId;
-
     @ApiModelProperty(value = "录像机的唯一标识")
     @TableField("equipment_code")
     private String equipmentCode;
@@ -58,24 +53,29 @@ public class IotDeviceDetectionLog implements Serializable {
     @TableField("status")
     private Integer status;
 
-    @ApiModelProperty(value = "状态变更时间")
+    @ApiModelProperty(value = "网络状态变更时间")
     @TableField("state_update_time")
     private LocalDateTime stateUpdateTime;
 
-    @ApiModelProperty(value = "创建时间")
+    @ApiModelProperty(value = "网络设备检测ID")
+    @TableField("network_device_detection_id")
+    private Long networkDeviceDetectionId;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty(value = "创建人名称")
     @TableField("create_time")
     private LocalDateTime createTime;
 
-    @ApiModelProperty(value = "最后修改人id")
-    @TableField("modified_id")
-    private Long modifiedId;
-
     @ApiModelProperty(value = "修改人名称")
-    @TableField("modified_name")
-    private String modifiedName;
+    @TableField("update_by")
+    private String updateBy;
 
-    @ApiModelProperty(value = "更新时间")
+    @ApiModelProperty(value = "修改时间")
     @TableField("update_time")
     private LocalDateTime updateTime;
 
+
 }

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

@@ -49,22 +49,22 @@ public class IotDvrHardDiskDetection implements Serializable {
     @TableField("equipment_name")
     private String equipmentName;
 
-    @ApiModelProperty(value = "报警/恢复时间")
-    @TableField("alarm_time")
-    private LocalDateTime alarmTime;
+    @ApiModelProperty(value = "检测时间")
+    @TableField("check_time")
+    private LocalDateTime checkTime;
 
-    @ApiModelProperty(value = "硬盘当前状态信息")
-    @TableField("detail_info")
-    private String detailInfo;
-
-    @ApiModelProperty(value = "报警状态")
-    @TableField("status")
-    private Integer status;
+    @ApiModelProperty(value = "检测状态；0：检测成功、1：检测失败")
+    @TableField("check_status")
+    private Integer checkStatus;
 
     @ApiModelProperty(value = "状态变更时间")
     @TableField("state_update_time")
     private LocalDateTime stateUpdateTime;
 
+    @ApiModelProperty(value = "硬盘当前状态信息")
+    @TableField("detail_info")
+    private String detailInfo;
+
     @ApiModelProperty(value = "创建人")
     @TableField("create_by")
     private String createBy;

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

@@ -41,14 +41,6 @@ public class IotDvrHardDiskDetectionLog implements Serializable {
     @TableField("org_path")
     private String orgPath;
 
-    @ApiModelProperty(value = "报警/恢复时间")
-    @TableField("alarm_time")
-    private LocalDateTime alarmTime;
-
-    @ApiModelProperty(value = "硬盘当前状态信息")
-    @TableField("detail_info")
-    private String detailInfo;
-
     @ApiModelProperty(value = "录像机的唯一标识")
     @TableField("equipment_code")
     private String equipmentCode;
@@ -57,18 +49,26 @@ public class IotDvrHardDiskDetectionLog implements Serializable {
     @TableField("equipment_name")
     private String equipmentName;
 
-    @ApiModelProperty(value = "报警状态")
-    @TableField("status")
-    private Integer status;
+    @ApiModelProperty(value = "检测时间")
+    @TableField("check_time")
+    private LocalDateTime checkTime;
 
-    @ApiModelProperty(value = "录像机硬盘检测ID")
-    @TableField("video_recorder_hard_disk_detection_id")
-    private Long videoRecorderHardDiskDetectionId;
+    @ApiModelProperty(value = "检测状态；0：检测成功、1：检测失败")
+    @TableField("check_status")
+    private Integer checkStatus;
 
     @ApiModelProperty(value = "报警状态更新时间")
     @TableField("status_update_time")
     private LocalDateTime statusUpdateTime;
 
+    @ApiModelProperty(value = "硬盘当前状态信息")
+    @TableField("detail_info")
+    private String detailInfo;
+
+    @ApiModelProperty(value = "录像机硬盘检测ID")
+    @TableField("video_recorder_hard_disk_detection_id")
+    private Long videoRecorderHardDiskDetectionId;
+
     @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private LocalDateTime createTime;

soc-modules/soc-modules-gen/src/main/java/com/xunmei/gen/util/CodeGenerators.java

@@ -30,7 +30,7 @@ public class CodeGenerators {
     }*/
 
     public static final String moduleName="com.xunmei.mediator";
-    public static final String tableNames="mediator_video_integrity_check_newest";
+    public static final String tableNames="iot_device_detection_log";
 
     public static void main(String[] args) {
         // 代码生成器

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDeviceDetectionServiceImpl.java

@@ -28,6 +28,7 @@ import com.xunmei.system.api.enums.NetStatus;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.*;
 
 /**
@@ -67,9 +68,8 @@ public class IotDeviceDetectionServiceImpl extends ServiceImpl<IotDeviceDetectio
         error = (ReceiveErrorDto) map.get("error");
         if (error.getSuccess()) {
             SysOrg org = (SysOrg) map.get("org");
-            SysDevice device = (SysDevice) map.get("device");
-            MediatorCategory category = (MediatorCategory) map.get("category");
-            Map<String, Object> objectMap = this.buildEntityDto(networkDeviceDetectionEditDto, org, device, category);
+            IotDevice device = (IotDevice) map.get("device");
+            Map<String, Object> objectMap = this.buildEntityDto(networkDeviceDetectionEditDto, org, device);
             this.saveDataInfo(objectMap, networkDeviceDetectionEditDto);
         }
         return error;
@@ -77,11 +77,11 @@ public class IotDeviceDetectionServiceImpl extends ServiceImpl<IotDeviceDetectio
     public void saveDataInfo(Map<String, Object> objectMap, NetworkDeviceDetectionEditDto networkDeviceDetectionEditDto) {
         IotDeviceDetection networkDeviceDetection = (IotDeviceDetection) objectMap.get("networkDeviceDetection");
         IotDeviceDetectionLog networkDeviceDetectionLog = (IotDeviceDetectionLog) objectMap.get("networkDeviceDetectionLog");
-        SysDevice device = (SysDevice) objectMap.get("device");
+        IotDevice device = (IotDevice) objectMap.get("device");
         try {
             this.saveOrUpdate(networkDeviceDetection);
             networkDeviceDetectionLogService.saveOrUpdate(networkDeviceDetectionLog);
-            //deviceDao.saveOrUpdate(device);
+            iIotDeviceService.updateById(device);
         } catch (Exception e) {
             throw new RuntimeException(e.getMessage());
         }
@@ -109,13 +109,13 @@ public class IotDeviceDetectionServiceImpl extends ServiceImpl<IotDeviceDetectio
                 map.put("error", error);
                 return map;
             }
-            MediatorCategory category = categoryService.getById(device.getCategoryId());
+            /*MediatorCategory category = categoryService.getById(device.getCategoryId());
             if (ObjectUtil.isNull(category)) {
                 error.setSuccess(false);
                 error.setErrorMsg("设备类型不存在");
                 map.put("error", error);
                 return map;
-            }
+            }*/
             if (networkDeviceDetectionEditDto.getNetStatus() != 0 && networkDeviceDetectionEditDto.getNetStatus() != 1 && networkDeviceDetectionEditDto.getNetStatus() != 2) {
                 error.setSuccess(false);
                 error.setErrorMsg("参数非法：netStatus不正确");
@@ -124,7 +124,7 @@ public class IotDeviceDetectionServiceImpl extends ServiceImpl<IotDeviceDetectio
             }
             map.put("org", org);
             map.put("device", device);
-            map.put("category", category);
+            //map.put("category", category);
             map.put("error", error);
             return map;
         } else {
@@ -134,7 +134,7 @@ public class IotDeviceDetectionServiceImpl extends ServiceImpl<IotDeviceDetectio
 
     }
 
-    private Map<String, Object> buildEntityDto(NetworkDeviceDetectionEditDto networkDeviceDetectionEditDto, SysOrg org, SysDevice device, MediatorCategory category) {
+    private Map<String, Object> buildEntityDto(NetworkDeviceDetectionEditDto networkDeviceDetectionEditDto, SysOrg org, IotDevice device) {
         Map<String, Object> map = new HashMap<>();
         IotDeviceDetection networkDeviceDetection = new IotDeviceDetection();
 
@@ -147,24 +147,28 @@ public class IotDeviceDetectionServiceImpl extends ServiceImpl<IotDeviceDetectio
             networkDeviceDetection = old;
         }else{
             networkDeviceDetection.setId(IDHelper.id());
+            networkDeviceDetection.setCreateTime(LocalDateTime.now());
+        }
+        if (ObjectUtil.notEqual(networkDeviceDetection.getState(),networkDeviceDetectionEditDto.getNetStatus())){
+            networkDeviceDetection.setStateUpdateTime(LocalDateTime.now());
         }
         networkDeviceDetection.setEquipmentName(networkDeviceDetectionEditDto.getEquipmentName());
         networkDeviceDetection.setUpdateTime(DateUtils.toLocalDateTime(networkDeviceDetectionEditDto.getUpdateTime()));
         switch (networkDeviceDetectionEditDto.getNetStatus()) {
             case 0:
-                networkDeviceDetection.setStatus(NetStatus.NORMAL.ordinal());
-                device.setOnline(DeviceOnlineStatus.ONLINE.ordinal());
+                networkDeviceDetection.setState(NetStatus.NORMAL.ordinal());
+                device.setNetStatus(DeviceOnlineStatus.ONLINE.ordinal());
                 break;
             case 1:
-                networkDeviceDetection.setStatus(NetStatus.ABNORMAL.ordinal());
-                device.setOnline(DeviceOnlineStatus.NA.ordinal());
+                networkDeviceDetection.setState(NetStatus.ABNORMAL.ordinal());
+                device.setNetStatus(DeviceOnlineStatus.NA.ordinal());
                 break;
             case 2:
-                networkDeviceDetection.setStatus(NetStatus.INTERRUPT.ordinal());
-                device.setOnline(DeviceOnlineStatus.OFFLINE.ordinal());
+                networkDeviceDetection.setState(NetStatus.INTERRUPT.ordinal());
+                device.setNetStatus(DeviceOnlineStatus.OFFLINE.ordinal());
                 break;
             default:
-                device.setOnline(DeviceOnlineStatus.UNKNOW.ordinal());
+                device.setNetStatus(DeviceOnlineStatus.UNKNOW.ordinal());
                 break;
         }
         if (networkDeviceDetection.getUpdateTime() == null) {

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDvrHardDiskDetectionServiceImpl.java

@@ -23,6 +23,7 @@ import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.system.api.dto.protection.VideoRecorderHardDiskDetectionEditDto;
 import com.xunmei.system.api.enums.AlarmStatus;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -48,6 +49,7 @@ public class IotDvrHardDiskDetectionServiceImpl extends ServiceImpl<IotDvrHardDi
     IMediatorAlarmCodeService alarmCodeService;
     @Resource
     IotDvrHardDiskDetectionLogService videoRecorderHardDiskDetectionLogService;
+
     @Override
     public IotDvrHardDiskDetection findTopByEquipmentCodeAndOrgId(String equipmentCode, Long orgId) {
         return lambdaQuery()
@@ -79,14 +81,14 @@ public class IotDvrHardDiskDetectionServiceImpl extends ServiceImpl<IotDvrHardDi
                 map.put("error", error);
                 return map;
             }
-            MediatorCategory category = categoryMapper.selectById(device.getCategoryId());
+           /* MediatorCategory category = categoryMapper.selectById(device.getCategoryId());
             if (ObjectUtil.isNull(category)) {
                 error.setSuccess(false);
                 error.setErrorMsg("设备类型不存在");
                 map.put("error", error);
                 return map;
-            }
-            if (videoRecorderHardDiskDetectionEditDto.getIsAlarm() != 0 && videoRecorderHardDiskDetectionEditDto.getIsAlarm() != 1) {
+            }*/
+            if (videoRecorderHardDiskDetectionEditDto.getCheckStatus() != 0 && videoRecorderHardDiskDetectionEditDto.getCheckStatus() != 1) {
                 error.setSuccess(false);
                 error.setErrorMsg("参数非法：isAlarm不正确");
                 map.put("error", error);
@@ -123,10 +125,7 @@ public class IotDvrHardDiskDetectionServiceImpl extends ServiceImpl<IotDvrHardDi
     }
 
     private Map<String, Object> buildEntityDto(VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto, SysOrg org) {
-
         Map<String, Object> map = new HashMap<>();
-        IotAlarmCode code = alarmCodeService.selectByCode("112");
-        map.put("code", code);
         IotDvrHardDiskDetection videoRecorderHardDiskDetection = new IotDvrHardDiskDetection();
         videoRecorderHardDiskDetection.setOrgId(org.getId());
         videoRecorderHardDiskDetection.setOrgName(org.getShortName());
@@ -134,25 +133,22 @@ public class IotDvrHardDiskDetectionServiceImpl extends ServiceImpl<IotDvrHardDi
         videoRecorderHardDiskDetection.setEquipmentCode(videoRecorderHardDiskDetectionEditDto.getEquipmentCode());
         IotDvrHardDiskDetection old = this.findTopByEquipmentCodeAndOrgId(videoRecorderHardDiskDetectionEditDto.getEquipmentCode(), org.getId());
         if (old != null) {
+            if (ObjectUtil.notEqual(old.getCheckStatus(), videoRecorderHardDiskDetectionEditDto.getCheckStatus())) {
+                videoRecorderHardDiskDetection.setStateUpdateTime(LocalDateTime.now());
+            }
             videoRecorderHardDiskDetection = old;
         } else {
             videoRecorderHardDiskDetection.setId(IDHelper.id());
+            videoRecorderHardDiskDetection.setCreateTime(LocalDateTime.now());
         }
         videoRecorderHardDiskDetection.setEquipmentName(videoRecorderHardDiskDetectionEditDto.getEquipmentName());
-        videoRecorderHardDiskDetection.setAlarmTime(DateUtils.toLocalDateTime(videoRecorderHardDiskDetectionEditDto.getAlarmTime()));
-        switch (videoRecorderHardDiskDetectionEditDto.getIsAlarm()) {
-            case 0:
-                videoRecorderHardDiskDetection.setStatus(AlarmStatus.ALARM.ordinal());
-                break;
-            case 1:
-                videoRecorderHardDiskDetection.setStatus(AlarmStatus.RECOVERY.ordinal());
-                break;
-        }
+        videoRecorderHardDiskDetection.setCheckTime(DateUtils.toLocalDateTime(videoRecorderHardDiskDetectionEditDto.getCheckTime()));
+        videoRecorderHardDiskDetection.setCheckStatus(videoRecorderHardDiskDetectionEditDto.getCheckStatus());
         List<Map<String, Object>> details = videoRecorderHardDiskDetectionEditDto.getDetailInfo();
         if (details != null) {
             videoRecorderHardDiskDetection.setDetailInfo(JSON.toJSONString(details));
         } else {
-            videoRecorderHardDiskDetection.setDetailInfo((String) null);
+            videoRecorderHardDiskDetection.setDetailInfo(null);
         }
         videoRecorderHardDiskDetection.setUpdateTime(LocalDateTime.now());
         map.put("videoRecorderHardDiskDetection", videoRecorderHardDiskDetection);
@@ -172,7 +168,7 @@ public class IotDvrHardDiskDetectionServiceImpl extends ServiceImpl<IotDvrHardDi
         if (error.getSuccess()) {
             SysOrg org = (SysOrg) map.get("org");
             //SysDevice device = (SysDevice) map.get("device");
-           // MediatorCategory category = (MediatorCategory) map.get("category");
+            // MediatorCategory category = (MediatorCategory) map.get("category");
             Map<String, Object> objectMap = this.buildEntityDto(videoRecorderHardDiskDetectionEditDto, org);
             this.saveDataInfo(objectMap, videoRecorderHardDiskDetectionEditDto);
         }
@@ -180,7 +176,6 @@ public class IotDvrHardDiskDetectionServiceImpl extends ServiceImpl<IotDvrHardDi
     }
 
 
-
     @Override
     public void saveDataInfo(Map<String, Object> objectMap, VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto) {
         IotDvrHardDiskDetection videoRecorderHardDiskDetection = (IotDvrHardDiskDetection) objectMap.get("videoRecorderHardDiskDetection");