|
|
@@ -14,10 +14,7 @@ import org.springframework.context.annotation.Lazy;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Set;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -71,6 +68,7 @@ public class LocalBusDeviceConfigurationService extends BaseService<BusDeviceCon
|
|
|
//更新设备信息
|
|
|
Set<String> deviceIds = deviceConfigurationList.stream()
|
|
|
.map(BusDeviceConfigurationEntity::getDeviceId)
|
|
|
+ .filter(Objects::nonNull)
|
|
|
.collect(Collectors.toSet());
|
|
|
List<BusDeviceEntity> devices = busDeviceService.listByDeviceId(deviceIds);
|
|
|
//更新
|
|
|
@@ -80,6 +78,9 @@ public class LocalBusDeviceConfigurationService extends BaseService<BusDeviceCon
|
|
|
for (BusDeviceConfigurationEntity deviceConfiguration : deviceConfigurationList) {
|
|
|
String deviceId = deviceConfiguration.getDeviceId();
|
|
|
BusDeviceEntity device = deviceMap.get(deviceId);
|
|
|
+ if(device==null){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
device.setRemoteConfigId(deviceConfiguration.getId());
|
|
|
}
|
|
|
busDeviceService.updateBatchById(devices);
|