wvp-pro.git - Gitblit

			@@ -17,6 +17,7 @@
			import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
			import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
			import com.genersoft.iot.vmp.utils.DateUtil;
			import com.genersoft.iot.vmp.utils.JsonUtil;
			import com.genersoft.iot.vmp.utils.SystemInfoUtils;
			import com.genersoft.iot.vmp.utils.redis.RedisUtil;
			import org.slf4j.Logger;
			@@ -157,7 +158,10 @@
			}
			for (Object player : players) {
			String key = (String) player;
			StreamInfo streamInfo = (StreamInfo) RedisUtil.get(key);
			StreamInfo streamInfo = JsonUtil.redisJsonToObject(key, StreamInfo.class);
			if (Objects.isNull(streamInfo)) {
			continue;
			}
			streamInfos.put(streamInfo.getDeviceID() + "_" + streamInfo.getChannelId(), streamInfo);
			}
			return streamInfos;
			@@ -173,12 +177,14 @@
			@Override
			public boolean startDownload(StreamInfo stream, String callId) {
			boolean result;
			String key=String.format("%S_%s_%s_%s_%s_%s_%s", VideoManagerConstants.DOWNLOAD_PREFIX,
			userSetting.getServerId(), stream.getMediaServerId(), stream.getDeviceID(), stream.getChannelId(), stream.getStream(), callId);
			if (stream.getProgress() == 1) {
			result = RedisUtil.set(String.format("%S_%s_%s_%s_%s_%s_%s", VideoManagerConstants.DOWNLOAD_PREFIX,
			userSetting.getServerId(), stream.getMediaServerId(), stream.getDeviceID(), stream.getChannelId(), stream.getStream(), callId), stream);
			logger.debug("添加下载缓存==已完成下载=》{}",key);
			result = RedisUtil.set(key, stream);
			}else {
			result = RedisUtil.set(String.format("%S_%s_%s_%s_%s_%s_%s", VideoManagerConstants.DOWNLOAD_PREFIX,
			userSetting.getServerId(), stream.getMediaServerId(), stream.getDeviceID(), stream.getChannelId(), stream.getStream(), callId), stream, 60*60);
			logger.debug("添加下载缓存==未完成下载=》{}",key);
			result = RedisUtil.set(key, stream, 60*60);
			}
			return result;
			}
			@@ -613,7 +619,7 @@
			stream,
			callId
			);
			List<Object> streamInfoScan = RedisUtil.scan(key);
			List<Object> streamInfoScan = RedisUtil.scan2(key);
			if (streamInfoScan.size() > 0) {
			return (StreamInfo) RedisUtil.get((String) streamInfoScan.get(0));
			}else {
			@@ -624,8 +630,7 @@
			@Override
			public ThirdPartyGB queryMemberNoGBId(String queryKey) {
			String key = VideoManagerConstants.WVP_STREAM_GB_ID_PREFIX + queryKey;
			JSONObject jsonObject = (JSONObject)RedisUtil.get(key);
			return jsonObject.to(ThirdPartyGB.class);
			return JsonUtil.redisJsonToObject(key, ThirdPartyGB.class);
			}

			@Override
			@@ -662,9 +667,34 @@
			}

			@Override
			public void removeAllDevice() {
			String scanKey = VideoManagerConstants.DEVICE_PREFIX + userSetting.getServerId() + "_*";
			List<Object> keys = RedisUtil.scan(scanKey);
			for (Object key : keys) {
			RedisUtil.del((String) key);
			}
			}

			@Override
			public List<Device> getAllDevices() {
			String scanKey = VideoManagerConstants.DEVICE_PREFIX + userSetting.getServerId() + "_*";
			List<Device> result = new ArrayList<>();
			List<Object> keys = RedisUtil.scan(scanKey);
			for (Object o : keys) {
			String key = (String) o;
			Device device = JsonUtil.redisJsonToObject(key, Device.class);
			if (Objects.nonNull(device)) { // 只取没有存过得
			result.add(JsonUtil.redisJsonToObject(key, Device.class));
			}
			}

			return result;
			}

			@Override
			public Device getDevice(String deviceId) {
			String key = VideoManagerConstants.DEVICE_PREFIX + userSetting.getServerId() + "_" + deviceId;
			return (Device)RedisUtil.get(key);
			return JsonUtil.redisJsonToObject(key, Device.class);
			}

			@Override
			@@ -676,7 +706,7 @@
			@Override
			public GPSMsgInfo getGpsMsgInfo(String gbId) {
			String key = VideoManagerConstants.WVP_STREAM_GPS_MSG_PREFIX + userSetting.getServerId() + "_" + gbId;
			return (GPSMsgInfo)RedisUtil.get(key);
			return JsonUtil.redisJsonToObject(key, GPSMsgInfo.class);
			}

			@Override
			@@ -686,9 +716,9 @@
			List<Object> keys = RedisUtil.scan(scanKey);
			for (Object o : keys) {
			String key = (String) o;
			GPSMsgInfo gpsMsgInfo = (GPSMsgInfo) RedisUtil.get(key);
			if (!gpsMsgInfo.isStored()) { // 只取没有存过得
			result.add((GPSMsgInfo) RedisUtil.get(key));
			GPSMsgInfo gpsMsgInfo = JsonUtil.redisJsonToObject(key, GPSMsgInfo.class);
			if (Objects.nonNull(gpsMsgInfo) && !gpsMsgInfo.isStored()) { // 只取没有存过得
			result.add(JsonUtil.redisJsonToObject(key, GPSMsgInfo.class));
			}
			}

			@@ -710,7 +740,7 @@
			@Override
			public StreamAuthorityInfo getStreamAuthorityInfo(String app, String stream) {
			String key = VideoManagerConstants.MEDIA_STREAM_AUTHORITY + userSetting.getServerId() + "_" + app+ "_" + stream ;
			return (StreamAuthorityInfo) RedisUtil.get(key);
			return JsonUtil.redisJsonToObject(key, StreamAuthorityInfo.class);

			}

			@@ -721,7 +751,7 @@
			List<Object> keys = RedisUtil.scan(scanKey);
			for (Object o : keys) {
			String key = (String) o;
			result.add((StreamAuthorityInfo) RedisUtil.get(key));
			result.add(JsonUtil.redisJsonToObject(key, StreamAuthorityInfo.class));
			}
			return result;
			}
			@@ -735,7 +765,7 @@
			List<Object> keys = RedisUtil.scan(scanKey);
			if (keys.size() > 0) {
			String key = (String) keys.get(0);
			result = (OnStreamChangedHookParam)RedisUtil.get(key);
			result = JsonUtil.redisJsonToObject(key, OnStreamChangedHookParam.class);
			}

			return result;
			@@ -827,6 +857,7 @@

			@Override
			public void sendAlarmMsg(AlarmChannelMessage msg) {
			// 此消息用于对接第三方服务下级来的消息内容
			String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_ALARM;
			logger.info("[redis发送通知] 报警{}: {}", key, JSON.toJSON(msg));
			RedisUtil.convertAndSend(key, (JSONObject)JSON.toJSON(msg));