| | |
| | | return oldChannel != null && ( |
| | | !Objects.equals(channel.getName(), oldChannel.getName()) || |
| | | !Objects.equals(channel.getVideoCode(), oldChannel.getVideoCode()) || |
| | | !Objects.equals(channel.getRtspUrl(), oldChannel.getRtspUrl()) // 新增 rtspUrl 判断 |
| | | !Objects.equals(channel.getLiveAddress(), oldChannel.getLiveAddress()) // 新增 rtspUrl 判断 |
| | | ); |
| | | }) |
| | | .forEach(channel -> { |
| | |
| | | if (ardChannelService.checkArdChannelUnique(channel)) { |
| | | ArdCamera camera = this.selectArdCameraById(channel.getDeviceId()); |
| | | if(camera!=null) { |
| | | channel.setRtspUrl(getRtspUrl(camera, channel)); |
| | | channel.setLiveAddress(getRtspUrl(camera, channel)); |
| | | } |
| | | ardChannelService.insertArdChannel(channel); |
| | | } |
| | |
| | | channelList.forEach(channel -> { |
| | | ArdChannel dbChannel = dbMap.get(channel.getChanNo()); |
| | | if (dbChannel == null) { |
| | | channel.setRtspUrl(getRtspUrl(camera,channel)); |
| | | channel.setLiveAddress(getRtspUrl(camera,channel)); |
| | | // 不存在 → 插入 |
| | | ardChannelService.insertArdChannel(channel); |
| | | } else { |