增加rtsp的限制

web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java

@@ -228,7 +228,7 @@ public class CameraControlController {
     }
 
     @PostMapping("/irisAdd/start/{id}")
-    @ApiOperation(value = "球机控制 变焦 +")
+    @ApiOperation(value = "球机控制 光圈 +")
     public Result irisAddStart(@PathVariable Integer id) {
         checkLogin(id);
         PtzControlModule.ptzControlIrisAddStart(id,0,1);
@@ -236,7 +236,7 @@ public class CameraControlController {
     }
 
     @PostMapping("/irisAdd/stop/{id}")
-    @ApiOperation(value = "球机控制 变焦+  停止")
+    @ApiOperation(value = "球机控制 光圈+  停止")
     public Result irisAddEnd(@PathVariable Integer id) {
         checkLogin(id);
         PtzControlModule.ptzControlIrisAddEnd(id,0);

web/src/main/java/com/zhehekeji/web/entity/Camera.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Data
 @TableName("`camera`")
@@ -33,4 +34,6 @@ public class Camera {
     private String aperture;
 
     private BigDecimal multiple;
+
+    private LocalDateTime updateTime;
 }

web/src/main/java/com/zhehekeji/web/lib/LoginModule.java

@@ -5,6 +5,7 @@ import com.zhehekeji.common.util.SpringContextUtil;
 import com.zhehekeji.web.lib.NetSDKLib.LLong;
 import com.zhehekeji.web.lib.NetSDKLib.NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY;
 import com.zhehekeji.web.lib.NetSDKLib.NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY;
+import com.zhehekeji.web.lib.common.Res;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
@@ -44,6 +45,7 @@ public class LoginModule {
 			System.out.println("Initialize SDK failed");
 			return false;
 		}
+		//Res res = Res.string();
 
 		//打开日志，可选
 //		NetSDKLib.LOG_SET_PRINT_INFO setLog = new NetSDKLib.LOG_SET_PRINT_INFO();

web/src/main/java/com/zhehekeji/web/lib/PtzControlModule.java

@@ -236,9 +236,17 @@ public class PtzControlModule {
 		NetSDKLib.NET_TIME endTime = new NetSDKLib.NET_TIME();
 		LocalDateTime end = now.minusMinutes(8);
 		endTime.setTime(end.getYear(),end.getMonthValue(),end.getDayOfMonth(),end.getHour(),end.getMinute(),end.getSecond());
+		NetSDKLib.NET_IN_DOWNLOAD_BY_DATA_TYPE download_by_data_type = new NetSDKLib.NET_IN_DOWNLOAD_BY_DATA_TYPE();
+		download_by_data_type.nChannelID = 0;
+		download_by_data_type.stStartTime = startTime;
+		download_by_data_type.stStopTime = endTime;
+		download_by_data_type.szSavedFileName="/qq.mp4";
+		download_by_data_type.emDataType = 3;
+		download_by_data_type.emRecordType = 0;
 
+		NetSDKLib.NET_OUT_DOWNLOAD_BY_DATA_TYPE net_out_download_by_data_type = new NetSDKLib.NET_OUT_DOWNLOAD_BY_DATA_TYPE();
 		//NetSDKLib.LLong l = LoginModule.netsdk.CLIENT_DownloadByTimeEx2(CameraConnMap.getConnId(cameraId),channelId,0,startTime,endTime,"./q2q.mp4",null,null,null,null,3,null);
-		NetSDKLib.LLong l = LoginModule.netsdk.CLIENT_DownloadByTimeEx2(CameraConnMap.getConnId(cameraId),channelId,0,startTime,endTime,"./q2q.mp4",null,null,null,null,3,null);
+		NetSDKLib.LLong l = LoginModule.netsdk.CLIENT_DownloadByDataType(CameraConnMap.getConnId(cameraId),download_by_data_type,net_out_download_by_data_type,2);
 //		NetSDKLib.LLong m_hDownLoadHandle = LoginModule.netsdk.CLIENT_DownloadByTimeEx(CameraConnMap.getConnId(cameraId), channelId, 0,
 //				startTime, endTime, "./qq.dav",
 //				null, null, null, null, null);

web/src/main/java/com/zhehekeji/web/service/CameraService.java

@@ -8,9 +8,12 @@ import com.zhehekeji.web.mapper.CameraMapper;
 import com.zhehekeji.web.mapper.StreetMapper;
 import com.zhehekeji.web.pojo.street.StreetSearch;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 
@@ -23,13 +26,33 @@ public class CameraService {
     @Resource
     private StreetMapper streetMapper;
 
+    @Value("${cameraPassword}")
+    private String cameraPassword;
+    @Value("${cameraPort}")
+    private Integer cameraPort;
+    @Value("${cameraUser}")
+    private String cameraUser;
+
     public Integer add(Camera camera){
+        camera.setUser(cameraUser);
+        camera.setPassword(cameraPassword);
+        camera.setPort(cameraPort);
+        camera.setUpdateTime(LocalDateTime.now());
+        try {
             cameraMapper.insert(camera);
+        }catch (DuplicateKeyException e){
+            Assert.isTrue(false,"rtsp地址已存在");
+        }
+
         return camera.getId();
     }
 
     public void edit(Camera camera){
+        try {
             cameraMapper.updateById(camera);
+        }catch (DuplicateKeyException e){
+            Assert.isTrue(false,"rtsp地址已存在");
+        }
     }
 
     public void del(Integer id){

web/src/main/resources/application-dev.yml

@@ -33,4 +33,7 @@ server:
   port: 8099
 userUrl: http://115.236.65.98:8007
 picPort: 8544
+cameraPassword: admin123
+cameraUser: admin
+cameraPort: 37777
 mediaPath: d:\\media\

web/src/main/resources/application-test.yml

@@ -33,4 +33,7 @@ server:
   port: 8099
 userUrl: http://115.236.65.98:8007
 picPort: 8544
-mediaPath: /home/work/data
+cameraPassword: hzleaper123
+cameraUser: admin
+cameraPort: 37777
+mediaPath: d:\\media\