From 97dfab42d2736e2e91035aad58ed01fc27ad3a7d Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 06 一月 2026 11:30:30 +0800
Subject: [PATCH] 大屏视频逻辑调整
---
fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java b/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
index 95d9c43..7c11cd8 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
@@ -3,9 +3,7 @@
import com.fzzy.group.manager.GroupManager;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.*;
-import com.fzzy.igds.domain.Dept;
-import com.fzzy.igds.domain.DicArea;
-import com.fzzy.igds.domain.Slogan;
+import com.fzzy.igds.domain.*;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.websocket.WebSocketPacket;
import com.fzzy.common.manager.CommonManager;
@@ -57,8 +55,8 @@
view.put("bizTag", WebSocketPacket.BIZ_TAG_COMMON);
//鏌ヨ搴撳尯淇℃伅
- List<Dept> deptList = groupManager.getAllDept(user.getCompanyId());
- view.put("deptList", deptList);
+ List<Dept> deptList = groupManager.getDeptList();
+ view.put("deptAllList", deptList);
return prefix + "/index";
}
@@ -84,7 +82,7 @@
view.put("bizTag", WebSocketPacket.BIZ_TAG_COMMON);
//鏌ヨ搴撳尯淇℃伅
- List<Dept> deptList = groupManager.getAllDept(user.getCompanyId());
+ List<Dept> deptList = groupManager.getDeptList();
view.put("deptList", deptList);
return prefix + "/video";
@@ -120,7 +118,7 @@
view.put("allArea", allArea);
//鑾峰彇鎵�鏈夊簱鍖�
- List<Dept> deptList = groupManager.getAllDept(user.getCompanyId());
+ List<GroupDeptData> deptList = groupManager.getDeptData(user.getCompanyId());
view.put("deptList", deptList);
//缁熻淇℃伅
@@ -144,6 +142,16 @@
return groupManager.getGroupIndexData(param);
}
+ /**
+ * @param param
+ * @return
+ */
+ @RequestMapping("/camera-list")
+ @ResponseBody
+ public PageResponse<List<Camera>> cameraList(@RequestBody IgdsBaseParam param) {
+
+ return groupManager.cameraList(param);
+ }
/**
* 棣栭〉--搴撳尯淇℃伅缁熻
@@ -158,4 +166,17 @@
return groupManager.indexDeptList(param);
}
+ /**
+ * 棣栭〉--鎶撴媿璺熻釜淇℃伅
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/index-snap-list")
+ @ResponseBody
+ public PageResponse<List<SnapRecord>> indexSnapList(@RequestBody IgdsBaseParam param) {
+
+ return groupManager.indexSnapList(param);
+ }
+
}
--
Gitblit v1.9.3