From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java |  402 +++++++++++----------------------------------------------
 1 files changed, 80 insertions(+), 322 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
old mode 100644
new mode 100755
index de97c12..8da07a1
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
@@ -1,22 +1,18 @@
 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
 
-import com.genersoft.iot.vmp.common.VideoManagerConstants;
-import com.genersoft.iot.vmp.conf.UserSetup;
+import com.genersoft.iot.vmp.conf.SipConfig;
 import com.genersoft.iot.vmp.gb28181.bean.*;
-import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
 import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
 import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
-import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
 import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
 import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
 import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
 import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
 import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
+import com.genersoft.iot.vmp.service.IDeviceChannelService;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import com.genersoft.iot.vmp.utils.GpsUtil;
-import com.genersoft.iot.vmp.utils.redis.RedisUtil;
+import com.genersoft.iot.vmp.utils.DateUtil;
+import gov.nist.javax.sip.message.SIPRequest;
 import org.dom4j.DocumentException;
 import org.dom4j.Element;
 import org.slf4j.Logger;
@@ -24,7 +20,6 @@
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
 
 import javax.sip.InvalidArgumentException;
 import javax.sip.RequestEvent;
@@ -32,12 +27,9 @@
 import javax.sip.header.FromHeader;
 import javax.sip.message.Response;
 import java.text.ParseException;
-import java.util.Iterator;
 
 /**
- * @description: Notify璇锋眰澶勭悊鍣�
- * @author: lawrencehj
- * @date: 2021骞�1鏈�27鏃�
+ * SIP鍛戒护绫诲瀷锛� NOTIFY璇锋眰,杩欐槸浣滀负涓婄骇鍙戦�佽闃呰姹傚悗锛岃澶囨墠浼氬搷搴旂殑
  */
 @Component
 public class NotifyRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
@@ -46,10 +38,7 @@
     private final static Logger logger = LoggerFactory.getLogger(NotifyRequestProcessor.class);
 
 	@Autowired
-	private UserSetup userSetup;
-
-	@Autowired
-	private IVideoManagerStorager storager;
+	private SipConfig sipConfig;
 
 	@Autowired
 	private IRedisCatchStorage redisCatchStorage;
@@ -57,16 +46,19 @@
 	@Autowired
 	private EventPublisher publisher;
 
-	@Autowired
-	private DeviceOffLineDetector offLineDetector;
-
-	private static final String NOTIFY_CATALOG = "Catalog";
-	private static final String NOTIFY_ALARM = "Alarm";
-	private static final String NOTIFY_MOBILE_POSITION = "MobilePosition";
-	private String method = "NOTIFY";
+	private final String method = "NOTIFY";
 
 	@Autowired
 	private SIPProcessorObserver sipProcessorObserver;
+
+	@Autowired
+	private IDeviceChannelService deviceChannelService;
+
+	@Autowired
+	private NotifyRequestForCatalogProcessor notifyRequestForCatalogProcessor;
+
+	@Autowired
+	private NotifyRequestForMobilePositionProcessor notifyRequestForMobilePositionProcessor;
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
@@ -77,102 +69,70 @@
 	@Override
 	public void process(RequestEvent evt) {
 		try {
+			responseAck((SIPRequest) evt.getRequest(), Response.OK, null, null);
 			Element rootElement = getRootElement(evt);
+			if (rootElement == null) {
+				logger.error("澶勭悊NOTIFY娑堟伅鏃舵湭鑾峰彇鍒版秷鎭綋,{}", evt.getRequest());
+				responseAck((SIPRequest) evt.getRequest(), Response.OK, null, null);
+				return;
+			}
 			String cmd = XmlUtil.getText(rootElement, "CmdType");
 
-			if (NOTIFY_CATALOG.equals(cmd)) {
-				logger.info("鎺ユ敹鍒癈atalog閫氱煡");
-				processNotifyCatalogList(evt);
-			} else if (NOTIFY_ALARM.equals(cmd)) {
-				logger.info("鎺ユ敹鍒癆larm閫氱煡");
+			if (CmdType.CATALOG.equals(cmd)) {
+				notifyRequestForCatalogProcessor.process(evt);
+			} else if (CmdType.ALARM.equals(cmd)) {
 				processNotifyAlarm(evt);
-			} else if (NOTIFY_MOBILE_POSITION.equals(cmd)) {
-				logger.info("鎺ユ敹鍒癕obilePosition閫氱煡");
-				processNotifyMobilePosition(evt);
+			} else if (CmdType.MOBILE_POSITION.equals(cmd)) {
+				notifyRequestForMobilePositionProcessor.process(evt);
 			} else {
 				logger.info("鎺ユ敹鍒版秷鎭細" + cmd);
-				responseAck(evt, Response.OK);
 			}
-		} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
-			e.printStackTrace();
+		} catch (SipException | InvalidArgumentException | ParseException e) {
+			logger.error("鏈鐞嗙殑寮傚父 ", e);
+		} catch (DocumentException e) {
+			throw new RuntimeException(e);
 		}
-	}
 
