From 6842af1dcf0658a01139451fbee142dfa051f2ec Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 30 三月 2026 15:07:02 +0800
Subject: [PATCH] 大屏首页轮播图改为每个库区十天内最新的三张图片

---
 fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java |   91 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 83 insertions(+), 8 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..c8b1050 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,14 +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.*;
 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;
@@ -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);
 
         //缁熻淇℃伅
@@ -128,6 +126,47 @@
         view.put("gisData", groupGisData);
 
         return prefix + "/gis";
+    }
+
+
+    /**
+     * 鎬昏澶у睆椤甸潰
+     * @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 : "5372001001");
+        //鑾峰彇鎵�鏈変粨搴�
+        List<GroupDepotData> depotList = groupManager.getDepotData(user.getCompanyId());
+        view.put("depotList", depotList);
+
+        //缁熻淇℃伅
+        GroupGisData groupGisData = groupManager.getGisDataByCompanyId();
+        view.put("gisData", groupGisData);
+
+        return prefix + "/gis_modeling";
     }
 
 
@@ -144,6 +183,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 +207,30 @@
         return groupManager.indexDeptList(param);
     }
 
+//    /**
+//     * 棣栭〉--鎶撴媿璺熻釜淇℃伅
+//     *
+//     * @param param
+//     * @return
+//     */
+//    @RequestMapping("/index-snap-list")
+//    @ResponseBody
+//    public PageResponse<List<SnapRecord>> indexSnapList(@RequestBody IgdsBaseParam param) {
+//
+//        return groupManager.indexSnapList(param);
+//    }
+
+    /**
+     * 棣栭〉--鎶撴媿璺熻釜淇℃伅
+     *
+     * @param param
+     * @return
+     */
+    @RequestMapping("/index-snap-list")
+    @ResponseBody
+    public PageResponse<List<EventInfo>> indexSnapList(@RequestBody IgdsBaseParam param) {
+
+        return groupManager.indexEventInfoList(param);
+    }
+
 }

--
Gitblit v1.9.3