From 1cd2e610fdbd581f609e002e738b0e5cea97ad40 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 13 二月 2026 14:27:10 +0800
Subject: [PATCH] 报表问题修改
---
fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java | 71 ++++++++++++++++++++++++++++++++---
1 files changed, 64 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 c316d5b..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
@@ -2,16 +2,18 @@
import com.fzzy.group.manager.GroupManager;
import com.fzzy.igds.constant.Constant;
-import com.fzzy.igds.domain.Dept;
-import com.fzzy.igds.domain.DicArea;
-import com.fzzy.igds.domain.Slogan;
+import com.fzzy.igds.data.*;
+import com.fzzy.igds.domain.*;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.websocket.WebSocketPacket;
import com.fzzy.common.manager.CommonManager;
import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
import javax.annotation.Resource;
import java.util.List;
@@ -53,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";
}
@@ -80,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";
@@ -116,10 +118,65 @@
view.put("allArea", allArea);
//鑾峰彇鎵�鏈夊簱鍖�
- List<Dept> deptList = groupManager.getAllDept(user.getCompanyId());
+ List<GroupDeptData> deptList = groupManager.getDeptData(user.getCompanyId());
view.put("deptList", deptList);
+ //缁熻淇℃伅
+ GroupGisData groupGisData = groupManager.getGisData();
+ view.put("gisData", groupGisData);
+
return prefix + "/gis";
}
+
+ /**
+ * 棣栭〉--鑾峰彇鏁伴噺淇℃伅(鍌ㄩ噺缁熻銆佸垎鍝佺搴撳瓨銆佺洃绠℃暟閲忕瓑)
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/index-num")
+ @ResponseBody
+ public PageResponse<GroupIndexData> indexNum(@RequestBody IgdsBaseParam param) {
+
+ return groupManager.getGroupIndexData(param);
+ }
+
+ /**
+ * @param param
+ * @return
+ */
+ @RequestMapping("/camera-list")
+ @ResponseBody
+ public PageResponse<List<Camera>> cameraList(@RequestBody IgdsBaseParam param) {
+
+ return groupManager.cameraList(param);
+ }
+
+ /**
+ * 棣栭〉--搴撳尯淇℃伅缁熻
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/index-dept-list")
+ @ResponseBody
+ public PageResponse<List<GroupDeptData>> indexDeptList(@RequestBody IgdsBaseParam param) {
+
+ 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