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/security/EventInfoController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 9001e05..afd3d2c 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
@@ -2,13 +2,17 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.common.manager.CommonManager;
+import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RespCodeEnum;
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.Dept;
import com.fzzy.igds.domain.EventInfo;
+import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.security.manager.EventInfoManager;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@@ -43,15 +47,33 @@
*/
@GetMapping
public String getEventInfo(@RequestParam(value = "viewType", required = false) String viewType, Model model) {
+ //鑾峰彇褰撳墠鐧诲綍浜�
+ SysUser user = ContextUtil.getLoginUser();
+ //鑾峰彇鍏徃鏁版嵁
List<Company> companies = commonManager.listCompanyData();
String defaultCompany = "" ;
if (companies != null && !companies.isEmpty()) {
defaultCompany = companies.get(0).getId();
}
+ //鑾峰彇搴撳尯鏁版嵁
+ List<Dept> depts = new ArrayList<>() ;
+ String defaultDeptId = "" ;
+ if (Constant.USER_TYPE_30.equals(user.getUserType())) {
+ depts=commonManager.listDeptData(null);
+ defaultDeptId=user.getDeptId() + "";
+ }else{
+ depts=commonManager.listDeptData(defaultCompany);
+ //鍦ㄩ浣嶆坊鍔犳墍鏈夐�夐」
+ Dept all = new Dept();
+ all.setId("");
+ all.setKqmc("鎵�鏈�");
+ depts.add(0, all);
+ }
IgdsBaseParam param = new IgdsBaseParam();
param.setPage(1);
- param.setLimit(6);
+ param.setLimit(8);
param.setKey(defaultCompany);
+ param.setDeptId(defaultDeptId);
Page<EventInfo> events = eventInfoManager.pageData(param);
model.addAttribute("eventInfoList", events.getRecords());
model.addAttribute("currentPage", events.getCurrent());
@@ -66,7 +88,9 @@
//璁惧鏁版嵁
model.addAttribute("cameraList", commonManager.listCameraData());
//搴撳尯鏁版嵁
- model.addAttribute("deptList", commonManager.listDeptData(defaultCompany));
+ model.addAttribute("deptList", depts);
+ model.addAttribute("defaultDeptId", defaultDeptId);
+
//涓氬姟绫诲瀷鏁版嵁
List<Map<String, String>> bizTypeList = new ArrayList<>();
for (WarnType type : WarnType.values()) {
@@ -78,6 +102,7 @@
model.addAttribute("bizTypeList", bizTypeList);
//鍏徃鏁版嵁
model.addAttribute("companyList", companies);
+ model.addAttribute("defaultCompany", defaultCompany);
return prefix + "/eventInfo";
}
--
Gitblit v1.9.3