wvp-pro.git - Gitblit

			@@ -13,6 +13,8 @@
			import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
			import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
			import com.genersoft.iot.vmp.storager.dao.*;
			import com.genersoft.iot.vmp.utils.node.ForestNodeMerger;
			import com.genersoft.iot.vmp.vmanager.bean.DeviceChannelTree;
			import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
			import com.github.pagehelper.PageHelper;
			import com.github.pagehelper.PageInfo;
			@@ -326,6 +328,11 @@
			@Override
			public List<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String query, Boolean hasSubChannel, Boolean online, int start, int limit) {
			return deviceChannelMapper.queryChannelsByDeviceIdWithStartAndLimit(deviceId, null, query, hasSubChannel, online, start, limit);
			}

			@Override
			public List<DeviceChannelTree> tree(String deviceId) {
			return ForestNodeMerger.merge(deviceChannelMapper.tree(deviceId));
			}

			@Override
			@@ -860,8 +867,8 @@
			}

			@Override
			public List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id, boolean enable) {
			return streamProxyMapper.selectForEnableInMediaServer(id, enable);
			public List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id, boolean enable, boolean status) {
			return streamProxyMapper.selectForEnableInMediaServer(id, enable, status);
			}


			@@ -1021,7 +1028,8 @@
			deviceChannel.setParental(1);
			deviceChannel.setParentId(catalog.getParentId());
			deviceChannel.setRegisterWay(1);
			deviceChannel.setCivilCode(sipConfig.getDomain());
			// 行政区划应该是Domain的前八位
			deviceChannel.setCivilCode(sipConfig.getDomain().substring(0, sipConfig.getDomain().length() - 2));
			deviceChannel.setModel("live");
			deviceChannel.setOwner("wvp-pro");
			deviceChannel.setSecrecy("0");