北向接口代码提交

project_data/sql/0.0.6-iot/soc/soc.sql

@@ -239,7 +239,7 @@ CREATE TABLE `mediator_video_diagnosis_record` (
            KEY `idx_code` (`equipment_code`(191),`channel_code`(191))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
-drop table if exists mediator_video_diagnosis_record;
+drop table if exists mediator_north_error;
 CREATE TABLE `mediator_north_error` (
      `id` bigint NOT NULL AUTO_INCREMENT,
      `create_time` datetime DEFAULT NULL COMMENT '数据生成时间',
@@ -251,7 +251,7 @@ CREATE TABLE `mediator_north_error` (
      PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=19483123 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='北向接口_存储错误数据';
 
-drop table if exists mediator_video_diagnosis_record;
+drop table if exists mediator_north_msg_id;
 CREATE TABLE `mediator_north_msg_id` (
       `msg_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用msgId作为主键',
       `interface_path` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,

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

@@ -0,0 +1,96 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author oygj
+ * @since 2024-02-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_device")
+@ApiModel(value="IotDevice对象", description="")
+public class IotDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+      @TableId("id")
+    private Long id;
+
+    @ApiModelProperty(value = "所属机构")
+    @TableField("org_id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "所属机构名称")
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "所属机构path")
+    @TableField("org_path")
+    private String orgPath;
+
+    @ApiModelProperty(value = "设备唯一标识")
+    @TableField("equipment_code")
+    private String equipmentCode;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("equipment_name")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "设备类型")
+    @TableField("category_id")
+    private Long categoryId;
+
+    @ApiModelProperty(value = "摄像机标识")
+    @TableField("camera_code")
+    private String cameraCode;
+
+    @ApiModelProperty(value = "摄像机登录用户名")
+    @TableField("camera_user_name")
+    private String cameraUserName;
+
+    @ApiModelProperty(value = "摄像机登录密码")
+    @TableField("camera_password")
+    private String cameraPassword;
+
+    @ApiModelProperty(value = "ip地址")
+    @TableField("net_address")
+    private String netAddress;
+
+    @ApiModelProperty(value = "厂商")
+    @TableField("producer")
+    private String producer;
+
+    @ApiModelProperty(value = "设备型号")
+    @TableField("device_type")
+    private String deviceType;
+
+    @ApiModelProperty(value = "设备的地址")
+    @TableField("equipment_addr")
+    private String equipmentAddr;
+
+    @ApiModelProperty(value = "资产设备id")
+    @TableField("device_id")
+    private Long deviceId;
+
+    @ApiModelProperty(value = "0:未删除，1：删除")
+    @TableField("deleted")
+    private Integer deleted;
+
+    @ApiModelProperty(value = "来源,0:资产设备，1：iot推送")
+    @TableField("source")
+    private Integer source;
+
+}

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

@@ -0,0 +1,89 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author oygj
+ * @since 2024-02-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_dvr_channel")
+@ApiModel(value="IotDvrChannel对象", description="")
+public class IotDvrChannel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+      @TableId("id")
+    private Long id;
+
+    @ApiModelProperty(value = "所属机构")
+    @TableField("org_id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "所属机构名称")
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "所属机构path")
+    @TableField("org_path")
+    private String orgPath;
+
+    @ApiModelProperty(value = "监控主机（硬盘录像机）的编码")
+    @TableField("host_code")
+    private String hostCode;
+
+    @ApiModelProperty(value = "通道编号")
+    @TableField("channel_code")
+    private Integer channelCode;
+
+    @ApiModelProperty(value = "通道名称")
+    @TableField("channel_name")
+    private String channelName;
+
+    @ApiModelProperty(value = "通道地址")
+    @TableField("channel_addr")
+    private String channelAddr;
+
+    @ApiModelProperty(value = "资产设备id")
+    @TableField("device_id")
+    private Long deviceId;
+
+    @ApiModelProperty(value = "0:未删除，1：删除")
+    @TableField("deleted")
+    private Integer deleted;
+
+    @ApiModelProperty(value = "来源,0:资产设备，1：iot推送")
+    @TableField("source")
+    private Integer source;
+
+    @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-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDeviceMapper.java

@@ -0,0 +1,17 @@
+package com.xunmei.mediator.api.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.common.core.domain.iot.domain.IotDevice;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author oygj
+ * @since 2024-02-20
+ */
+public interface IotDeviceMapper extends BaseMapper<IotDevice> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.xunmei.mediator.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.common.core.domain.iot.domain.IotDvrChannel;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author oygj
+ * @since 2024-02-20
+ */
+public interface IotDvrChannelMapper extends BaseMapper<IotDvrChannel> {
+
+}

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

@@ -0,0 +1,19 @@
+package com.xunmei.mediator.api.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.iot.domain.IotDevice;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author oygj
+ * @since 2024-02-20
+ */
+public interface IIotDeviceService extends IService<IotDevice> {
+
+    IotDevice findResult(String channelCode, String equipmentCode, Long orgId);
+
+    IotDevice findByHostCode(String equipmentCode, Long orgId);
+}

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

@@ -0,0 +1,17 @@
+package com.xunmei.mediator.api.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.iot.domain.IotDvrChannel;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author oygj
+ * @since 2024-02-20
+ */
+public interface IIotDvrChannelService extends IService<IotDvrChannel> {
+
+    IotDvrChannel findChannel(String channelCode, String equipmentCode, Long orgId);
+}

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

@@ -26,5 +26,5 @@ public interface IMediatorVideoRecorderHardDiskDetectionService extends IService
 
     MediatorVideoRecorderHardDiskDetection findTopByEquipmentCodeAndOrgId(String equipmentCode, Long orgId);
 
-    void saveDataInfo(Map<String, Object> objectMap, VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto, SysDevice device);
+    void saveDataInfo(Map<String, Object> objectMap, VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto);
 }

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

@@ -1,6 +1,7 @@
 package com.xunmei.mediator.api.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.iot.domain.IotDvrChannel;
 import com.xunmei.common.core.domain.video.MediatorVideoDiagnosisRecord;
 import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.mediator.domain.dto.videoDiagnosis.VideoDiagnosisDto;
@@ -23,6 +24,6 @@ public interface IVideoDiagnosisRecordService extends IService<MediatorVideoDiag
 
     MediatorVideoDiagnosisRecord findByOrgIdAndEquipmentCodeAndChannelCode(Long orgId, String equipmentCode, String channelCode);
 
-    void saveDataInfo(Map<String, Object> objectMap, VideoDiagnosisDto videoDiagnosisDto, SysDevice device);
+    void saveDataInfo(Map<String, Object> objectMap, VideoDiagnosisDto videoDiagnosisDto, IotDvrChannel device);
 
 }

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

@@ -0,0 +1,41 @@
+package com.xunmei.mediator.api.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.CacheConstants;
+import com.xunmei.common.core.constant.Constants;
+import com.xunmei.common.core.domain.iot.domain.IotDevice;
+import com.xunmei.mediator.api.mapper.IotDeviceMapper;
+import com.xunmei.mediator.api.service.IIotDeviceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author oygj
+ * @since 2024-02-20
+ */
+@Service
+public class IotDeviceServiceImpl extends ServiceImpl<IotDeviceMapper, IotDevice> implements IIotDeviceService {
+
+    @Override
+    public IotDevice findResult(String channelCode, String equipmentCode, Long orgId) {
+        return lambdaQuery()
+                .eq(IotDevice::getOrgId, orgId)
+                .eq(IotDevice::getEquipmentCode, equipmentCode)
+                .eq(IotDevice::getCameraCode, channelCode)
+                .last(Constants.LIMIT1)
+                .one();
+    }
+
+    @Override
+    public IotDevice findByHostCode(String equipmentCode,Long orgId) {
+        return lambdaQuery()
+                .eq(IotDevice::getOrgId, orgId)
+                .eq(IotDevice::getEquipmentCode, equipmentCode)
+                .last(Constants.LIMIT1)
+                .one();
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.xunmei.mediator.api.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.Constants;
+import com.xunmei.common.core.domain.iot.domain.IotDvrChannel;
+import com.xunmei.mediator.api.mapper.IotDvrChannelMapper;
+import com.xunmei.mediator.api.service.IIotDvrChannelService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author oygj
+ * @since 2024-02-20
+ */
+@Service
+public class IotDvrChannelServiceImpl extends ServiceImpl<IotDvrChannelMapper, IotDvrChannel> implements IIotDvrChannelService {
+
+    @Override
+    public IotDvrChannel findChannel(String channelCode, String equipmentCode, Long orgId) {
+        return lambdaQuery()
+                .eq(IotDvrChannel::getHostCode,equipmentCode)
+                .eq(IotDvrChannel::getOrgId,orgId)
+                .eq(IotDvrChannel::getChannelCode,channelCode)
+                .last(Constants.LIMIT1)
+                .one();
+    }
+}

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.Constants;
 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;
@@ -14,9 +15,7 @@ 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.service.IMediatorAlarmCodeService;
-import com.xunmei.mediator.api.service.IMediatorVideoRecorderHardDiskDetectionLogService;
-import com.xunmei.mediator.api.service.IMediatorVideoRecorderHardDiskDetectionService;
+import com.xunmei.mediator.api.service.*;
 import com.xunmei.mediator.util.CheckDataUtil;
 import com.xunmei.system.api.RemoteDeviceService;
 import com.xunmei.system.api.RemoteOrgService;
@@ -44,7 +43,7 @@ public class MediatorVideoRecorderHardDiskDetectionServiceImpl extends ServiceIm
     @Resource
     RemoteOrgService remoteOrgService;
     @Resource
-    RemoteDeviceService remoteDeviceService;
+    IIotDeviceService iIotDeviceService;
     @Resource
     MediatorCategoryMapper categoryMapper;
     @Resource
@@ -75,7 +74,7 @@ public class MediatorVideoRecorderHardDiskDetectionServiceImpl extends ServiceIm
                 return map;
             }
             String equipmentCode = videoRecorderHardDiskDetectionEditDto.getEquipmentCode();
-            SysDevice device = remoteDeviceService.findByHostCode(equipmentCode, SecurityConstants.INNER);
+            final IotDevice device = iIotDeviceService.findByHostCode(equipmentCode, org.getId());
             if (ObjectUtil.isNull(device)) {
                 error.setSuccess(false);
                 error.setErrorMsg("参数非法：设备code:" + equipmentCode + "不存在");
@@ -115,8 +114,8 @@ public class MediatorVideoRecorderHardDiskDetectionServiceImpl extends ServiceIm
             }
 
             map.put("org", org);
-            map.put("device", device);
-            map.put("category", category);
+            //map.put("device", device);
+            //map.put("category", category);
             map.put("error", error);
             return map;
         }
@@ -125,7 +124,7 @@ public class MediatorVideoRecorderHardDiskDetectionServiceImpl extends ServiceIm
         return map;
     }
 
-    private Map<String, Object> buildEntityDto(VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto, SysOrg org, SysDevice device, MediatorCategory category) {
+    private Map<String, Object> buildEntityDto(VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto, SysOrg org) {
 
         Map<String, Object> map = new HashMap<>();
         MediatorAlarmCode code = alarmCodeService.selectByCode("112");
@@ -174,10 +173,10 @@ public class MediatorVideoRecorderHardDiskDetectionServiceImpl extends ServiceIm
         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(videoRecorderHardDiskDetectionEditDto, org, device, category);
-            this.saveDataInfo(objectMap, videoRecorderHardDiskDetectionEditDto, device);
+            //SysDevice device = (SysDevice) map.get("device");
+           // MediatorCategory category = (MediatorCategory) map.get("category");
+            Map<String, Object> objectMap = this.buildEntityDto(videoRecorderHardDiskDetectionEditDto, org);
+            this.saveDataInfo(objectMap, videoRecorderHardDiskDetectionEditDto);
         }
         return error;
     }
@@ -185,7 +184,7 @@ public class MediatorVideoRecorderHardDiskDetectionServiceImpl extends ServiceIm
 
 
     @Override
-    public void saveDataInfo(Map<String, Object> objectMap, VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto, SysDevice device) {
+    public void saveDataInfo(Map<String, Object> objectMap, VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto) {
         MediatorVideoRecorderHardDiskDetection videoRecorderHardDiskDetection = (MediatorVideoRecorderHardDiskDetection) objectMap.get("videoRecorderHardDiskDetection");
         MediatorVideoRecorderHardDiskDetectionLog videoRecorderHardDiskDetectionLog = (MediatorVideoRecorderHardDiskDetectionLog) objectMap.get("videoRecorderHardDiskDetectionLog");
         this.saveOrUpdate(videoRecorderHardDiskDetection);

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

@@ -7,9 +7,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.iot.domain.IotDevice;
+import com.xunmei.common.core.domain.iot.domain.IotDvrChannel;
 import com.xunmei.common.core.domain.video.MediatorVideoDaysCheck;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.mediator.api.mapper.VideoDaysCheckMapper;
+import com.xunmei.mediator.api.service.IIotDeviceService;
+import com.xunmei.mediator.api.service.IIotDvrChannelService;
 import com.xunmei.mediator.api.service.IVideoDaysCheckService;
 import com.xunmei.mediator.api.service.NorthErrorService;
 import com.xunmei.system.api.domain.north.NorthError;
@@ -40,13 +44,14 @@ import java.util.Map;
 @Service
 public class VideoDaysCheckServiceImpl extends ServiceImpl<VideoDaysCheckMapper, MediatorVideoDaysCheck> implements IVideoDaysCheckService {
     @Resource
-    RedisUtil redisUtil;
-    @Resource
-    RemoteDeviceService deviceService;
+    IIotDeviceService iIotDeviceService;
     @Resource
     RemoteOrgService orgService;
     @Resource
     NorthErrorService northErrorService;
+    @Resource
+    IIotDvrChannelService dvrChannelService;
+
     @Override
     public ReceiveErrorDto saveData(VideoDaysCheckDto videoDaysCheckDto, String msgId, String branchId) {
         if (null == videoDaysCheckDto) {
@@ -88,9 +93,9 @@ public class VideoDaysCheckServiceImpl extends ServiceImpl<VideoDaysCheckMapper,
         MediatorVideoDaysCheck videoDaysCheck = new MediatorVideoDaysCheck();
 
         //获取监控主机
-        SysDevice hostDevice = deviceService.findByHostCode(videoDaysCheckDto.getEquipmentCode(),SecurityConstants.INNER);
+        IotDevice hostDevice = iIotDeviceService.findByHostCode(videoDaysCheckDto.getEquipmentCode(),org.getId());
         if (hostDevice != null) {
-            videoDaysCheck.setEquipmentName(hostDevice.getDeviceName());
+            videoDaysCheck.setEquipmentName(hostDevice.getEquipmentName());
         }
 
         MediatorVideoDaysCheck old = this.findByOrgIdAndEquipmentCodeAndChannelCode(org.getId(), videoDaysCheckDto.getEquipmentCode(), videoDaysCheckDto.getChannelCode());
@@ -131,9 +136,8 @@ public class VideoDaysCheckServiceImpl extends ServiceImpl<VideoDaysCheckMapper,
         }
 
 
-        //final Device device = deviceService.findResult(videoDaysCheckDto.getChannelCode(), videoDaysCheckDto.getEquipmentCode(), org.getId());
-        final SysDevice device = new SysDevice();
-        if (ObjectUtil.isNull(device)) {
+        final IotDvrChannel channel = dvrChannelService.findChannel(videoDaysCheckDto.getChannelCode(), videoDaysCheckDto.getEquipmentCode(), org.getId());
+        if (ObjectUtil.isNull(channel)) {
             NorthError error = new NorthError(msgId, branchId, "/video/daysInfo"
                     , videoDaysCheckDto, "通道/设备不存在!");
             northErrorService.saveError(error);

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.iot.domain.IotDevice;
+import com.xunmei.common.core.domain.iot.domain.IotDvrChannel;
 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.MediatorVideoDiagnosisRecord;
@@ -13,6 +15,8 @@ import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.mediator.api.mapper.MediatorAlarmCodeMapper;
 import com.xunmei.mediator.api.mapper.MediatorCategoryMapper;
 import com.xunmei.mediator.api.mapper.VideoDiagnosisRecordMapper;
+import com.xunmei.mediator.api.service.IIotDeviceService;
+import com.xunmei.mediator.api.service.IIotDvrChannelService;
 import com.xunmei.mediator.api.service.IVideoDiagnosisLogService;
 import com.xunmei.mediator.api.service.IVideoDiagnosisRecordService;
 import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
@@ -51,7 +55,9 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
     @Resource
     MediatorCategoryMapper categoryMapper;
     @Resource
-    RemoteDeviceService deviceService;
+    IIotDeviceService iIotDeviceService;
+    @Resource
+    IIotDvrChannelService dvrChannelService;
     @Resource
     MediatorAlarmCodeMapper alarmCodeMapper;
     @Override
@@ -69,9 +75,9 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
         //参数验证通过
         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(videoDiagnosisDto, org, device, category);
+            IotDvrChannel device = (IotDvrChannel) map.get("device");
+           // MediatorCategory category = (MediatorCategory) map.get("category");
+            Map<String, Object> objectMap = this.buildEntityDto(videoDiagnosisDto, org, device);
             this.saveDataInfo(objectMap, videoDiagnosisDto, device);
         }
         return error;
@@ -103,24 +109,23 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
                 map.put("error", error);
                 return map;
             }
-            //Device device = deviceService.findResult(videoDiagnosisDto.getChannelCode(), videoDiagnosisDto.getEquipmentCode(), org.getId());
-            SysDevice device = new SysDevice();
-            if (ObjectUtil.isNull(device)) {
+            final IotDvrChannel channel = dvrChannelService.findChannel(videoDiagnosisDto.getChannelCode(), videoDiagnosisDto.getEquipmentCode(), org.getId());
+            if (ObjectUtil.isNull(channel)) {
                 error.setSuccess(false);
                 error.setErrorMsg("通道/设备不存在!");
                 map.put("error", error);
                 return map;
             }
-            MediatorCategory category = categoryMapper.selectById(device.getCategoryId());
+            /*MediatorCategory category = categoryMapper.selectById(channel.getCategoryId());
             if (ObjectUtil.isNull(category)) {
                 error.setSuccess(false);
                 error.setErrorMsg("设备类型不存在");
                 map.put("error", error);
                 return map;
-            }
-            map.put("device", device);
+            }*/
+            map.put("device", channel);
             map.put("org", org);
-            map.put("category", category);
+           // map.put("category", category);
             map.put("error", error);
             return map;
         } else {
@@ -173,7 +178,7 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
 
     }
 
-    private Map<String, Object> buildEntityDto(VideoDiagnosisDto videoDiagnosisDto, SysOrg org, SysDevice device, MediatorCategory category) throws ParseException {
+    private Map<String, Object> buildEntityDto(VideoDiagnosisDto videoDiagnosisDto, SysOrg org, IotDvrChannel channel) {
         Map<String, Object> objectMap = new HashMap<>();
         MediatorVideoDiagnosisRecord videoDiagnosis = new MediatorVideoDiagnosisRecord();
         videoDiagnosis.setId(IDHelper.id());
@@ -205,12 +210,12 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
         videoDiagnosis.setOrgId(org.getId());
         videoDiagnosis.setOrgName(org.getName());
         videoDiagnosis.setOrgPath(org.getPath());
-        SysDevice hostDevice = deviceService.findByHostCode(videoDiagnosis.getEquipmentCode(),SecurityConstants.INNER);
+        IotDevice hostDevice = iIotDeviceService.findByHostCode(videoDiagnosis.getEquipmentCode(),org.getId());
         if (hostDevice != null) {
-            videoDiagnosis.setEquipmentName(hostDevice.getDeviceName());
+            videoDiagnosis.setEquipmentName(hostDevice.getEquipmentName());
         }
-        videoDiagnosis.setDeviceName(device.getDeviceName());
-        videoDiagnosis.setDeviceId(String.valueOf(device.getId()));
+        videoDiagnosis.setDeviceName(channel.getChannelName());
+        videoDiagnosis.setDeviceId(String.valueOf(channel.getId()));
         this.dealDetailInfo(videoDiagnosis);
         objectMap.put("videoDiagnosis", videoDiagnosis);
 
@@ -314,7 +319,7 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
 
 
     @Override
-    public void saveDataInfo(Map<String, Object> objectMap, VideoDiagnosisDto videoDiagnosisDto, SysDevice device) {
+    public void saveDataInfo(Map<String, Object> objectMap, VideoDiagnosisDto videoDiagnosisDto, IotDvrChannel device) {
         MediatorVideoDiagnosisRecord videoDiagnosis = (MediatorVideoDiagnosisRecord) objectMap.get("videoDiagnosis");
        /* List<HostAlarmRecord> alarmRecordsInsert = (List<HostAlarmRecord>) objectMap.get("alarmRecordsInsert");
         List<HostAlarmRecord> alarmRecordsUpdate = (List<HostAlarmRecord>) objectMap.get("alarmRecordsUpdate");*/

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

@@ -7,21 +7,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.iot.domain.IotDevice;
+import com.xunmei.common.core.domain.iot.domain.IotDvrChannel;
 import com.xunmei.common.core.domain.video.MediatorVideoDaysCheck;
 import com.xunmei.common.core.domain.video.MediatorVideoIntegrityCheck;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.mediator.api.mapper.VideoIntegrityCheckMapper;
-import com.xunmei.mediator.api.service.IVideoDaysCheckService;
-import com.xunmei.mediator.api.service.IVideoIntegrityCheckService;
-import com.xunmei.mediator.api.service.NorthErrorService;
+import com.xunmei.mediator.api.service.*;
 import com.xunmei.system.api.domain.north.NorthError;
 import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.mediator.domain.dto.redis.RedisKey;
 import com.xunmei.mediator.domain.dto.videoIntegrityCheck.VideoIntegrityCheckDto;
 import com.xunmei.mediator.util.RedisUtil;
-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 io.netty.util.internal.StringUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -51,7 +49,9 @@ public class VideoIntegrityCheckServiceImpl extends ServiceImpl<VideoIntegrityCh
     @Resource
     IVideoDaysCheckService videoDaysCheckService;
     @Resource
-    RemoteDeviceService deviceService;
+    IIotDeviceService iIotDeviceService;
+    @Resource
+    IIotDvrChannelService dvrChannelService;
     @Override
     public ReceiveErrorDto saveData(VideoIntegrityCheckDto videoIntegrityCheckDto, String msgId, String branchId) {
         String msg = this.checkParam(videoIntegrityCheckDto);
@@ -71,10 +71,8 @@ public class VideoIntegrityCheckServiceImpl extends ServiceImpl<VideoIntegrityCh
             northErrorService.saveError(error);
             return ReceiveErrorDto.success();
         }
-        //TODO
-        // final SysDevice device = deviceService.findResult(videoIntegrityCheckDto.getChannelCode(), videoIntegrityCheckDto.getEquipmentCode(), org.getId());
-        final SysDevice device = new SysDevice();
-        if (ObjectUtil.isNull(device)) {
+         final IotDvrChannel channel = dvrChannelService.findChannel(videoIntegrityCheckDto.getChannelCode(), videoIntegrityCheckDto.getEquipmentCode(), org.getId());
+        if (ObjectUtil.isNull(channel)) {
             NorthError error = new NorthError(msgId, branchId, "/video/complete"
                     , videoIntegrityCheckDto, "通道/设备不存在");
             northErrorService.saveError(error);
@@ -90,9 +88,9 @@ public class VideoIntegrityCheckServiceImpl extends ServiceImpl<VideoIntegrityCh
         }
 
         //获取监控主机
-        SysDevice hostDevice = deviceService.findByHostCode(videoIntegrityCheckDto.getEquipmentCode(),SecurityConstants.INNER);
+        IotDevice hostDevice = iIotDeviceService.findByHostCode(videoIntegrityCheckDto.getEquipmentCode(),org.getId());
         if (hostDevice != null) {
-            videoIntegrityCheck.setEquipmentName(hostDevice.getDeviceName());
+            videoIntegrityCheck.setEquipmentName(hostDevice.getEquipmentName());
         }
 
         //获取录像检查天数 用于设置计划存储天数
@@ -110,7 +108,7 @@ public class VideoIntegrityCheckServiceImpl extends ServiceImpl<VideoIntegrityCh
         }
 
         videoIntegrityCheck.setUpdateTime(new Date());
-        videoIntegrityCheck.setDeviceName(device.getDeviceName());
+        videoIntegrityCheck.setDeviceName(channel.getChannelName());
         videoIntegrityCheck.setChannelCode(videoIntegrityCheckDto.getChannelCode());
         videoIntegrityCheck.setChannelName(videoIntegrityCheckDto.getChannelName());
         videoIntegrityCheck.setCheckSpan(JSON.toJSONString(videoIntegrityCheckDto.getCheckSpan()));

soc-modules/soc-modules-mediator/src/main/resources/mapper/IotDeviceMapper.xml

@@ -0,0 +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.IotDeviceMapper">
+
+</mapper>

soc-modules/soc-modules-mediator/src/main/resources/mapper/IotDvrChannelMapper.xml

@@ -0,0 +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.IotDvrChannelMapper">
+
+</mapper>