From 40671eb79c1805f661fd0e12061dd1b406af9b15 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 17 一月 2026 17:10:58 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss
---
fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
index d90416b..9001e05 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
@@ -6,6 +6,7 @@
import com.fzzy.igds.constant.WarnType;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PageResponse;
+import com.fzzy.igds.domain.Company;
import com.fzzy.igds.domain.EventInfo;
import com.fzzy.security.manager.EventInfoManager;
import com.ruoyi.common.utils.StringUtils;
@@ -25,7 +26,7 @@
@RequestMapping("/security/eventInfo")
public class EventInfoController {
- private static final String prefix = "security/eventInfo";
+ private static final String prefix = "security";
@Resource
private EventInfoManager eventInfoManager;
@@ -42,10 +43,15 @@
*/
@GetMapping
public String getEventInfo(@RequestParam(value = "viewType", required = false) String viewType, Model model) {
-
+ List<Company> companies = commonManager.listCompanyData();
+ String defaultCompany = "" ;
+ if (companies != null && !companies.isEmpty()) {
+ defaultCompany = companies.get(0).getId();
+ }
IgdsBaseParam param = new IgdsBaseParam();
param.setPage(1);
param.setLimit(6);
+ param.setKey(defaultCompany);
Page<EventInfo> events = eventInfoManager.pageData(param);
model.addAttribute("eventInfoList", events.getRecords());
model.addAttribute("currentPage", events.getCurrent());
@@ -60,7 +66,7 @@
//璁惧鏁版嵁
model.addAttribute("cameraList", commonManager.listCameraData());
//搴撳尯鏁版嵁
- model.addAttribute("deptList", commonManager.listDeptData());
+ model.addAttribute("deptList", commonManager.listDeptData(defaultCompany));
//涓氬姟绫诲瀷鏁版嵁
List<Map<String, String>> bizTypeList = new ArrayList<>();
for (WarnType type : WarnType.values()) {
@@ -71,7 +77,7 @@
}
model.addAttribute("bizTypeList", bizTypeList);
//鍏徃鏁版嵁
- model.addAttribute("companyList", commonManager.listCompanyData());
+ model.addAttribute("companyList", companies);
return prefix + "/eventInfo";
}
--
Gitblit v1.9.3