-	/**
-	 * 澶勭悊MobilePosition绉诲姩浣嶇疆Notify
-	 * 
-	 * @param evt
-	 */
-	private void processNotifyMobilePosition(RequestEvent evt) {
-		try {
-			// 鍥炲 200 OK
-			Element rootElement = getRootElement(evt);
-			MobilePosition mobilePosition = new MobilePosition();
-			Element deviceIdElement = rootElement.element("DeviceID");
-			String deviceId = deviceIdElement.getTextTrim().toString();
-			Device device = storager.queryVideoDevice(deviceId);
-			if (device != null) {
-				if (!StringUtils.isEmpty(device.getName())) {
-					mobilePosition.setDeviceName(device.getName());
-				}
-			}
-			mobilePosition.setDeviceId(XmlUtil.getText(rootElement, "DeviceID"));
-			mobilePosition.setTime(XmlUtil.getText(rootElement, "Time"));
-			mobilePosition.setLongitude(Double.parseDouble(XmlUtil.getText(rootElement, "Longitude")));
-			mobilePosition.setLatitude(Double.parseDouble(XmlUtil.getText(rootElement, "Latitude")));
-			if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Speed"))) {
-				mobilePosition.setSpeed(Double.parseDouble(XmlUtil.getText(rootElement, "Speed")));
-			} else {
-				mobilePosition.setSpeed(0.0);
-			}
-			if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Direction"))) {
-				mobilePosition.setDirection(Double.parseDouble(XmlUtil.getText(rootElement, "Direction")));
-			} else {
-				mobilePosition.setDirection(0.0);
-			}
-			if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Altitude"))) {
-				mobilePosition.setAltitude(Double.parseDouble(XmlUtil.getText(rootElement, "Altitude")));
-			} else {
-				mobilePosition.setAltitude(0.0);
-			}
-			mobilePosition.setReportSource("Mobile Position");
-			BaiduPoint bp = new BaiduPoint();
-			bp = GpsUtil.Wgs84ToBd09(String.valueOf(mobilePosition.getLongitude()), String.valueOf(mobilePosition.getLatitude()));
-			logger.info("鐧惧害鍧愭爣锛�" + bp.getBdLng() + ", " + bp.getBdLat());
-			mobilePosition.setGeodeticSystem("BD-09");
-			mobilePosition.setCnLng(bp.getBdLng());
-			mobilePosition.setCnLat(bp.getBdLat());
-			if (!userSetup.getSavePositionHistory()) {
-				storager.clearMobilePositionsByDeviceId(deviceId);
-			}
-			storager.insertMobilePosition(mobilePosition);
-			responseAck(evt, Response.OK);
-		} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
-			e.printStackTrace();
-		}
 	}
