wvp-pro.git - Gitblit

			@@ -226,7 +226,7 @@
			String name = rootElement.getName();
			Element deviceIdElement = rootElement.element("DeviceID");
			String deviceId = deviceIdElement.getText();

			Device device = storager.queryVideoDevice(deviceId);
			if (name.equalsIgnoreCase("Query")) { // 区分是Response——查询响应，还是Query——查询请求
			logger.info("接收到DeviceStatus查询消息");
			FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
			@@ -259,7 +259,7 @@
			deferredResultHolder.invokeResult(msg);

			if (offLineDetector.isOnline(deviceId)) {
			publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
			publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE);
			} else {
			}
			}
			@@ -282,7 +282,7 @@
			//String result = XmlUtil.getText(rootElement, "Result");
			// 回复200 OK
			responseAck(evt);
			if (rootElement.getName().equals("Response")) {//} !XmlUtil.isEmpty(result)) {
			if (rootElement.getName().equals("Response")) {//} !StringUtils.isEmpty(result)) {
			// 此处是对本平台发出DeviceControl指令的应答
			JSONObject json = new JSONObject();
			XmlUtil.node2Json(rootElement, json);
			@@ -299,7 +299,7 @@
			String platformId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(FromHeader.NAME)).getAddress().getURI()).getUser();
			String targetGBId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
			// 远程启动功能
			if (!XmlUtil.isEmpty(XmlUtil.getText(rootElement, "TeleBoot"))) {
			if (!StringUtils.isEmpty(XmlUtil.getText(rootElement, "TeleBoot"))) {
			if (deviceId.equals(targetGBId)) {
			// 远程启动本平台：需要在重新启动程序后先对SipStack解绑
			logger.info("执行远程启动本平台命令");
			@@ -337,7 +337,7 @@
			}
			}
			// 云台/前端控制命令
			if (!XmlUtil.isEmpty(XmlUtil.getText(rootElement,"PTZCmd")) && !deviceId.equals(targetGBId)) {
			if (!StringUtils.isEmpty(XmlUtil.getText(rootElement,"PTZCmd")) && !deviceId.equals(targetGBId)) {
			String cmdString = XmlUtil.getText(rootElement,"PTZCmd");
			Device device = storager.queryVideoDeviceByPlatformIdAndChannelId(platformId, deviceId);
			cmder.fronEndCmd(device, deviceId, cmdString);
			@@ -421,7 +421,7 @@
			String deviceId = XmlUtil.getText(rootElement, "DeviceID");
			// 回复200 OK
			responseAck(evt);
			if (rootElement.getName().equals("Response")) {// !XmlUtil.isEmpty(result)) {
			if (rootElement.getName().equals("Response")) {// !StringUtils.isEmpty(result)) {
			// 此处是对本平台发出DeviceControl指令的应答
			JSONObject json = new JSONObject();
			XmlUtil.node2Json(rootElement, json);
			@@ -452,6 +452,7 @@
			String requestName = rootElement.getName();
			Element deviceIdElement = rootElement.element("DeviceID");
			String deviceId = deviceIdElement.getTextTrim().toString();
			Device device = storager.queryVideoDevice(deviceId);
			if (requestName.equals("Query")) {
			logger.info("接收到DeviceInfo查询消息");
			FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
			@@ -468,7 +469,6 @@
			}
			} else {
			logger.debug("接收到DeviceInfo应答消息");
			Device device = storager.queryVideoDevice(deviceId);
			if (device == null) {
			return;
			}
			@@ -489,7 +489,7 @@
			// 回复200 OK
			responseAck(evt);
			if (offLineDetector.isOnline(deviceId)) {
			publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
			publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE);
			}
			}
			} catch (DocumentException \| SipException \| InvalidArgumentException \| ParseException e) {
			@@ -669,7 +669,7 @@
			// 回复200 OK
			responseAck(evt);
			if (offLineDetector.isOnline(deviceId)) {
			publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
			publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE);
			}
			}
			}
			@@ -718,7 +718,7 @@
			deviceAlarm.setLatitude(0.00);
			}

			if (!XmlUtil.isEmpty(deviceAlarm.getAlarmMethod())) {
			if (!StringUtils.isEmpty(deviceAlarm.getAlarmMethod())) {
			if ( deviceAlarm.getAlarmMethod().equals("4")) {
			MobilePosition mobilePosition = new MobilePosition();
			mobilePosition.setDeviceId(deviceAlarm.getDeviceId());
			@@ -770,15 +770,32 @@
			try {
			Element rootElement = getRootElement(evt);
			String deviceId = XmlUtil.getText(rootElement, "DeviceID");
			// 检查设备是否存在，不存在则不回复
			if (storager.exists(deviceId)) {
			Device device = storager.queryVideoDevice(deviceId);

			// 检查设备是否存在并在线，不在线则设置为在线
			if (device != null ) {
			// 回复200 OK
			responseAck(evt);
			if (offLineDetector.isOnline(deviceId)) {
			publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
			} else {
			}
			publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
			}else{
			logger.warn("收到[ "+deviceId+" ]心跳信息, 但是设备不存在, 回复404");
			Response response = getMessageFactory().createResponse(Response.NOT_FOUND, evt.getRequest());
			getServerTransaction(evt).sendResponse(response);
			}

			// if (device != null && device.getOnline() == 1) {
			//
			// if (offLineDetector.isOnline(deviceId)) {
			// publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
			// } else {
			// }
			// }else {
			//// logger.warn("收到[ "+deviceId+" ]心跳信息, 但是设备" + (device == null? "不存在":"离线") + ", 回复401");
			//// Response response = getMessageFactory().createResponse(Response.UNAUTHORIZED, evt.getRequest());
			//// getServerTransaction(evt).sendResponse(response);
			// publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
			//
			// }
			} catch (ParseException \| SipException \| InvalidArgumentException \| DocumentException e) {
			e.printStackTrace();
			}