|
@@ -11,6 +11,7 @@ import java.util.stream.Collectors;
|
|
|
import com.business.slfh.manager.cameramanager.domain.TResCamera;
|
|
|
import com.business.slfh.manager.cameramanager.service.ITResCameraService;
|
|
|
import com.business.slfh.tools.UUID_Tools;
|
|
|
+import com.business.slfh.visualization.event.service.Visualization_Event_Service;
|
|
|
import com.sooka.common.annotation.Log;
|
|
|
import com.sooka.common.core.controller.BaseController;
|
|
|
import com.sooka.common.core.domain.AjaxResult;
|
|
@@ -29,6 +30,8 @@ import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
+
|
|
|
/**
|
|
|
* 摄像头管理Controller
|
|
|
*
|
|
@@ -44,6 +47,9 @@ public class TResCameraController extends BaseController
|
|
|
@Autowired
|
|
|
private ITResCameraService tResCameraService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ Visualization_Event_Service visualization_event_service;
|
|
|
+
|
|
|
//@RequiresPermissions("system:camera:view")
|
|
|
@GetMapping()
|
|
|
public String camera()
|
|
@@ -161,10 +167,20 @@ public class TResCameraController extends BaseController
|
|
|
|
|
|
mmap.put("id", "");
|
|
|
mmap.put("hikCameraId", "");
|
|
|
+ mmap.put("ip", "");
|
|
|
+ mmap.put("port", "");
|
|
|
+ mmap.put("username", "");
|
|
|
+ mmap.put("password", "");
|
|
|
+ mmap.put("deviceport", "");
|
|
|
if (StringUtils.isNotEmpty(id)) {
|
|
|
TResCamera tResCamera = tResCameraService.selectTResCameraById(id);
|
|
|
if (tResCamera != null) {
|
|
|
mmap.put("id", tResCamera.getId());
|
|
|
+ mmap.put("ip", tResCamera.getHikIp());
|
|
|
+ mmap.put("port", tResCamera.getHikPort());
|
|
|
+ mmap.put("username", tResCamera.getHikUsername());
|
|
|
+ mmap.put("password", tResCamera.getHikPassword());
|
|
|
+ mmap.put("deviceport", tResCamera.getHikDeviceport());
|
|
|
if (StringUtils.isNotEmpty(tResCamera.getHikCameraId())) {
|
|
|
String[] ids = tResCamera.getHikCameraId().replaceAll(",",",").split(",");
|
|
|
if (ids.length > 0) {
|
|
@@ -242,4 +258,10 @@ public class TResCameraController extends BaseController
|
|
|
{
|
|
|
return toAjax(tResCameraService.deleteTResCameraByIds(ids));
|
|
|
}
|
|
|
+
|
|
|
+ @RequestMapping("/getRoleMenu")
|
|
|
+ @ResponseBody
|
|
|
+ public int getRoleMenu() {
|
|
|
+ return visualization_event_service.getRoleMenu();
|
|
|
+ }
|
|
|
}
|