硬盘检测:表名修改类名修改

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/video/MediatorVideoRecorderHardDiskDetection.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/video/IotDvrHardDiskDetection.java

@@ -20,31 +20,15 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("mediator_video_recorder_hard_disk_detection")
-@ApiModel(value="MediatorVideoRecorderHardDiskDetection对象", description=" 录像机硬盘检测表")
-public class MediatorVideoRecorderHardDiskDetection implements Serializable {
+@TableName("iot_dvr_hard_disk_detection")
+@ApiModel(value="IotDvrHardDiskDetection对象", description=" 录像机硬盘检测表")
+public class IotDvrHardDiskDetection implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
     private Long id;
 
-    @ApiModelProperty(value = "创建人")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建人名称")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改人名称")
-    @TableField("update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
     @ApiModelProperty(value = "机构")
     @TableField("org_id")
     private Long orgId;
@@ -57,14 +41,6 @@ public class MediatorVideoRecorderHardDiskDetection 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;
@@ -73,9 +49,45 @@ public class MediatorVideoRecorderHardDiskDetection implements Serializable {
     @TableField("equipment_name")
     private String equipmentName;
 
+    @ApiModelProperty(value = "报警/恢复时间")
+    @TableField("alarm_time")
+    private LocalDateTime alarmTime;
+
+    @ApiModelProperty(value = "硬盘当前状态信息")
+    @TableField("detail_info")
+    private String detailInfo;
+
     @ApiModelProperty(value = "报警状态")
     @TableField("status")
     private Integer status;
 
+    @ApiModelProperty(value = "状态变更时间")
+    @TableField("state_update_time")
+    private LocalDateTime stateUpdateTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty(value = "创建人名称")
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "修改人名称")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+
+
+
+
+
+
+
 
 }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/video/MediatorVideoRecorderHardDiskDetectionLog.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/video/IotDvrHardDiskDetectionLog.java

