实体类冲突修改

zd-modules/zd-algorithm/pom.xml

@@ -161,5 +161,13 @@
             <version>2.1.3</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>be.teletask</groupId>
+            <artifactId>onvif-java</artifactId>
+            <version>1.0.2</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/resources/libs/onvif-java-1.0.2.jar</systemPath>
+        </dependency>
     </dependencies>
-</project>
+</project>

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/bean/RecordInfo.java

@@ -10,7 +10,7 @@ import java.util.List;
  * @author: dgs
  * @date:   2020年5月8日 下午2:05:56
  */
-public class RecordInfo {
+public class RecordInfo2 {
 
 	private String deviceId;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/transmit/callback/CheckForAllRecordsThread.java

@@ -1,23 +1,22 @@
 package com.zd.alg.iot.vmp.gb28181.transmit.callback;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import com.zd.alg.iot.vmp.gb28181.bean.RecordInfo;
+import com.zd.alg.iot.vmp.gb28181.bean.RecordInfo2;
 import com.zd.alg.iot.vmp.gb28181.bean.RecordItem;
 import com.zd.alg.iot.vmp.gb28181.transmit.request.impl.MessageRequestProcessor;
 import com.zd.alg.iot.vmp.utils.redis.RedisUtil;
-
 import org.slf4j.Logger;
 
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
 @SuppressWarnings("unchecked")
 public class CheckForAllRecordsThread extends Thread {
 
     private String key;
 
-    private RecordInfo recordInfo;
+    private RecordInfo2 recordInfo;
 
     private RedisUtil redis;
 
@@ -25,7 +24,7 @@ public class CheckForAllRecordsThread extends Thread {
 
     private DeferredResultHolder deferredResultHolder;
 
-    public CheckForAllRecordsThread(String key, RecordInfo recordInfo) {
+    public CheckForAllRecordsThread(String key, RecordInfo2 recordInfo) {
         this.key = key;
         this.recordInfo = recordInfo;
     }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java

@@ -2,28 +2,28 @@ package com.zd.alg.iot.vmp.gb28181.transmit.request.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.zd.alg.AlgorithmApplication;
+import com.zd.alg.iot.vmp.common.StreamInfo;
+import com.zd.alg.iot.vmp.common.VideoManagerConstants;
 import com.zd.alg.iot.vmp.conf.UserSetup;
 import com.zd.alg.iot.vmp.gb28181.bean.*;
+import com.zd.alg.iot.vmp.gb28181.event.DeviceOffLineDetector;
+import com.zd.alg.iot.vmp.gb28181.event.EventPublisher;
 import com.zd.alg.iot.vmp.gb28181.transmit.callback.CheckForAllRecordsThread;
 import com.zd.alg.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
 import com.zd.alg.iot.vmp.gb28181.transmit.callback.RequestMessage;
-import com.zd.alg.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcessor;
-import com.zd.alg.iot.vmp.service.IDeviceAlarmService;
-import com.zd.alg.iot.vmp.storager.IRedisCatchStorage;
-import com.zd.alg.iot.vmp.storager.IVideoManagerStorager;
-import com.zd.alg.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
-import com.zd.alg.iot.vmp.common.StreamInfo;
-import com.zd.alg.iot.vmp.common.VideoManagerConstants;
-import com.zd.alg.iot.vmp.gb28181.event.DeviceOffLineDetector;
-import com.zd.alg.iot.vmp.gb28181.event.EventPublisher;
 import com.zd.alg.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
 import com.zd.alg.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
+import com.zd.alg.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcessor;
 import com.zd.alg.iot.vmp.gb28181.utils.DateUtil;
 import com.zd.alg.iot.vmp.gb28181.utils.NumericUtil;
 import com.zd.alg.iot.vmp.gb28181.utils.XmlUtil;
+import com.zd.alg.iot.vmp.service.IDeviceAlarmService;
+import com.zd.alg.iot.vmp.storager.IRedisCatchStorage;
+import com.zd.alg.iot.vmp.storager.IVideoManagerStorager;
 import com.zd.alg.iot.vmp.utils.GpsUtil;
 import com.zd.alg.iot.vmp.utils.SpringBeanFactory;
 import com.zd.alg.iot.vmp.utils.redis.RedisUtil;
+import com.zd.alg.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
 import gov.nist.javax.sip.SipStackImpl;
 import gov.nist.javax.sip.address.AddressImpl;
 import gov.nist.javax.sip.address.SipUri;
@@ -823,7 +823,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
 			// 回复200 OK
 			responseAck(evt);
 			String uuid = UUID.randomUUID().toString().replace("-", "");
-			RecordInfo recordInfo = new RecordInfo();
+			RecordInfo2 recordInfo = new RecordInfo2();
 			Element rootElement = getRootElement(evt);
 			Element deviceIdElement = rootElement.element("DeviceID");
 			String deviceId = deviceIdElement.getText().toString();

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/vmanager/gb28181/record/GBRecordController.java

@@ -1,9 +1,11 @@
 package com.zd.alg.iot.vmp.vmanager.gb28181.record;
 
-import com.zd.alg.iot.vmp.gb28181.transmit.callback.RequestMessage;
-import com.zd.alg.iot.vmp.gb28181.bean.RecordInfo;
+import com.zd.alg.iot.vmp.gb28181.bean.Device;
+import com.zd.alg.iot.vmp.gb28181.bean.RecordInfo2;
 import com.zd.alg.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.zd.alg.iot.vmp.gb28181.transmit.callback.RequestMessage;
 import com.zd.alg.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.zd.alg.iot.vmp.storager.IVideoManagerStorager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -12,16 +14,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
 
-import com.zd.alg.iot.vmp.gb28181.bean.Device;
-import com.zd.alg.iot.vmp.storager.IVideoManagerStorager;
-
 @Api(tags = "国标录像")
 @CrossOrigin
 @RestController
@@ -47,7 +42,7 @@ public class GBRecordController {
 			@ApiImplicitParam(name = "endTime", value = "结束时间", dataTypeClass = String.class),
 	})
 	@GetMapping("/query/{deviceId}/{channelId}")
-	public DeferredResult<ResponseEntity<RecordInfo>> recordinfo(@PathVariable String deviceId, @PathVariable String channelId, String startTime, String endTime){
+	public DeferredResult<ResponseEntity<RecordInfo2>> recordinfo(@PathVariable String deviceId, @PathVariable String channelId, String startTime, String endTime){
 
 		if (logger.isDebugEnabled()) {
 			logger.debug(String.format("录像信息查询 API调用，deviceId：%s ，startTime：%s， startTime：%s",deviceId, startTime, endTime));
@@ -56,7 +51,7 @@ public class GBRecordController {
 		Device device = storager.queryVideoDevice(deviceId);
 		cmder.recordInfoQuery(device, channelId, startTime, endTime);
 		// 指定超时时间 1分钟30秒
-		DeferredResult<ResponseEntity<RecordInfo>> result = new DeferredResult<ResponseEntity<RecordInfo>>(90*1000L);
+		DeferredResult<ResponseEntity<RecordInfo2>> result = new DeferredResult<>(90*1000L);
 		// 录像查询以channelId作为deviceId查询
 		resultHolder.put(DeferredResultHolder.CALLBACK_CMD_RECORDINFO+channelId, result);
 		result.onTimeout(()->{

zd-modules/zd-camera/pom.xml

@@ -97,7 +97,6 @@
 		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>
 			<artifactId>mybatis-spring-boot-starter</artifactId>
-			<version>2.1.4</version>
 		</dependency>
 
 		<dependency>