|
@@ -38,6 +38,7 @@ public class CameraInfoServiceImpl implements CameraInfoService {
|
|
@Override
|
|
@Override
|
|
@DS("master")
|
|
@DS("master")
|
|
public void save(CameraInfo cameraInfo) {
|
|
public void save(CameraInfo cameraInfo) {
|
|
|
|
+
|
|
cameraInfoRepo.save(cameraInfo);
|
|
cameraInfoRepo.save(cameraInfo);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -133,7 +134,8 @@ public class CameraInfoServiceImpl implements CameraInfoService {
|
|
String cameraAccount = cameraInfo.getAccount();
|
|
String cameraAccount = cameraInfo.getAccount();
|
|
String cameraPassword = cameraInfo.getPassword();
|
|
String cameraPassword = cameraInfo.getPassword();
|
|
String camerIp = cameraInfo.getIp();
|
|
String camerIp = cameraInfo.getIp();
|
|
- map.put("wsUrl","ws://" + publicIp + ":10080/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword+"%40"+camerIp);
|
|
|
|
|
|
+ String stream = cameraInfo.getStream();
|
|
|
|
+ map.put("wsUrl","ws://" + publicIp + ":10080/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword+"%40"+camerIp+stream);
|
|
map.put("rtspUrl","rtsp://"+cameraAccount+":"+cameraPassword+"@"+camerIp);
|
|
map.put("rtspUrl","rtsp://"+cameraAccount+":"+cameraPassword+"@"+camerIp);
|
|
map.put("areaParentId",pastureArea.getParent());
|
|
map.put("areaParentId",pastureArea.getParent());
|
|
map.put("text",cameraInfo.getName());
|
|
map.put("text",cameraInfo.getName());
|