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/sys/controller/SysIndexController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java
index aa4999c..8c5bd1e 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java
@@ -1,6 +1,8 @@
package com.fzzy.sys.controller;
+import com.fzzy.common.manager.CommonManager;
import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.data.MainData;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.config.FrameworkConfig;
import com.ruoyi.common.constant.ShiroConstants;
@@ -43,6 +45,8 @@
private SysPasswordService passwordService;
@Resource
private ISysDeptService iSysDeptService;
+ @Resource
+ private CommonManager commonManager;
/**
* 椤甸潰璺敱
@@ -55,8 +59,29 @@
//鑾峰彇鐧诲綍浜轰俊鎭�
SysUser user = getSysUser();
+ if(Constant.USER_TYPE_30.equals(user.getUserType())){
+ //鍗曞簱鍖轰富椤�
+ return "redirect:index?deptId=" + user.getDeptId();
+ }
+ if(Constant.USER_TYPE_10.equals(user.getUserType()) || Constant.USER_TYPE_20.equals(user.getUserType())){
+ //澶у睆椤甸潰
+ return "redirect:group/index";
+ }
//鍗曞簱鍖轰富椤�
return "redirect:index?deptId=" + user.getDeptId();
+ }
+
+ @GetMapping("/home")
+ public String home(ModelMap mmap) {
+
+ //鑾峰彇鐧诲綍浜轰俊鎭�
+ SysUser user = getSysUser();
+
+ //鑾峰彇缁熻淇℃伅
+ MainData mainData = commonManager.getIndexData(user);
+ mmap.put("mainData", mainData);
+
+ return "main";
}
// 绯荤粺棣栭〉
@@ -70,19 +95,19 @@
//鍒ゆ柇鏄惁鏄剧ず搴撳尯閫夋嫨寮圭獥
String showDeptList = "Y";
- SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
- if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
+ if (Constant.USER_TYPE_30.equals(user.getUserType())) {
showDeptList = "N";
}
mmap.put("showDeptList", showDeptList);
+ //鏇存柊缂撳瓨涓敤鎴峰簱鍖篿d
ContextUtil.updateSubDept(user.getLoginName(), deptId);
SysDept dept = iSysDeptService.selectDeptById(Long.valueOf(deptId));
mmap.put("dept", dept);
mmap.put("deptId", deptId);
//鍚庡彴榛樿椤甸潰
- String welcomeUrl = "/group/gis";
+ String welcomeUrl = "/home";
mmap.put("welcomeUrl", welcomeUrl);
// 鏍规嵁鐢ㄦ埛id鍙栧嚭鑿滃崟
@@ -144,6 +169,10 @@
public String lockscreen(ModelMap mmap) {
mmap.put("user", getSysUser());
ServletUtils.getSession().setAttribute(ShiroConstants.LOCK_SCREEN, true);
+ // 鍙栬韩浠戒俊鎭�
+ SysUser user = getSysUser();
+
+ mmap.put("deptId", user.getDeptId());
return "lock";
}
--
Gitblit v1.9.3