@@ -16,35 +16,19 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author oygj
- * @since 2024-01-30
+ * @since 2024-02-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("mediator_video_recorder_hard_disk_detection_log")
-@ApiModel(value="MediatorVideoRecorderHardDiskDetectionLog对象", description=" 录像机硬盘检测日志表")
-public class MediatorVideoRecorderHardDiskDetectionLog implements Serializable {
+@TableName("iot_dvr_hard_disk_detection_log")
+@ApiModel(value="IotDvrHardDiskDetectionLog对象", description=" 录像机硬盘检测日志表")
+public class IotDvrHardDiskDetectionLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
     private Long id;
 
-    @ApiModelProperty(value = "创建人")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建人名称")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改人名称")
-    @TableField("update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
     @ApiModelProperty(value = "机构")
     @TableField("org_id")
     private Long orgId;
@@ -81,5 +65,25 @@ public class MediatorVideoRecorderHardDiskDetectionLog implements Serializable {
     @TableField("video_recorder_hard_disk_detection_id")
     private Long videoRecorderHardDiskDetectionId;
 
+    @ApiModelProperty(value = "报警状态更新时间")
+    @TableField("status_update_time")
+    private LocalDateTime statusUpdateTime;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField("update_by")
+    private String updateBy;
+
 
 }

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="iot_alarm_defence_area";
+    public static final String tableNames="iot_dvr_hard_disk_detection_log";
 
     public static void main(String[] args) {
         // 代码生成器

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/mapper/VideoRecorderHardDiskDetectionLogMapper.java

@@ -2,13 +2,13 @@ package com.xunmei.iot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.domain.video.MediatorVideoRecorderHardDiskDetectionLog;
+import com.xunmei.common.core.domain.video.IotDvrHardDiskDetectionLog;
 import com.xunmei.iot.dto.dvrDisk.DvrDiskAppPageDto;
 import com.xunmei.iot.vo.dvrDisk.DvrDiskDetectionPageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
-public interface VideoRecorderHardDiskDetectionLogMapper extends BaseMapper<MediatorVideoRecorderHardDiskDetectionLog> {
+public interface VideoRecorderHardDiskDetectionLogMapper extends BaseMapper<IotDvrHardDiskDetectionLog> {
     Page<DvrDiskDetectionPageVo> page(@Param("request") DvrDiskAppPageDto request, @Param("page") Page<DvrDiskDetectionPageVo> page);
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/mapper/VideoRecorderHardDiskDetectionMapper.java

@@ -2,13 +2,13 @@ package com.xunmei.iot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.domain.video.MediatorVideoRecorderHardDiskDetection;
+import com.xunmei.common.core.domain.video.IotDvrHardDiskDetection;
 import com.xunmei.iot.dto.dvrDisk.DvrDiskAppPageDto;
 import com.xunmei.iot.vo.dvrDisk.DvrDiskDetectionPageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
-public interface VideoRecorderHardDiskDetectionMapper extends BaseMapper<MediatorVideoRecorderHardDiskDetection> {
-    Page<DvrDiskDetectionPageVo> page(@Param("request") DvrDiskAppPageDto request, @Param("page") Page<MediatorVideoRecorderHardDiskDetection> page);
+public interface VideoRecorderHardDiskDetectionMapper extends BaseMapper<IotDvrHardDiskDetection> {
+    Page<DvrDiskDetectionPageVo> page(@Param("request") DvrDiskAppPageDto request, @Param("page") Page<IotDvrHardDiskDetection> page);
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/VideoRecorderHardDiskDetectionService.java

@@ -1,11 +1,11 @@
 package com.xunmei.iot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.domain.video.MediatorVideoRecorderHardDiskDetection;
+import com.xunmei.common.core.domain.video.IotDvrHardDiskDetection;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.iot.dto.dvrDisk.DvrDiskAppPageDto;
 import com.xunmei.iot.vo.dvrDisk.DvrDiskDetectionPageVo;
 
-public interface VideoRecorderHardDiskDetectionService extends IService<MediatorVideoRecorderHardDiskDetection> {
+public interface VideoRecorderHardDiskDetectionService extends IService<IotDvrHardDiskDetection> {
     TableDataInfo<DvrDiskDetectionPageVo> page(DvrDiskAppPageDto request);
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/VideoRecorderHardDiskDetectionServiceImpl.java

@@ -6,7 +6,7 @@ import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.domain.IdName;
-import com.xunmei.common.core.domain.video.MediatorVideoRecorderHardDiskDetection;
+import com.xunmei.common.core.domain.video.IotDvrHardDiskDetection;
 import com.xunmei.common.core.utils.bean.BeanUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.iot.dto.dvrDisk.DvrDiskAppPageDto;
@@ -22,7 +22,7 @@ import java.util.List;
 
 @Service
 public class VideoRecorderHardDiskDetectionServiceImpl
-        extends ServiceImpl<VideoRecorderHardDiskDetectionMapper, MediatorVideoRecorderHardDiskDetection>
+        extends ServiceImpl<VideoRecorderHardDiskDetectionMapper, IotDvrHardDiskDetection>
         implements VideoRecorderHardDiskDetectionService {
 
     @Override
@@ -33,10 +33,10 @@ public class VideoRecorderHardDiskDetectionServiceImpl
             request.getRange()[1] = DateUtil.endOfDay(request.getAlarmTime());
         }
 
-        Page<MediatorVideoRecorderHardDiskDetection> page = baseMapper.page(request, request.toPage());
+        Page<IotDvrHardDiskDetection> page = baseMapper.page(request, request.toPage());
         Page<DvrDiskDetectionPageVo> voPage = request.toPage();
         voPage.setRecords(new ArrayList<>());
-        for (MediatorVideoRecorderHardDiskDetection record : page.getRecords()) {
+        for (IotDvrHardDiskDetection record : page.getRecords()) {
             DvrDiskDetectionPageVo vo = new DvrDiskDetectionPageVo();
             BeanUtils.copyProperties(record, vo);
             if (ObjectUtil.isNotEmpty(record.getDetailInfo())) {

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/controller/VideoDataController.java

@@ -34,7 +34,7 @@ public class VideoDataController {
     @Autowired
     private RabbitMsgIdService rabbitMsgIdService;
     @Resource
-    IMediatorVideoRecorderHardDiskDetectionService videoRecorderHardDiskDetectionService;
+    IotDvrHardDiskDetectionService videoRecorderHardDiskDetectionService;
     @ApiOperation("录像完整性检查")
     @PostMapping({"/api/{branchId}/video/complete"})
     public ReceiveErrorDto complete(@PathVariable String branchId, String msgId, @RequestBody VideoIntegrityCheckDto videoIntegrityCheckDto) {

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDvrHardDiskDetectionLogMapper.java

@@ -0,0 +1,17 @@
+package com.xunmei.mediator.api.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.common.core.domain.video.IotDvrHardDiskDetectionLog;
+
+/**
+ * <p>
+ *  录像机硬盘检测日志表 Mapper 接口
+ * </p>
+ *
+ * @author oygj
+ * @since 2024-01-30
+ */
+public interface IotDvrHardDiskDetectionLogMapper extends BaseMapper<IotDvrHardDiskDetectionLog> {
+
+}

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/MediatorVideoRecorderHardDiskDetectionMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDvrHardDiskDetectionMapper.java

@@ -2,7 +2,7 @@ package com.xunmei.mediator.api.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.common.core.domain.video.MediatorVideoRecorderHardDiskDetection;
+import com.xunmei.common.core.domain.video.IotDvrHardDiskDetection;
 
 /**
  * <p>
@@ -12,6 +12,6 @@ import com.xunmei.common.core.domain.video.MediatorVideoRecorderHardDiskDetectio
  * @author oygj
  * @since 2024-01-30
  */
-public interface MediatorVideoRecorderHardDiskDetectionMapper extends BaseMapper<MediatorVideoRecorderHardDiskDetection> {
+public interface IotDvrHardDiskDetectionMapper extends BaseMapper<IotDvrHardDiskDetection> {
 
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/MediatorVideoRecorderHardDiskDetectionLogMapper.java

@@ -1,17 +0,0 @@
-package com.xunmei.mediator.api.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.common.core.domain.video.MediatorVideoRecorderHardDiskDetectionLog;
-
-/**
- * <p>
- *  录像机硬盘检测日志表 Mapper 接口
- * </p>
- *
- * @author oygj
- * @since 2024-01-30
- */
-public interface MediatorVideoRecorderHardDiskDetectionLogMapper extends BaseMapper<MediatorVideoRecorderHardDiskDetectionLog> {
-
-}

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IMediatorVideoRecorderHardDiskDetectionLogService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotDvrHardDiskDetectionLogService.java

@@ -2,7 +2,7 @@ package com.xunmei.mediator.api.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.domain.video.MediatorVideoRecorderHardDiskDetectionLog;
+import com.xunmei.common.core.domain.video.IotDvrHardDiskDetectionLog;
 
 /**
  * <p>
@@ -12,6 +12,6 @@ import com.xunmei.common.core.domain.video.MediatorVideoRecorderHardDiskDetectio
  * @author oygj
  * @since 2024-01-30
  */
-public interface IMediatorVideoRecorderHardDiskDetectionLogService extends IService<MediatorVideoRecorderHardDiskDetectionLog> {
+public interface IotDvrHardDiskDetectionLogService extends IService<IotDvrHardDiskDetectionLog> {
 
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IMediatorVideoRecorderHardDiskDetectionService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotDvrHardDiskDetectionService.java

@@ -2,8 +2,7 @@ package com.xunmei.mediator.api.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.domain.video.MediatorVideoRecorderHardDiskDetection;
-import com.xunmei.system.api.domain.SysDevice;
+import com.xunmei.common.core.domain.video.IotDvrHardDiskDetection;
 import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.system.api.dto.protection.VideoRecorderHardDiskDetectionEditDto;
 
@@ -17,14 +16,14 @@ import java.util.Map;
  * @author oygj
  * @since 2024-01-30
  */
-public interface IMediatorVideoRecorderHardDiskDetectionService extends IService<MediatorVideoRecorderHardDiskDetection> {
+public interface IotDvrHardDiskDetectionService extends IService<IotDvrHardDiskDetection> {
 
     ReceiveErrorDto saveData(VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto, String msgId, String branchId) throws IllegalAccessException;
 
     Map<String, Object> checkVideoRecorderHardDiskDetectionEditDto(VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto) throws IllegalAccessException;
 
 
-    MediatorVideoRecorderHardDiskDetection findTopByEquipmentCodeAndOrgId(String equipmentCode, Long orgId);
+    IotDvrHardDiskDetection findTopByEquipmentCodeAndOrgId(String equipmentCode, Long orgId);
 
     void saveDataInfo(Map<String, Object> objectMap, VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto);
 }

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

@@ -401,7 +401,6 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
                 String ak = packageGuid + "_" + i;
                 this.redisTemplate.delete(ak);
             }
-            //protectionDao.updateAllDelete();
             this.northStatisticsSyncService.saveOrUpdateBaseCountByDataType(DataType.protectionCount.getIndex(), defenceareaList.size(), false);
             new Thread(() -> {
                 this.saveAndUpdate(defenceareaList, branchId, msgId);

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

@@ -0,0 +1,20 @@
+package com.xunmei.mediator.api.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.domain.video.IotDvrHardDiskDetectionLog;
+import com.xunmei.mediator.api.mapper.IotDvrHardDiskDetectionLogMapper;
+import com.xunmei.mediator.api.service.IotDvrHardDiskDetectionLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  录像机硬盘检测日志表 服务实现类
+ * </p>
+ *
+ * @author oygj
+ * @since 2024-01-30
+ */
+@Service
+public class IotDvrHardDiskDetectionLogServiceImpl extends ServiceImpl<IotDvrHardDiskDetectionLogMapper, IotDvrHardDiskDetectionLog> implements IotDvrHardDiskDetectionLogService {
+
+}

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

@@ -8,18 +8,16 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.iot.domain.IotDevice;
 import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmCode;
 import com.xunmei.common.core.domain.mediator.domain.MediatorCategory;
-import com.xunmei.common.core.domain.video.MediatorVideoRecorderHardDiskDetection;
-import com.xunmei.common.core.domain.video.MediatorVideoRecorderHardDiskDetectionLog;
+import com.xunmei.common.core.domain.video.IotDvrHardDiskDetection;
+import com.xunmei.common.core.domain.video.IotDvrHardDiskDetectionLog;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.mediator.api.mapper.MediatorCategoryMapper;
-import com.xunmei.mediator.api.mapper.MediatorVideoRecorderHardDiskDetectionMapper;
+import com.xunmei.mediator.api.mapper.IotDvrHardDiskDetectionMapper;
 import com.xunmei.mediator.api.service.*;
 import com.xunmei.mediator.util.CheckDataUtil;
-import com.xunmei.system.api.RemoteDeviceService;
 import com.xunmei.system.api.RemoteOrgService;
-import com.xunmei.system.api.domain.SysDevice;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.system.api.dto.protection.VideoRecorderHardDiskDetectionEditDto;
@@ -38,7 +36,7 @@ import java.util.*;
  * @since 2024-01-30
  */
 @Service
-public class MediatorVideoRecorderHardDiskDetectionServiceImpl extends ServiceImpl<MediatorVideoRecorderHardDiskDetectionMapper, MediatorVideoRecorderHardDiskDetection> implements IMediatorVideoRecorderHardDiskDetectionService {
+public class IotDvrHardDiskDetectionServiceImpl extends ServiceImpl<IotDvrHardDiskDetectionMapper, IotDvrHardDiskDetection> implements IotDvrHardDiskDetectionService {
 
     @Resource
     RemoteOrgService remoteOrgService;
@@ -49,12 +47,12 @@ public class MediatorVideoRecorderHardDiskDetectionServiceImpl extends ServiceIm
     @Resource
     IMediatorAlarmCodeService alarmCodeService;
     @Resource
-    IMediatorVideoRecorderHardDiskDetectionLogService videoRecorderHardDiskDetectionLogService;
+    IotDvrHardDiskDetectionLogService videoRecorderHardDiskDetectionLogService;
     @Override
-    public MediatorVideoRecorderHardDiskDetection findTopByEquipmentCodeAndOrgId(String equipmentCode, Long orgId) {
+    public IotDvrHardDiskDetection findTopByEquipmentCodeAndOrgId(String equipmentCode, Long orgId) {
         return lambdaQuery()
-                .eq(MediatorVideoRecorderHardDiskDetection::getEquipmentCode, equipmentCode)
-                .eq(MediatorVideoRecorderHardDiskDetection::getOrgId, orgId)
+                .eq(IotDvrHardDiskDetection::getEquipmentCode, equipmentCode)
+                .eq(IotDvrHardDiskDetection::getOrgId, orgId)
                 .last(Constants.LIMIT1)
                 .one();
     }
@@ -129,12 +127,12 @@ public class MediatorVideoRecorderHardDiskDetectionServiceImpl extends ServiceIm
         Map<String, Object> map = new HashMap<>();
         MediatorAlarmCode code = alarmCodeService.selectByCode("112");
         map.put("code", code);
-        MediatorVideoRecorderHardDiskDetection videoRecorderHardDiskDetection = new MediatorVideoRecorderHardDiskDetection();
+        IotDvrHardDiskDetection videoRecorderHardDiskDetection = new IotDvrHardDiskDetection();
         videoRecorderHardDiskDetection.setOrgId(org.getId());
         videoRecorderHardDiskDetection.setOrgName(org.getName());
         videoRecorderHardDiskDetection.setOrgPath(org.getPath());
         videoRecorderHardDiskDetection.setEquipmentCode(videoRecorderHardDiskDetectionEditDto.getEquipmentCode());
-        MediatorVideoRecorderHardDiskDetection old = this.findTopByEquipmentCodeAndOrgId(videoRecorderHardDiskDetectionEditDto.getEquipmentCode(), org.getId());
+        IotDvrHardDiskDetection old = this.findTopByEquipmentCodeAndOrgId(videoRecorderHardDiskDetectionEditDto.getEquipmentCode(), org.getId());
         if (old != null) {
             videoRecorderHardDiskDetection = old;
         } else {
@@ -158,7 +156,7 @@ public class MediatorVideoRecorderHardDiskDetectionServiceImpl extends ServiceIm
         }
         videoRecorderHardDiskDetection.setUpdateTime(LocalDateTime.now());
         map.put("videoRecorderHardDiskDetection", videoRecorderHardDiskDetection);
-        MediatorVideoRecorderHardDiskDetectionLog videoRecorderHardDiskDetectionLog = new MediatorVideoRecorderHardDiskDetectionLog();
+        IotDvrHardDiskDetectionLog videoRecorderHardDiskDetectionLog = new IotDvrHardDiskDetectionLog();
         BeanHelper.copyProperties(videoRecorderHardDiskDetectionLog, videoRecorderHardDiskDetection);
         videoRecorderHardDiskDetectionLog.setId((Long) null);
         videoRecorderHardDiskDetectionLog.setVideoRecorderHardDiskDetectionId(videoRecorderHardDiskDetection.getId());
@@ -185,8 +183,8 @@ public class MediatorVideoRecorderHardDiskDetectionServiceImpl extends ServiceIm
 
     @Override
     public void saveDataInfo(Map<String, Object> objectMap, VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto) {
-        MediatorVideoRecorderHardDiskDetection videoRecorderHardDiskDetection = (MediatorVideoRecorderHardDiskDetection) objectMap.get("videoRecorderHardDiskDetection");
-        MediatorVideoRecorderHardDiskDetectionLog videoRecorderHardDiskDetectionLog = (MediatorVideoRecorderHardDiskDetectionLog) objectMap.get("videoRecorderHardDiskDetectionLog");
+        IotDvrHardDiskDetection videoRecorderHardDiskDetection = (IotDvrHardDiskDetection) objectMap.get("videoRecorderHardDiskDetection");
+        IotDvrHardDiskDetectionLog videoRecorderHardDiskDetectionLog = (IotDvrHardDiskDetectionLog) objectMap.get("videoRecorderHardDiskDetectionLog");
         this.saveOrUpdate(videoRecorderHardDiskDetection);
         videoRecorderHardDiskDetectionLogService.saveOrUpdate(videoRecorderHardDiskDetectionLog);
     }

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

@@ -1,20 +0,0 @@
-package com.xunmei.mediator.api.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.common.core.domain.video.MediatorVideoRecorderHardDiskDetectionLog;
-import com.xunmei.mediator.api.mapper.MediatorVideoRecorderHardDiskDetectionLogMapper;
-import com.xunmei.mediator.api.service.IMediatorVideoRecorderHardDiskDetectionLogService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  录像机硬盘检测日志表 服务实现类
- * </p>
- *
- * @author oygj
- * @since 2024-01-30
- */
-@Service
-public class MediatorVideoRecorderHardDiskDetectionLogServiceImpl extends ServiceImpl<MediatorVideoRecorderHardDiskDetectionLogMapper, MediatorVideoRecorderHardDiskDetectionLog> implements IMediatorVideoRecorderHardDiskDetectionLogService {
-
-}

soc-modules/soc-modules-mediator/src/main/resources/mapper/MediatorVideoRecorderHardDiskDetectionMapper.xml → soc-modules/soc-modules-mediator/src/main/resources/mapper/IotDvrHardDiskDetectionLogMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.mapper.MediatorVideoRecorderHardDiskDetectionMapper">
+<mapper namespace="com.xunmei.mediator.api.mapper.IotDvrHardDiskDetectionLogMapper">
 
 </mapper>

soc-modules/soc-modules-mediator/src/main/resources/mapper/MediatorVideoRecorderHardDiskDetectionLogMapper.xml → soc-modules/soc-modules-mediator/src/main/resources/mapper/IotDvrHardDiskDetectionMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.mapper.MediatorVideoRecorderHardDiskDetectionLogMapper">
+<mapper namespace="com.xunmei.mediator.api.mapper.IotDvrHardDiskDetectionMapper">
 
 </mapper>