-
 	/***
 	 * 澶勭悊alarm璁惧鎶ヨNotify
-	 * 
-	 * @param evt
 	 */
 	private void processNotifyAlarm(RequestEvent evt) {
+		if (!sipConfig.isAlarm()) {
+			return;
+		}
 		try {
-			Element rootElement = getRootElement(evt);
-			Element deviceIdElement = rootElement.element("DeviceID");
-			String deviceId = deviceIdElement.getText().toString();
+			FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
+			String deviceId = SipUtils.getUserIdFromFromHeader(fromHeader);
 
-			Device device = storager.queryVideoDevice(deviceId);
+			Element rootElement = getRootElement(evt);
+			if (rootElement == null) {
+				logger.error("澶勭悊alarm璁惧鎶ヨNotify鏃舵湭鑾峰彇鍒版秷鎭綋{}", evt.getRequest());
+				return;
+			}
+			Element deviceIdElement = rootElement.element("DeviceID");
+			String channelId = deviceIdElement.getText().toString();
+
+			Device device = redisCatchStorage.getDevice(deviceId);
 			if (device == null) {
+				logger.warn("[ NotifyAlarm ] 鏈壘鍒拌澶囷細{}", deviceId);
 				return;
 			}
 			rootElement = getRootElement(evt, device.getCharset());
+			if (rootElement == null) {
+				logger.warn("[ NotifyAlarm ] content cannot be null, {}", evt.getRequest());
+				return;
+			}
 			DeviceAlarm deviceAlarm = new DeviceAlarm();
 			deviceAlarm.setDeviceId(deviceId);
 			deviceAlarm.setAlarmPriority(XmlUtil.getText(rootElement, "AlarmPriority"));
 			deviceAlarm.setAlarmMethod(XmlUtil.getText(rootElement, "AlarmMethod"));
-			deviceAlarm.setAlarmTime(XmlUtil.getText(rootElement, "AlarmTime"));
+			String alarmTime = XmlUtil.getText(rootElement, "AlarmTime");
+			if (alarmTime == null) {
+				logger.warn("[ NotifyAlarm ] AlarmTime cannot be null");
+				return;
+			}
+			deviceAlarm.setAlarmTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(alarmTime));
 			if (XmlUtil.getText(rootElement, "AlarmDescription") == null) {
 				deviceAlarm.setAlarmDescription("");
 			} else {
@@ -188,245 +148,43 @@
 			} else {
 				deviceAlarm.setLatitude(0.00);
 			}
-
-			if (deviceAlarm.getAlarmMethod().equals("4")) {
+			logger.info("[鏀跺埌Notify-Alarm]锛歿}/{}", device.getDeviceId(), deviceAlarm.getChannelId());
+			if ("4".equals(deviceAlarm.getAlarmMethod())) {
 				MobilePosition mobilePosition = new MobilePosition();
+				mobilePosition.setChannelId(channelId);
+				mobilePosition.setCreateTime(DateUtil.getNow());
 				mobilePosition.setDeviceId(deviceAlarm.getDeviceId());
 				mobilePosition.setTime(deviceAlarm.getAlarmTime());
 				mobilePosition.setLongitude(deviceAlarm.getLongitude());
 				mobilePosition.setLatitude(deviceAlarm.getLatitude());
 				mobilePosition.setReportSource("GPS Alarm");
-				BaiduPoint bp = new BaiduPoint();
-				bp = GpsUtil.Wgs84ToBd09(String.valueOf(mobilePosition.getLongitude()), String.valueOf(mobilePosition.getLatitude()));
-				logger.info("鐧惧害鍧愭爣锛�" + bp.getBdLng() + ", " + bp.getBdLat());
-				mobilePosition.setGeodeticSystem("BD-09");
-				mobilePosition.setCnLng(bp.getBdLng());
-				mobilePosition.setCnLat(bp.getBdLat());
-				if (!userSetup.getSavePositionHistory()) {
-					storager.clearMobilePositionsByDeviceId(deviceId);
-				}
-				storager.insertMobilePosition(mobilePosition);
+
+				// 鏇存柊device channel 鐨勭粡绾害
+				DeviceChannel deviceChannel = new DeviceChannel();
+				deviceChannel.setDeviceId(device.getDeviceId());
+				deviceChannel.setChannelId(channelId);
+				deviceChannel.setLongitude(mobilePosition.getLongitude());
+				deviceChannel.setLatitude(mobilePosition.getLatitude());
+				deviceChannel.setGpsTime(mobilePosition.getTime());
+
+				deviceChannel = deviceChannelService.updateGps(deviceChannel, device);
+
+				mobilePosition.setLongitudeWgs84(deviceChannel.getLongitudeWgs84());
+				mobilePosition.setLatitudeWgs84(deviceChannel.getLatitudeWgs84());
+				mobilePosition.setLongitudeGcj02(deviceChannel.getLongitudeGcj02());
+				mobilePosition.setLatitudeGcj02(deviceChannel.getLatitudeGcj02());
+
+				deviceChannelService.updateChannelGPS(device, deviceChannel, mobilePosition);
 			}
-			// TODO: 闇�瑕佸疄鐜板瓨鍌ㄦ姤璀︿俊鎭�佹姤璀﹀垎绫�
 
 			// 鍥炲200 OK
-			responseAck(evt, Response.OK);
-			if (offLineDetector.isOnline(deviceId)) {
+			if (redisCatchStorage.deviceIsOnline(deviceId)) {
 				publisher.deviceAlarmEventPublish(deviceAlarm);
 			}
-		} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
-			e.printStackTrace();
+		} catch (DocumentException e) {
+			logger.error("鏈鐞嗙殑寮傚父 ", e);
 		}
 	}
 
