视频质量代码提交

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteDeviceService.java

@@ -5,6 +5,8 @@ import com.xunmei.common.core.constant.ServiceNameConstants;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.system.api.domain.SysDevice;
 import com.xunmei.system.api.dto.SysDeviceInnerListDto;
+import com.xunmei.system.api.dto.device.DeviceReceivePageDto;
+import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.system.api.factory.RemoteConfigFallbackFactory;
 import com.xunmei.system.api.factory.RemoteDeviceFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/north/NorthError.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/north/NorthError.java

@@ -1,6 +1,6 @@
-package com.xunmei.mediator.domain.dto.north;
+package com.xunmei.system.api.domain.north;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/north/NorthMsgId.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/north/NorthMsgId.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.north;
+package com.xunmei.system.api.domain.north;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/device/BluetoothDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/device/BluetoothDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.device;
+package com.xunmei.system.api.dto.device;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/device/DeviceData.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/device/DeviceData.java

@@ -3,7 +3,7 @@
 // (powered by FernFlower decompiler)
 //
 
-package com.xunmei.mediator.domain.dto.device;
+package com.xunmei.system.api.dto.device;
 
 import com.xunmei.system.api.domain.SysDevice;
 

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/device/DeviceDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/device/DeviceDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.device;
+package com.xunmei.system.api.dto.device;
 
 import com.xunmei.system.api.domain.SysOrg;
 import lombok.AllArgsConstructor;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/device/DeviceEditDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/device/DeviceEditDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.device;
+package com.xunmei.system.api.dto.device;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/device/DeviceReceivePageDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/device/DeviceReceivePageDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.device;
+package com.xunmei.system.api.dto.device;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/device/DoorDevicePageDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/device/DoorDevicePageDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.device;
+package com.xunmei.system.api.dto.device;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/DefenceareaDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/DefenceareaDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/DefenceareaPageDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/DefenceareaPageDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/DeviceDataDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/DeviceDataDto.java

@@ -1,7 +1,7 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
-import com.alibaba.fastjson.JSON;
-import com.xunmei.mediator.api.service.IRedisCompare;
+import com.alibaba.fastjson2.JSON;
+import com.xunmei.system.api.function.IRedisCompare;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/DoorDeviceDataDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/DoorDeviceDataDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/MqSensorDataDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/MqSensorDataDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/NetworkDeviceDetectionEditDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/NetworkDeviceDetectionEditDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/ProductAttributesEditDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/ProductAttributesEditDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/ProductAttributesListEditDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/ProductAttributesListEditDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/ProductDeviceEditDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/ProductDeviceEditDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/ProductEditDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/ProductEditDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/ProtectionEditDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/ProtectionEditDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/ReceiveErrorDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/ReceiveErrorDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/RuleDataDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/RuleDataDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/SensorDataDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/SensorDataDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/SensorDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/SensorDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/protection/VideoRecorderHardDiskDetectionEditDto.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/VideoRecorderHardDiskDetectionEditDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.domain.dto.protection;
+package com.xunmei.system.api.dto.protection;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteDeviceFallbackFactory.java

@@ -4,6 +4,8 @@ import com.xunmei.common.core.domain.R;
 import com.xunmei.system.api.RemoteDeviceService;
 import com.xunmei.system.api.domain.SysDevice;
 import com.xunmei.system.api.dto.SysDeviceInnerListDto;
+import com.xunmei.system.api.dto.device.DeviceReceivePageDto;
+import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IRedisCompare.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/function/IRedisCompare.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.system.api.function;
 
 
 

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

