From 0d59d664b3b81e9264df6ad513d06b1b2c84c931 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 27 三月 2026 11:43:34 +0800
Subject: [PATCH] 大屏首页储量数量展示，仅展示散粮；抓拍跟踪图片展示业务逻辑调整
---
fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java | 127 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 119 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 c316d5b..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,17 +1,19 @@
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.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,119 @@
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";
}
+
+ /**
+ * 鎬昏澶у睆椤甸潰
+ * @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";
+ }
+
+
+ /**
+ * 棣栭〉--鑾峰彇鏁伴噺淇℃伅(鍌ㄩ噺缁熻銆佸垎鍝佺搴撳瓨銆佺洃绠℃暟閲忕瓑)
+ *
+ * @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);
+// }
+
+ /**
+ * 棣栭〉--鎶撴媿璺熻釜淇℃伅
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/index-snap-list")
+ @ResponseBody
+ public PageResponse<List<EventInfo>> indexSnapList(@RequestBody IgdsBaseParam param) {
+
+ return groupManager.indexEventInfoList(param);
+ }
+
}
--
Gitblit v1.9.3