Commit afd7fc89 authored by KeYong's avatar KeYong

修复bug

parent cdc67082
...@@ -1592,22 +1592,21 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -1592,22 +1592,21 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
if (equipmentSpecificId != null) { if (equipmentSpecificId != null) {
EquipmentSpecific equipmentSpecific = this.baseMapper.selectById(equipmentSpecificId); EquipmentSpecific equipmentSpecific = this.baseMapper.selectById(equipmentSpecificId);
if (!ObjectUtils.isEmpty(equipmentSpecific)) { if (!ObjectUtils.isEmpty(equipmentSpecific)) {
QueryWrapper<VideoEquipmentSpecific> queryWrapper = new QueryWrapper<>(); List<VideoEquipmentSpecific> videoSpecificList = new ArrayList<>();
queryWrapper.eq("equipment_specific_id", equipmentSpecificId); videoIdList.parallelStream().forEach(x -> {
boolean remove = videoEquipmentSpecificService.remove(queryWrapper); VideoEquipmentSpecific videoEquipmentSpecific = new VideoEquipmentSpecific();
if (remove) { videoEquipmentSpecific.setVideoId(x);
List<VideoEquipmentSpecific> videoSpecificList = new ArrayList<>(); videoEquipmentSpecific.setEquipmentSpecificId(equipmentSpecificId);
videoIdList.parallelStream().forEach(x -> { QueryWrapper<VideoEquipmentSpecific> queryWrapper = new QueryWrapper<>();
VideoEquipmentSpecific videoEquipmentSpecific = new VideoEquipmentSpecific(); queryWrapper.eq("equipment_specific_id", equipmentSpecificId);
videoEquipmentSpecific.setVideoId(x); queryWrapper.eq("video_id", x);
videoEquipmentSpecific.setEquipmentSpecificId(equipmentSpecificId); List<VideoEquipmentSpecific> list = videoEquipmentSpecificService.getBaseMapper().selectList(queryWrapper);
if (0 == list.size()) {
videoSpecificList.add(videoEquipmentSpecific); videoSpecificList.add(videoEquipmentSpecific);
}); }
videoEquipmentSpecificService.saveBatch(videoSpecificList); });
return Boolean.TRUE; videoEquipmentSpecificService.saveBatch(videoSpecificList);
} else { return Boolean.TRUE;
throw new RuntimeException("移除设备摄像头绑定关系失败!");
}
} else { } else {
throw new RuntimeException("未获取到此设备!"); throw new RuntimeException("未获取到此设备!");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment