录像索引主动获取代码提交

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

@@ -46,6 +46,13 @@ public class MediatorController {
         return AjaxResult.success();
     }
 
+    @ApiOperation("定时任务获取所有的录像完整性数据")
+    @GetMapping({"/mediator/videoDiagnosis"})
+    public AjaxResult videoDiagnosis() {
+      //  this.videoDiagnosisRecordService.invokeVideoDiagnosisForSchedule();
+        return AjaxResult.success();
+    }
+
 
     @ApiOperation("定时任务获取所有的主机基本信息(包括报警主机)")
     @GetMapping({"/mediator/baseDeviceInfo"})

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

@@ -10,9 +10,6 @@ import com.xunmei.common.core.domain.video.MediatorVideoDiagnosisRecord;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.core.utils.JacksonUtils;
 import com.xunmei.mediator.api.alarm.service.IotAlarmDataService;
-import com.xunmei.mediator.api.host.mapper.MediatorCategoryMapper;
-import com.xunmei.mediator.api.host.service.IIotDeviceService;
-import com.xunmei.mediator.api.host.service.IIotDvrChannelService;
 import com.xunmei.mediator.api.server.service.IotServerInfoService;
 import com.xunmei.mediator.api.video.mapper.VideoDiagnosisRecordMapper;
 import com.xunmei.mediator.api.video.service.IVideoDiagnosisLogService;
@@ -34,6 +31,7 @@ import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.iot.IotDeviceInfo;
 import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.system.api.util.LogUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -53,6 +51,7 @@ import java.util.stream.Collectors;
  * @author oygj
  * @since 2024-01-23
  */
+@Slf4j
 @Service
 public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisRecordMapper, MediatorVideoDiagnosisRecord> implements IVideoDiagnosisRecordService, RouterService {
     @Resource
@@ -61,13 +60,6 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
     RemoteOrgService orgService;
     @Resource
     private IVideoDiagnosisLogService videoDiagnosisLogService;
-    @Resource
-    MediatorCategoryMapper categoryMapper;
-    @Resource
-    IIotDeviceService iIotDeviceService;
-    @Resource
-    IIotDvrChannelService dvrChannelService;
-
     @Autowired
     private IotAlarmDataService iotAlarmDataService;
     @Autowired

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/websocket/service/impl/WebsocketServiceImpl.java

@@ -549,6 +549,7 @@ public class WebsocketServiceImpl implements WebsocketService, RouterService {
         String channelType = "digitalChannel".equals(channelInfo.getChannelType()) ? DeviceTypeEnum.NUMBER_CAMERA.getCode() : DeviceTypeEnum.MONITOR_CAMERA.getCode();
         info.setDeviceType(channelType);
         info.setIotToken(serverInfo.getIotCode());
+        info.setDeviceProduct(channelInfo.getProductName());
         info.setDeviceName(channelInfo.getChannelName());
         info.setHostCode(channelInfo.getDeviceName());
         info.setOrgId(serverInfo.getOrgId());
@@ -567,8 +568,6 @@ public class WebsocketServiceImpl implements WebsocketService, RouterService {
             log.error("同步视频类基础信息，获取硬盘信息为空");
         } else {
             iIotDvrDiskService.deleteByToken(token);
-            List<IotDvrDisk> disks = new ArrayList();
-            List<IotDvrDisk> updateList = new ArrayList();
             for (DiskInfo diskInfo : diskInfos) {
                 diskInfo.setTotalMb(convertToMB(diskInfo.getTotalBytes()));
                 diskInfo.setAvailableMb(convertToMB(diskInfo.getAvailableBytes()));

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/websocket/utils/IotServerUtils.java

@@ -31,11 +31,12 @@ public class IotServerUtils {
     }
 
     public static WebsocketResult invokeDownLinkServer(TopicTypeEnums topicTypeEnums,String produceName,String deviceName,String invokeMethod,JSONObject object){
+        Date date = new Date();
         WebsocketResult iotWebsocketResult = new WebsocketResult();
         //Iot消息透穿至主机 固定Topic
         iotWebsocketResult.setTopic(TopicTypeEnums.formatUrl(TopicTypeEnums.PRODUCT_SERVICE_INVOKE, WebSocketConstants.IOT_SERVER,WebSocketConstants.IOT_SERVER_DEVICE));
         iotWebsocketResult.setId(UUID.randomUUID().toString());
-        iotWebsocketResult.setTimestamp(new Date());
+        iotWebsocketResult.setTimestamp(date);
         //iot消息头
         JSONObject iotHeaderObj = new JSONObject();
         iotHeaderObj.put(WebSocketConstants.PRODUCT_NAME,WebSocketConstants.IOT_SERVER);
@@ -49,6 +50,7 @@ public class IotServerUtils {
         WebsocketResult hostData = new WebsocketResult();
         iotPayloadObj.put(WebSocketConstants.ARGS,hostData );
         hostData.setId(UUID.randomUUID().toString());
+        hostData.setTimestamp(date);
         hostData.setTopic(TopicTypeEnums.formatUrl(topicTypeEnums, produceName,deviceName));
         JSONObject hostHeaderObj = new JSONObject();
         hostHeaderObj.put(WebSocketConstants.PRODUCT_NAME,produceName);