1、用户信息结构调整

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java

@@ -103,7 +103,24 @@ public class AuthController extends CoreBaseController {
         try {
             SessionUser sUser = AuthUtil.getSessionUser();
             LOGGER.info("用户：{}",sUser);
-            return new ResultBean(true,"",sUser);
+            return new ResultBean(true,"",sUser.getUserInfo());
+        } catch (ImppBusiException e) {
+            return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution());
+        }
+    }
+
+    /**
+     *
+     * @return
+     */
+    @GetMapping(value="/get-user")
+    @ApiOperation(value="获取登录用户信息",notes="获取当前登录用户账号详细信息")
+    public ResultBean getUser(){
+        LOGGER.info("获取用户信息...lang:{}",AuthUtil.getSessionAttribute("languageCode"));
+        try {
+            SessionUser sUser = AuthUtil.getSessionUser();
+            LOGGER.info("用户：{}",sUser);
+            return new ResultBean(true,"",sUser.getUser());
         } catch (ImppBusiException e) {
             return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution());
         }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 
 /**
@@ -65,6 +66,12 @@ public class SysUserService implements ISysUserService {
     @Autowired
     private SysFileRepository sysFileRDao;
 
+    @Autowired
+    private SysDepartmentRepository sysDepartmentRDao;
+
+    @Autowired
+    private SysPositionRepository sysPositionRDao;
+
     @Override
     public SessionUser queryUserLogin(String loginName, String password, String languageCode) throws AuthenticationException {
         LOGGER.debug("平台用户 SYS_USER loginName:{} \t password:{} \t languageCode:{}", loginName, password, languageCode);
@@ -388,17 +395,14 @@ public class SysUserService implements ISysUserService {
      * @return
      */
     public void packSysUserDepartment(SessionUser sessionUser, SysUserInfo userInfo){
-        List<SysDepartment> list = null;
         try {
             LOGGER.debug("平台用户 SYS_USER user id :{}", userInfo.getId());
-
-            list = userPermissionDao.findDepartmentByUser(userInfo);
+            userInfo.setDepartmentList(userPermissionDao.findDepartmentByUser(userInfo));
+            userInfo.setDepartment(sysDepartmentRDao.getById(userInfo.getDepartmentId()));
         }catch (Exception e){
             LOGGER.error(" SysUser Peck Department information Error userId : {} Exception Message : {} " ,userInfo.getId(),e.getMessage());
             e.printStackTrace();
         }
-        userInfo.setDepartmentList(list);
-        sessionUser.setUserInfo(userInfo);
     }
 
     /**
@@ -408,17 +412,14 @@ public class SysUserService implements ISysUserService {
      * @return
      */
     public void packSysUserPosition(SessionUser sessionUser, SysUserInfo userInfo){
-        List<SysPosition> list = null;
         try {
             LOGGER.debug("平台用户 SYS_USER user id :{}", userInfo.getId());
-
-            list = userPermissionDao.findPositionByUser(userInfo);
+            userInfo.setPositionList(userPermissionDao.findPositionByUser(userInfo));
+            userInfo.setPosition(sysPositionRDao.getById(userInfo.getPositionId()));
         }catch (Exception e){
             LOGGER.error(" SysUser Peck Position information Error userId : {} Exception Message : {} " ,userInfo.getId(),e.getMessage());
             e.printStackTrace();
         }
-        userInfo.setPositionList(list);
-        sessionUser.setUserInfo(userInfo);
     }
 
     /**
@@ -428,16 +429,25 @@ public class SysUserService implements ISysUserService {
      * @return
      */
     public void packSysUserOrganize(SessionUser sessionUser, SysUserInfo userInfo){
-        SysOrganize organize = null;
         try {
             LOGGER.debug("平台用户 SYS_USER user id :{}", userInfo.getId());
+            userInfo.setOrganize(organizeRDao.getById(userInfo.getOrganizeId()));
+
+            List<SysDepartment> departmentList = userInfo.getDepartmentList();
+            if(departmentList != null && departmentList.size() > 0){
+                Long[] ids = new Long[departmentList.size()];
+                for (int i = 0; i < departmentList.size(); i++) {
+                    ids[i] = departmentList.get(i).getOrganizeId();
+                }
 
-            organize = organizeRDao.getById(userInfo.getOrganizeId());
+                String hqlWhere = CoreHqlPack.packHqlIds("id", ids);
+                List<SysOrganize> organizeList = organizeRDao.findByHqlWhere(hqlWhere);
+
+                userInfo.setOrganizeList(organizeList);
+            }
         }catch (Exception e){
             LOGGER.error(" SysUser Peck Organize information Error userId : {} Exception Message : {} " ,userInfo.getId(),e.getMessage());
         }
-        userInfo.setOrganize(organize);
-        sessionUser.setUserInfo(userInfo);
     }
 
 

modules/i3plus-core-apiservice/src/main/resources/application-dev.properties

@@ -10,11 +10,11 @@ filter.shiro.admin.loginuri = /salogin
 filter.shiro.saadmin.loginuri = /salogin
 
 #用户授权过滤路径
-filter.shiro.user.filteruri = /operate/*
+filter.shiro.user.filteruri = /impp/operate/*
 #用户授权过滤路径
-filter.shiro.admin.filteruri = /adoperate/*
+filter.shiro.admin.filteruri = /impp/adoperate/*
 #用户授权过滤路径
-filter.shiro.saadmin.filteruri = /saoperate/*
+filter.shiro.saadmin.filteruri = /impp/saoperate/*
 
 ################ 跨域提交 ################
 #是否允许前端跨域提交impp.web.cross.hosts
@@ -66,14 +66,14 @@ spring.data.mongodb.port=27017
 ##主数据源，读写
 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource
 impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core_bak?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
 impp.write.datasource.username=i3_dev_core
 impp.write.datasource.password=i3_core_pass
 
 ##辅数据源，只读
 #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
 impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core_bak?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
 impp.read.datasource.username=i3_dev_core
 impp.read.datasource.password=i3_core_pass