@@ -2,15 +2,17 @@ package com.xunmei.mediator.api.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.xunmei.mediator.api.service.RabbitMsgIdService;
-import com.xunmei.mediator.domain.dto.device.DeviceReceivePageDto;
-import com.xunmei.mediator.domain.dto.protection.ReceiveErrorDto;
+import com.xunmei.system.api.dto.device.DeviceReceivePageDto;
+import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.mediator.util.LogUtils;
+import com.xunmei.system.api.RemoteDeviceService;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.annotation.Resource;
+
 /**
  * @author jingyuanchao
  * @date 2024/1/25 10:23
@@ -18,10 +20,11 @@ import org.springframework.web.bind.annotation.RequestBody;
 public class DataController {
 
 
-    @Autowired
+    @Resource
     private RabbitMsgIdService rabbitMsgIdService;
 
-
+    @Resource
+    private RemoteDeviceService deviceService;
 
 
 

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

@@ -6,7 +6,7 @@ import com.xunmei.mediator.api.service.IVideoDaysCheckService;
 import com.xunmei.mediator.api.service.IVideoDiagnosisRecordService;
 import com.xunmei.mediator.api.service.IVideoIntegrityCheckService;
 import com.xunmei.mediator.api.service.RabbitMsgIdService;
-import com.xunmei.mediator.domain.dto.protection.ReceiveErrorDto;
+import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.mediator.domain.dto.videoDaysCheck.VideoDaysCheckDto;
 import com.xunmei.mediator.domain.dto.videoDiagnosis.VideoDiagnosisDto;
 import com.xunmei.mediator.domain.dto.videoIntegrityCheck.VideoIntegrityCheckDto;

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

@@ -1,7 +1,7 @@
 package com.xunmei.mediator.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.mediator.domain.dto.north.NorthError;
+import com.xunmei.system.api.domain.north.NorthError;
 
 /**
  * @author jingyuanchao

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

@@ -1,7 +1,7 @@
 package com.xunmei.mediator.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.mediator.domain.dto.north.NorthMsgId;
+import com.xunmei.system.api.domain.north.NorthMsgId;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

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

@@ -2,7 +2,7 @@ package com.xunmei.mediator.api.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.mediator.domain.dto.north.NorthMsgId;
+import com.xunmei.system.api.domain.north.NorthMsgId;
 
 /**
  * <p>

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IVideoDaysCheckService.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.MediatorVideoDaysCheck;
-import com.xunmei.mediator.domain.dto.protection.ReceiveErrorDto;
+import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.mediator.domain.dto.videoDaysCheck.VideoDaysCheckDto;
 
 /**

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IVideoDiagnosisRecordService.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.MediatorVideoDiagnosisRecord;
-import com.xunmei.mediator.domain.dto.protection.ReceiveErrorDto;
+import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.mediator.domain.dto.videoDiagnosis.VideoDiagnosisDto;
 import com.xunmei.system.api.domain.SysDevice;
 

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IVideoIntegrityCheckService.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.MediatorVideoIntegrityCheck;
-import com.xunmei.mediator.domain.dto.protection.ReceiveErrorDto;
+import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.mediator.domain.dto.videoIntegrityCheck.VideoIntegrityCheckDto;
 
 import java.util.Date;

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

@@ -1,7 +1,7 @@
 package com.xunmei.mediator.api.service;
 
 
-import com.xunmei.mediator.domain.dto.north.NorthError;
+import com.xunmei.system.api.domain.north.NorthError;
 
 import java.util.List;
 

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

@@ -3,7 +3,7 @@ package com.xunmei.mediator.api.service;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.rabbitmq.client.Channel;
-import com.xunmei.mediator.domain.dto.north.NorthMsgId;
+import com.xunmei.system.api.domain.north.NorthMsgId;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.amqp.core.Message;

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

@@ -3,7 +3,7 @@ package com.xunmei.mediator.api.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.mediator.api.mapper.NorthErrorMapper;
 import com.xunmei.mediator.api.service.NorthErrorService;
-import com.xunmei.mediator.domain.dto.north.NorthError;
+import com.xunmei.system.api.domain.north.NorthError;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -3,7 +3,7 @@ package com.xunmei.mediator.api.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.mediator.api.mapper.NorthMsgIdMapper;
 import com.xunmei.mediator.api.service.INorthMsgIdService;
-import com.xunmei.mediator.domain.dto.north.NorthMsgId;
+import com.xunmei.system.api.domain.north.NorthMsgId;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -11,8 +11,8 @@ import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.mediator.api.mapper.VideoDaysCheckMapper;
 import com.xunmei.mediator.api.service.IVideoDaysCheckService;
 import com.xunmei.mediator.api.service.NorthErrorService;
-import com.xunmei.mediator.domain.dto.north.NorthError;
-import com.xunmei.mediator.domain.dto.protection.ReceiveErrorDto;
+import com.xunmei.system.api.domain.north.NorthError;
+import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.mediator.domain.dto.videoDaysCheck.VideoDaysCheckDto;
 import com.xunmei.mediator.util.RedisUtil;
 import com.xunmei.system.api.RemoteDeviceService;

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

@@ -2,26 +2,19 @@ package com.xunmei.mediator.api.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
 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.MediatorVideoDiagnosisLog;
 import com.xunmei.common.core.domain.video.MediatorVideoDiagnosisRecord;
-import com.xunmei.common.core.util.BeanHelper;
 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.VideoDiagnosisLogMapper;
 import com.xunmei.mediator.api.mapper.VideoDiagnosisRecordMapper;
-import com.xunmei.mediator.api.service.IMediatorAlarmCodeService;
 import com.xunmei.mediator.api.service.IVideoDiagnosisLogService;
 import com.xunmei.mediator.api.service.IVideoDiagnosisRecordService;
-import com.xunmei.mediator.api.service.NorthErrorService;
-import com.xunmei.mediator.domain.dto.protection.ReceiveErrorDto;
-import com.xunmei.mediator.domain.dto.protection.VideoRecorderHardDiskDetectionEditDto;
+import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.mediator.domain.dto.redis.RedisKey;
 import com.xunmei.mediator.domain.dto.videoDiagnosis.VideoDiagnosisDetailInfoVo;
 import com.xunmei.mediator.domain.dto.videoDiagnosis.VideoDiagnosisDto;
@@ -31,10 +24,7 @@ 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 org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.support.TransactionSynchronizationAdapter;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import javax.annotation.Resource;
 import java.text.ParseException;

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

@@ -13,8 +13,8 @@ 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.domain.dto.north.NorthError;
-import com.xunmei.mediator.domain.dto.protection.ReceiveErrorDto;
+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;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/videoDiagnosis/VideoDiagnosisDto.java

@@ -1,7 +1,7 @@
 package com.xunmei.mediator.domain.dto.videoDiagnosis;
 
 import com.alibaba.fastjson.JSON;
-import com.xunmei.mediator.api.service.IRedisCompare;
+import com.xunmei.system.api.function.IRedisCompare;
 import com.xunmei.mediator.domain.dto.redis.RedisKey;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/videoIntegrityCheck/VideoIntegrityCheckDto.java

@@ -1,7 +1,7 @@
 package com.xunmei.mediator.domain.dto.videoIntegrityCheck;
 
 import com.alibaba.fastjson.JSON;
-import com.xunmei.mediator.api.service.IRedisCompare;
+import com.xunmei.system.api.function.IRedisCompare;
 import com.xunmei.mediator.domain.dto.redis.RedisKey;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/util/CheckDataUtil.java

@@ -1,9 +1,8 @@
 package com.xunmei.mediator.util;
 
-import com.alibaba.fastjson.JSON;
 import com.xunmei.mediator.domain.dto.DataPageDto;
-import com.xunmei.mediator.domain.dto.north.NorthError;
-import com.xunmei.mediator.domain.dto.protection.ReceiveErrorDto;
+import com.xunmei.system.api.domain.north.NorthError;
+import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/util/RedisUtil.java

@@ -1,6 +1,6 @@
 package com.xunmei.mediator.util;
 
-import com.xunmei.mediator.api.service.IRedisCompare;
+import com.xunmei.system.api.function.IRedisCompare;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;