北向代码提交

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

@@ -2,7 +2,6 @@ package com.xunmei.mediator.websocket.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceArea;
@@ -32,7 +31,6 @@ import com.xunmei.mediator.websocket.dto.dvs.DiskInfo;
 import com.xunmei.mediator.websocket.dto.dvs.DvsBaseInfo;
 import com.xunmei.mediator.websocket.dto.dvs.DvsInfo;
 import com.xunmei.mediator.websocket.enums.ProductEnums;
-import com.xunmei.mediator.websocket.holder.WebSocketSessionHolder;
 import com.xunmei.mediator.websocket.redis.WebsocketPublisher;
 import com.xunmei.mediator.websocket.service.RouterService;
 import com.xunmei.mediator.websocket.service.WebsocketService;
@@ -51,7 +49,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.*;
@@ -578,20 +575,19 @@ public class WebsocketServiceImpl implements WebsocketService, RouterService {
     private void processDiskDevices(List<DiskInfo> diskInfos, IotServerInfo serverInfo, String token, List<IotDvrDisk> addDiskList, List<IotDvrDisk> updateDiskList) {
         if (ObjectUtil.isEmpty(diskInfos)) {
             log.error("同步视频类基础信息，获取硬盘信息为空");
-        } else {
-            iIotDvrDiskService.deleteByToken(token);
-            for (DiskInfo diskInfo : diskInfos) {
-                diskInfo.setTotalMb(convertToMB(diskInfo.getTotalBytes()));
-                diskInfo.setAvailableMb(convertToMB(diskInfo.getAvailableBytes()));
-                diskInfo.setFreeMb(convertToMB(diskInfo.getFreeBytes()));
-                IotDvrDisk info = iIotDvrDiskService.selectByTokenAndDiskIndex(token, diskInfo.getDeviceName(), diskInfo.getDiskSerialNum());
-                if (info == null) {
-                    info = createDiskInfo(diskInfo, serverInfo);
-                    addDiskList.add(info);
-                } else {
-                    dealDiskDevice(diskInfo, info, serverInfo);
-                    updateDiskList.add(info);
-                }
+            return;
+        }
+        for (DiskInfo diskInfo : diskInfos) {
+            diskInfo.setTotalMb(convertToMB(diskInfo.getTotalBytes()));
+            diskInfo.setAvailableMb(convertToMB(diskInfo.getAvailableBytes()));
+            diskInfo.setFreeMb(convertToMB(diskInfo.getFreeBytes()));
+            IotDvrDisk info = iIotDvrDiskService.selectByTokenAndDiskIndex(token, diskInfo.getDeviceName(), diskInfo.getDiskSerialNum());
+            if (info == null) {
+                info = createDiskInfo(diskInfo, serverInfo);
+                addDiskList.add(info);
+            } else {
+                dealDiskDevice(diskInfo, info, serverInfo);
+                updateDiskList.add(info);
             }
         }
     }
@@ -620,6 +616,7 @@ public class WebsocketServiceImpl implements WebsocketService, RouterService {
     private IotDvrDisk createDiskInfo(DiskInfo diskInfo, IotServerInfo serverInfo) {
         IotDvrDisk info = new IotDvrDisk();
         info.setDeleted(0);
+        info.setSource(1);
         info.setHostCode(diskInfo.getDeviceName());
         info.setOrgId(serverInfo.getOrgId());
         info.setOrgName(serverInfo.getOrgName());