wvp-pro.git - Gitblit

			@@ -2,17 +2,20 @@

			import com.alibaba.fastjson2.JSONObject;
			import com.genersoft.iot.vmp.conf.UserSetting;
			import com.genersoft.iot.vmp.gb28181.bean.*;
			import com.genersoft.iot.vmp.gb28181.bean.Device;
			import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
			import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
			import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
			import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
			import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
			import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
			import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
			import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.ResponseMessageHandler;
			import com.genersoft.iot.vmp.gb28181.utils.Coordtransform;
			import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
			import com.genersoft.iot.vmp.service.IDeviceChannelService;
			import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
			import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
			import com.genersoft.iot.vmp.utils.DateUtil;
			import com.genersoft.iot.vmp.utils.GpsUtil;
			import gov.nist.javax.sip.message.SIPRequest;
			import org.dom4j.DocumentException;
			import org.dom4j.Element;
			@@ -55,6 +58,9 @@

			@Autowired
			private IDeviceChannelService deviceChannelService;

			@Autowired
			private DeferredResultHolder resultHolder;

			@Override
			public void afterPropertiesSet() throws Exception {
			@@ -121,8 +127,15 @@
			if (userSetting.getSavePositionHistory()) {
			storager.insertMobilePosition(mobilePosition);
			}

			storager.updateChannelPosition(deviceChannel);

			String key = DeferredResultHolder.CALLBACK_CMD_MOBILE_POSITION + device.getDeviceId();
			RequestMessage msg = new RequestMessage();
			msg.setKey(key);
			msg.setData(mobilePosition);
			resultHolder.invokeAllResult(msg);

			// 发送redis消息。通知位置信息的变化
			JSONObject jsonObject = new JSONObject();
			jsonObject.put("time", mobilePosition.getTime());

			@@ -102,7 +102,7 @@
			public DeferredResult<MobilePosition> realTimePosition(@PathVariable String deviceId) {
			Device device = storager.queryVideoDevice(deviceId);
			String uuid = UUID.randomUUID().toString();
			String key = DeferredResultHolder.CALLBACK_CMD_MOBILEPOSITION + deviceId;
			String key = DeferredResultHolder.CALLBACK_CMD_MOBILE_POSITION + deviceId;
			try {
			cmder.mobilePostitionQuery(device, event -> {
			RequestMessage msg = new RequestMessage();

	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/MobilePositionResponseMessageHandler.java	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -45,7 +45,7 @@

			public static final String UPLOAD_FILE_CHANNEL = "UPLOAD_FILE_CHANNEL";

			public static final String CALLBACK_CMD_MOBILEPOSITION = "CALLBACK_MOBILEPOSITION";
			public static final String CALLBACK_CMD_MOBILE_POSITION = "CALLBACK_CMD_MOBILE_POSITION";

			public static final String CALLBACK_CMD_PRESETQUERY = "CALLBACK_PRESETQUERY";