Pre Merge pull request !34 from WangXuewen/master

src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java

@@ -120,7 +120,6 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
         List<DeviceChannel> updateChannels = new ArrayList<>();
         HashMap<String, DeviceChannel> channelsInStore = new HashMap<>();
         int result = 0;
-        if (channels != null && !channels.isEmpty()) {
         List<DeviceChannel> channelList = channelMapper.queryChannelsByDeviceDbId(device.getId());
         if (channelList.isEmpty()) {
             for (DeviceChannel channel : channels) {
@@ -200,7 +199,6 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
                 result += channelMapper.batchUpdate(updateChannelList);
             }
         }
-        }
         return result;
     }
 

web/src/router/index.js

@@ -60,7 +60,7 @@ export const constantRoutes = [
     component: Layout,
     redirect: '/live',
     children: [{
-      path: 'live',
+      path: '',
       name: 'Live',
       component: () => import('@/views/live/index'),
       meta: { title: '分屏监控', icon: 'live' }