-	/***
-	 * 澶勭悊catalog璁惧鐩綍鍒楄〃Notify
-	 * 
-	 * @param evt
-	 */
-	private void processNotifyCatalogList(RequestEvent evt) {
-		try {
-			FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
-			String deviceId = SipUtils.getUserIdFromFromHeader(fromHeader);
 
-			Element rootElement = getRootElement(evt);
-			Element deviceIdElement = rootElement.element("DeviceID");
-			String channelId = deviceIdElement.getText();
-			Device device = storager.queryVideoDevice(deviceId);
-			if (device == null) {
-				return;
-			}
-			if (device != null ) {
-				rootElement = getRootElement(evt, device.getCharset());
-			}
-			Element deviceListElement = rootElement.element("DeviceList");
-			if (deviceListElement == null) {
-				return;
-			}
-			Iterator<Element> deviceListIterator = deviceListElement.elementIterator();
-			if (deviceListIterator != null) {
-
-				// 閬嶅巻DeviceList
-				while (deviceListIterator.hasNext()) {
-					Element itemDevice = deviceListIterator.next();
-					Element channelDeviceElement = itemDevice.element("DeviceID");
-					if (channelDeviceElement == null) {
-						continue;
-					}
-					Element eventElement = itemDevice.element("Event");
-					switch (eventElement.getText().toUpperCase()) {
-						case "ON" : // 涓婄嚎
-							logger.info("鏀跺埌鏉ヨ嚜璁惧銆恵}銆戠殑閫氶亾涓婄嚎銆恵}銆戦�氱煡", device.getDeviceId(), channelId);
-							storager.deviceChannelOnline(deviceId, channelId);
-							// 鍥炲200 OK
-							responseAck(evt, Response.OK);
-							break;
-						case "OFF" : // 绂荤嚎
-							logger.info("鏀跺埌鏉ヨ嚜璁惧銆恵}銆戠殑閫氶亾绂荤嚎銆恵}銆戦�氱煡", device.getDeviceId(), channelId);
-							storager.deviceChannelOffline(deviceId, channelId);
-							// 鍥炲200 OK
-							responseAck(evt, Response.OK);
-							break;
-						case "VLOST" : // 瑙嗛涓㈠け
-							logger.info("鏀跺埌鏉ヨ嚜璁惧銆恵}銆戠殑閫氶亾瑙嗛涓㈠け銆恵}銆戦�氱煡", device.getDeviceId(), channelId);
-							storager.deviceChannelOffline(deviceId, channelId);
-							// 鍥炲200 OK
-							responseAck(evt, Response.OK);
-							break;
-						case "DEFECT" : // 鏁呴殰
-							// 鍥炲200 OK
-							responseAck(evt, Response.OK);
-							break;
-						case "ADD" : // 澧炲姞
-							logger.info("鏀跺埌鏉ヨ嚜璁惧銆恵}銆戠殑澧炲姞閫氶亾銆恵}銆戦�氱煡", device.getDeviceId(), channelId);
-							DeviceChannel deviceChannel = channelContentHander(itemDevice, channelId);
-							storager.updateChannel(deviceId, deviceChannel);
-							responseAck(evt, Response.OK);
-							break;
-						case "DEL" : // 鍒犻櫎
-							logger.info("鏀跺埌鏉ヨ嚜璁惧銆恵}銆戠殑鍒犻櫎閫氶亾銆恵}銆戦�氱煡", device.getDeviceId(), channelId);
-							storager.delChannel(deviceId, channelId);
-							responseAck(evt, Response.OK);
-							break;
-						case "UPDATE" : // 鏇存柊
-							logger.info("鏀跺埌鏉ヨ嚜璁惧銆恵}銆戠殑鏇存柊閫氶亾銆恵}銆戦�氱煡", device.getDeviceId(), channelId);
-							DeviceChannel channel = channelContentHander(itemDevice, channelId);
-							storager.updateChannel(deviceId, channel);
-							responseAck(evt, Response.OK);
-							break;
-						default:
-							responseAck(evt, Response.BAD_REQUEST, "event not found");
-
-					}
-
-				}
-
-				// RequestMessage msg = new RequestMessage();
-				// msg.setDeviceId(deviceId);
-				// msg.setType(DeferredResultHolder.CALLBACK_CMD_CATALOG);
-				// msg.setData(device);
-				// deferredResultHolder.invokeResult(msg);
-
-				if (offLineDetector.isOnline(deviceId)) {
-					publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE);
-				}
-			}
-		} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public DeviceChannel channelContentHander(Element itemDevice, String channelId){
-		Element channdelNameElement = itemDevice.element("Name");
-		String channelName = channdelNameElement != null ? channdelNameElement.getTextTrim().toString() : "";
-		Element statusElement = itemDevice.element("Status");
-		String status = statusElement != null ? statusElement.getTextTrim().toString() : "ON";
-		DeviceChannel deviceChannel = new DeviceChannel();
-		deviceChannel.setName(channelName);
-		deviceChannel.setChannelId(channelId);
-		// ONLINE OFFLINE HIKVISION DS-7716N-E4 NVR鐨勫吋瀹规�у鐞�
-		if (status.equals("ON") || status.equals("On") || status.equals("ONLINE")) {
-			deviceChannel.setStatus(1);
-		}
-		if (status.equals("OFF") || status.equals("Off") || status.equals("OFFLINE")) {
-			deviceChannel.setStatus(0);
-		}
-
-		deviceChannel.setManufacture(XmlUtil.getText(itemDevice, "Manufacturer"));
-		deviceChannel.setModel(XmlUtil.getText(itemDevice, "Model"));
-		deviceChannel.setOwner(XmlUtil.getText(itemDevice, "Owner"));
-		deviceChannel.setCivilCode(XmlUtil.getText(itemDevice, "CivilCode"));
-		deviceChannel.setBlock(XmlUtil.getText(itemDevice, "Block"));
-		deviceChannel.setAddress(XmlUtil.getText(itemDevice, "Address"));
-		if (XmlUtil.getText(itemDevice, "Parental") == null
-				|| XmlUtil.getText(itemDevice, "Parental") == "") {
-			deviceChannel.setParental(0);
-		} else {
-			deviceChannel.setParental(Integer.parseInt(XmlUtil.getText(itemDevice, "Parental")));
-		}
-		deviceChannel.setParentId(XmlUtil.getText(itemDevice, "ParentID"));
-		if (XmlUtil.getText(itemDevice, "SafetyWay") == null
-				|| XmlUtil.getText(itemDevice, "SafetyWay") == "") {
-			deviceChannel.setSafetyWay(0);
-		} else {
-			deviceChannel.setSafetyWay(Integer.parseInt(XmlUtil.getText(itemDevice, "SafetyWay")));
-		}
-		if (XmlUtil.getText(itemDevice, "RegisterWay") == null
-				|| XmlUtil.getText(itemDevice, "RegisterWay") == "") {
-			deviceChannel.setRegisterWay(1);
-		} else {
-			deviceChannel.setRegisterWay(Integer.parseInt(XmlUtil.getText(itemDevice, "RegisterWay")));
-		}
-		deviceChannel.setCertNum(XmlUtil.getText(itemDevice, "CertNum"));
-		if (XmlUtil.getText(itemDevice, "Certifiable") == null
-				|| XmlUtil.getText(itemDevice, "Certifiable") == "") {
-			deviceChannel.setCertifiable(0);
-		} else {
-			deviceChannel.setCertifiable(Integer.parseInt(XmlUtil.getText(itemDevice, "Certifiable")));
-		}
-		if (XmlUtil.getText(itemDevice, "ErrCode") == null
-				|| XmlUtil.getText(itemDevice, "ErrCode") == "") {
-			deviceChannel.setErrCode(0);
-		} else {
-			deviceChannel.setErrCode(Integer.parseInt(XmlUtil.getText(itemDevice, "ErrCode")));
-		}
-		deviceChannel.setEndTime(XmlUtil.getText(itemDevice, "EndTime"));
-		deviceChannel.setSecrecy(XmlUtil.getText(itemDevice, "Secrecy"));
-		deviceChannel.setIpAddress(XmlUtil.getText(itemDevice, "IPAddress"));
-		if (XmlUtil.getText(itemDevice, "Port") == null || XmlUtil.getText(itemDevice, "Port") == "") {
-			deviceChannel.setPort(0);
-		} else {
-			deviceChannel.setPort(Integer.parseInt(XmlUtil.getText(itemDevice, "Port")));
-		}
-		deviceChannel.setPassword(XmlUtil.getText(itemDevice, "Password"));
-		if (NumericUtil.isDouble(XmlUtil.getText(itemDevice, "Longitude"))) {
-			deviceChannel.setLongitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude")));
-		} else {
-			deviceChannel.setLongitude(0.00);
-		}
-		if (NumericUtil.isDouble(XmlUtil.getText(itemDevice, "Latitude"))) {
-			deviceChannel.setLatitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Latitude")));
-		} else {
-			deviceChannel.setLatitude(0.00);
-		}
-		if (XmlUtil.getText(itemDevice, "PTZType") == null
-				|| XmlUtil.getText(itemDevice, "PTZType") == "") {
-			deviceChannel.setPTZType(0);
-		} else {
-			deviceChannel.setPTZType(Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType")));
-		}
-		deviceChannel.setHasAudio(true); // 榛樿鍚湁闊抽锛屾挱鏀炬椂鍐嶆鏌ユ槸鍚︽湁闊抽鍙婃槸鍚AC
-		return deviceChannel;
-	}
-
-
-
-	public void setCmder(SIPCommander cmder) {
-	}
-
-	public void setStorager(IVideoManagerStorager storager) {
-		this.storager = storager;
-	}
-
-	public void setPublisher(EventPublisher publisher) {
-		this.publisher = publisher;
-	}
-
-	public void setRedis(RedisUtil redis) {
-	}
-
-	public void setDeferredResultHolder(DeferredResultHolder deferredResultHolder) {
-	}
-
-	public void setOffLineDetector(DeviceOffLineDetector offLineDetector) {
-		this.offLineDetector = offLineDetector;
-	}
-
-	public IRedisCatchStorage getRedisCatchStorage() {
-		return redisCatchStorage;
-	}
-
-	public void setRedisCatchStorage(IRedisCatchStorage redisCatchStorage) {
-		this.redisCatchStorage = redisCatchStorage;
-	}
 }

--
Gitblit v1.8.0