|
@@ -21,6 +21,7 @@ import com.sooka.common.core.page.TableDataInfo;
|
|
import com.sooka.common.enums.BusinessType;
|
|
import com.sooka.common.enums.BusinessType;
|
|
import com.sooka.common.utils.DateUtils;
|
|
import com.sooka.common.utils.DateUtils;
|
|
import com.sooka.common.utils.StringUtils;
|
|
import com.sooka.common.utils.StringUtils;
|
|
|
|
+import com.sooka.common.utils.http.HttpUtils;
|
|
import com.sooka.common.utils.poi.ExcelUtil;
|
|
import com.sooka.common.utils.poi.ExcelUtil;
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -177,9 +178,12 @@ public class TResCameraController extends BaseController
|
|
String password = tResCamera.getHikPassword();
|
|
String password = tResCamera.getHikPassword();
|
|
|
|
|
|
String url = "http://218.27.1.154:9090/camera2/cn/demo.html?camera_id="+ip+","+port+","+username+","+password+",8000";
|
|
String url = "http://218.27.1.154:9090/camera2/cn/demo.html?camera_id="+ip+","+port+","+username+","+password+",8000";
|
|
|
|
+ // var url = 'http://localhost:8080/test/t/'+jIp+"/"+jPort+"/"+jUsername+"/"+jPassword+"/"+jDeviceport;
|
|
|
|
|
|
System.out.println(url);
|
|
System.out.println(url);
|
|
|
|
|
|
|
|
+ HttpUtils.sendPost(url, null);
|
|
|
|
+
|
|
return BrowserUtil.open_ie(url);
|
|
return BrowserUtil.open_ie(url);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -192,6 +196,7 @@ public class TResCameraController extends BaseController
|
|
{
|
|
{
|
|
|
|
|
|
mmap.put("id", "");
|
|
mmap.put("id", "");
|
|
|
|
+ mmap.put("name", "");
|
|
mmap.put("hikCameraId", "");
|
|
mmap.put("hikCameraId", "");
|
|
mmap.put("ip", "");
|
|
mmap.put("ip", "");
|
|
mmap.put("port", "");
|
|
mmap.put("port", "");
|
|
@@ -202,6 +207,7 @@ public class TResCameraController extends BaseController
|
|
TResCamera tResCamera = tResCameraService.selectTResCameraById(id);
|
|
TResCamera tResCamera = tResCameraService.selectTResCameraById(id);
|
|
if (tResCamera != null) {
|
|
if (tResCamera != null) {
|
|
mmap.put("id", tResCamera.getId());
|
|
mmap.put("id", tResCamera.getId());
|
|
|
|
+ mmap.put("name", tResCamera.getName());
|
|
mmap.put("ip", tResCamera.getHikIp());
|
|
mmap.put("ip", tResCamera.getHikIp());
|
|
mmap.put("port", tResCamera.getHikPort());
|
|
mmap.put("port", tResCamera.getHikPort());
|
|
mmap.put("username", tResCamera.getHikUsername());
|
|
mmap.put("username", tResCamera.getHikUsername());
|