From 74a25082f68c00a797a7eca8672cde8edb0dc95f Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 17 三月 2026 15:16:32 +0800
Subject: [PATCH] 修改，gis建模监管页，数据不一致问题

---
 fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java |   63 ++++++++++++++++++++++++++++---
 1 files changed, 56 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 94feed3..ff4e44b 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
@@ -1,15 +1,12 @@
 package com.fzzy.group;
 
+import com.fzzy.common.manager.CommonManager;
 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.SnapRecord;
+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;
@@ -58,7 +55,7 @@
         view.put("bizTag", WebSocketPacket.BIZ_TAG_COMMON);
 
         //鏌ヨ搴撳尯淇℃伅
-        List<Dept> deptList = groupManager.getAllDept(user.getCompanyId());
+        List<Dept> deptList = groupManager.getDeptList();
         view.put("deptAllList", deptList);
 
         return prefix + "/index";
@@ -85,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";
@@ -133,6 +130,48 @@
 
 
     /**
+     * 鎬昏澶у睆椤甸潰
+     * @return
+     */
+    @RequestMapping("/gis_modeling")
+    public String gisModeling(ModelMap view) {
+        SysUser user = ContextUtil.getLoginUser();
+        view.put(Constant.MODEL_KEY_LOGIN_USER, user);
+
+        view.put("deptId", user.getDeptId());
+
+        view.put("sysName", "鏅烘収绮簱璐ㄦ娂鐩戠澶у睆");
+        // 鏍囪
+        Slogan dicSlogan = commonManager.getDicSlogan();
+        view.put("dicSlogan", dicSlogan);
+
+        view.put("bizType", "screen");
+        view.put("bizTag", WebSocketPacket.BIZ_TAG_COMMON);
+
+
+        //鑾峰彇鏂扮枂鍖哄垝淇℃伅
+        List<DicArea> areaList = groupManager.getBankAndChildDept("650000");
+        view.put("areaList", areaList);
+
+        //鑾峰彇鎵�鏈夊簱鍖�
+        List<GroupDeptData> deptList = groupManager.getDeptData(user.getCompanyId());
+        view.put("deptList", deptList);
+        String deptId = (deptList != null && !deptList.isEmpty()) ? deptList.get(0).getDeptId() : null;
+//        view.put("defaultDeptId", deptId != null ? deptId : "00");
+        view.put("defaultDeptId","5372001001");
+        //鑾峰彇鎵�鏈変粨搴�
+        List<GroupDepotData> depotList = groupManager.getDepotData(user.getCompanyId());
+        view.put("depotList", depotList);
+
+        //缁熻淇℃伅
+        GroupGisData groupGisData = groupManager.getGisDataByCompanyId();
+        view.put("gisData", groupGisData);
+
+        return prefix + "/gis_modeling";
+    }
+
+
+    /**
      * 棣栭〉--鑾峰彇鏁伴噺淇℃伅(鍌ㄩ噺缁熻銆佸垎鍝佺搴撳瓨銆佺洃绠℃暟閲忕瓑)
      *
      * @param param
@@ -145,6 +184,16 @@
         return groupManager.getGroupIndexData(param);
     }
 
+    /**
+     * @param param
+     * @return
+     */
+    @RequestMapping("/camera-list")
+    @ResponseBody
+    public PageResponse<List<Camera>> cameraList(@RequestBody IgdsBaseParam param) {
+
+        return groupManager.cameraList(param);
+    }
 
     /**
      * 棣栭〉--搴撳尯淇℃伅缁熻

--
Gitblit v1.9.3