From 51faf3e9c3c613e7fb12db6c88356946f2429e0c Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 12 十二月 2025 17:35:30 +0800
Subject: [PATCH] 调整安防视频页面及逻辑
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java | 75 ++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 14 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java
index baa81b5..037aa65 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java
@@ -17,9 +17,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
-
import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -40,39 +38,88 @@
private CoreDeptService deptService;
/**
- * 鐩戞帶姒傝
- *
+ * 搴撳尯瀹夐槻椤甸潰
* @param type 1.琛ㄧず2.5D楦熺灠鍥鹃〉闈㈤瑙堬紱2.琛ㄧず鍒楄〃棰勮椤甸潰
+ * @param view
* @return
*/
- @RequestMapping("/aerial-video")
- public String aerialVideo(
- @RequestParam(value = "type", required = false) String type,
- ModelMap view) {
+ @RequestMapping("/video-dept")
+ public String videoDept(@RequestParam(value = "type", required = false) String type,
+ ModelMap view) {
+
+ if (StringUtils.isBlank(type)) {
+ type = "2";
+ }
SysUser user = ContextUtil.getLoginUser();
view.put(Constant.MODEL_KEY_LOGIN_USER, user);
String deptId = ContextUtil.subDeptId(user);
- List<Camera> listCamera = secManager.listCamera(deptId, user.getCompanyId());
-
view.put("deptId", deptId);
+
+ List<Camera> listCamera = secManager.listCamera(deptId, user.getCompanyId());
view.put("listCamera", listCamera);
//榛樿鐩戞帶鍒楄〃椤甸潰
- String viewUrl = prefix + "/video-list";
+ String viewUrl = prefix + "/video-list-dept";
- if (StringUtils.isNotBlank( type) && "1".equals(type)) {
+ if("1".equals(type)){
+ viewUrl = prefix + "/video-aerial-dept";
+
+ //楦熺灠鍥�
Dept dept = deptService.getDeptById(deptId);
if (dept != null && StringUtils.isNotEmpty(dept.getImgPath())) {
view.put("backgroundImg", dept.getImgPath());
- viewUrl = prefix + "/video-aerial";
}
-
}
+ if("2".equals(type)){
+ viewUrl = prefix + "/video-list-dept";
+ }
+
return viewUrl;
}
+ /**
+ * 鐩戠瀹夐槻椤甸潰
+ * @param type 1.琛ㄧず2.5D楦熺灠鍥鹃〉闈㈤瑙堬紱2.琛ㄧず鍒楄〃棰勮椤甸潰
+ * @param view
+ * @return
+ */
+ @RequestMapping("/video-super")
+ public String videoSuper(@RequestParam(value = "type", required = false) String type,
+ ModelMap view) {
+
+ if (StringUtils.isBlank(type)) {
+ type = "2";
+ }
+
+ SysUser user = ContextUtil.getLoginUser();
+ view.put(Constant.MODEL_KEY_LOGIN_USER, user);
+
+ String deptId = ContextUtil.subDeptId(user);
+ view.put("deptId", deptId);
+
+ List<Camera> listCamera = secManager.listCamera(deptId, user.getCompanyId());
+ view.put("listCamera", listCamera);
+
+ //榛樿鐩戞帶鍒楄〃椤甸潰
+ String viewUrl = prefix + "/video-list-dept";
+
+ if("1".equals(type)){
+ viewUrl = prefix + "/video-aerial-dept";
+
+ //楦熺灠鍥�
+ Dept dept = deptService.getDeptById(deptId);
+ if (dept != null && StringUtils.isNotEmpty(dept.getImgPath())) {
+ view.put("backgroundImg", dept.getImgPath());
+ }
+ }
+ if("2".equals(type)){
+ viewUrl = prefix + "/video-list-dept";
+ }
+
+ return viewUrl;
+ }
/**
* 楦熺灠鍥鹃〉闈� -- 瑙嗛鎾斁锛岄�氳繃鎾斁鍙傛暟涓嶅悓璺宠浆涓嶅悓椤甸潰鎾斁
--
Gitblit v1.9.3