|
|
@@ -1,15 +1,14 @@
|
|
|
package com.xunmei.mediator.api.service.impl;
|
|
|
|
|
|
-import cn.hutool.core.map.MapUtil;
|
|
|
import cn.hutool.core.util.NumberUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.fastjson2.JSON;
|
|
|
-import com.alibaba.nacos.common.utils.JacksonUtils;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.xunmei.common.core.constant.CacheConstants;
|
|
|
-import com.xunmei.common.core.domain.iot.domain.*;
|
|
|
+import com.xunmei.common.core.domain.iot.domain.IotDevice;
|
|
|
+import com.xunmei.common.core.domain.iot.domain.IotDvrDisk;
|
|
|
+import com.xunmei.common.core.domain.iot.domain.IotDvrDiskLog;
|
|
|
+import com.xunmei.common.core.domain.iot.domain.IotDvrHardDiskDetection;
|
|
|
import com.xunmei.common.core.enums.CategoryDataEnum;
|
|
|
import com.xunmei.common.core.utils.IDHelper;
|
|
|
import com.xunmei.common.redis.utils.RedisUtils;
|
|
|
@@ -25,13 +24,10 @@ import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
|
|
|
import com.xunmei.system.api.enums.DataType;
|
|
|
import com.xunmei.system.api.util.LogUtils;
|
|
|
import com.xunmei.system.api.vo.SysOrgVO;
|
|
|
-import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
-import org.springframework.transaction.support.TransactionSynchronizationAdapter;
|
|
|
-import org.springframework.transaction.support.TransactionSynchronizationManager;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
|
@@ -173,10 +169,10 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
|
|
|
errors.add(error);
|
|
|
continue;
|
|
|
}
|
|
|
- final List<IotDvrDisk> diskList = listMap.get(hostDeviceOptional.get().getEquipmentCode());
|
|
|
+ List<IotDvrDisk> diskList = listMap.get(hostDeviceOptional.get().getEquipmentCode());
|
|
|
List<DvrdiskDto> diskSpaces = pageDto.getDiskSpace();
|
|
|
- if (ObjectUtil.hasEmpty(diskSpaces, diskList)) {
|
|
|
- return map;
|
|
|
+ if (ObjectUtil.isNull(diskList)) {
|
|
|
+ diskList=new ArrayList<>();
|
|
|
}
|
|
|
for (DvrdiskDto dto : diskSpaces) {
|
|
|
List<String> fields = new ArrayList<>();
|
jingyuanchao