From f9ddeb748da46dc7341b7608f64435695601f4b6 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 01 四月 2026 11:31:05 +0800
Subject: [PATCH] 登录页,对密码进行加密

---
 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 insertions(+), 4 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 9717fe1..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";
     }
 
@@ -178,7 +207,7 @@
     @GetMapping("/system/main")
     public String main(ModelMap mmap) {
         mmap.put("version", FrameworkConfig.getVersion());
-        return "main_v2";
+        return "main_v1";
     }
 
     // content-main class

--
Gitblit v1.9.3