Merge branch 'schedule' of http://dev.xinyingpower.com:8080/git/xymp/backend into schedule

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UserController.java

@@ -4,7 +4,7 @@ import com.shxy.xymanager_common.base.BaseController;
 import com.shxy.xymanager_common.base.ResponseReult;
 import com.shxy.xymanager_common.bean.PermissionDetail;
 import com.shxy.xymanager_common.bean.ServiceStatus;
-import com.shxy.xymanager_common.bean.SysUser;
+import com.shxy.xymanager_common.entity.SysUser;
 import com.shxy.xymanager_common.entity.TbPermission;
 import com.shxy.xymanager_common.model.PermissionModel;
 import com.shxy.xymanager_common.threadlocal.UserContextHolder;

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUser.java

@@ -3,6 +3,7 @@ package com.shxy.xymanager_common.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.shxy.xymanager_common.bean.PermissionDetail;
 import io.swagger.annotations.ApiModelProperty;
 import jdk.nashorn.internal.ir.annotations.Ignore;
 import lombok.Data;
@@ -53,4 +54,7 @@ public class SysUser {
 
     private Date updateTime;
 
+    @ApiModelProperty(value="权限信息")
+    PermissionDetail permission;
+
 }

xymanager_common/src/main/java/com/shxy/xymanager_common/threadlocal/UserContextHolder.java

@@ -1,6 +1,6 @@
 package com.shxy.xymanager_common.threadlocal;
 
-import com.shxy.xymanager_common.bean.SysUser;
+import com.shxy.xymanager_common.entity.SysUser;
 import org.springframework.core.NamedInheritableThreadLocal;
 
 public class UserContextHolder {

xymanager_framework/src/main/java/com/shxy/xymanager_framework/filter/UrlAuthFilter.java

@@ -1,7 +1,7 @@
 package com.shxy.xymanager_framework.filter;
 
 
-import com.shxy.xymanager_common.bean.SysUser;
+import com.shxy.xymanager_common.entity.SysUser;
 import com.shxy.xymanager_common.config.SecurityConfig;
 import com.shxy.xymanager_common.threadlocal.UserContextHolder;
 import com.shxy.xymanager_service.service.SysUserService;

xymanager_framework/src/main/java/com/shxy/xymanager_framework/filter/UserInfoFilter.java

@@ -1,7 +1,7 @@
 package com.shxy.xymanager_framework.filter;
 
-import com.shxy.xymanager_common.bean.SysUser;
 import com.shxy.xymanager_common.config.SecurityConfig;
+import com.shxy.xymanager_common.entity.SysUser;
 import com.shxy.xymanager_common.threadlocal.UserContextHolder;
 import com.shxy.xymanager_common.util.TokenUtil;
 import com.shxy.xymanager_service.service.SysUserService;

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java

@@ -89,8 +89,8 @@ public class SysUserServiceImpl implements SysUserService {
 
 
     @Override
-    public SysUser selectUserById(Integer userId) {
-        return sysUserMapperDao.selectByPrimaryKey(userId);
+    public com.shxy.xymanager_common.entity.SysUser selectUserById(Integer userId) {
+        return sysUserDao.selectByPrimaryKey(userId);
     }
 
     @Override

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java

@@ -8,7 +8,6 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.shxy.xymanager_common.bean.ServiceBody;
-import com.shxy.xymanager_common.bean.SysUser;
 import com.shxy.xymanager_common.constant.Constants;
 import com.shxy.xymanager_common.dto.*;
 import com.shxy.xymanager_common.entity.*;
@@ -777,7 +776,7 @@ public class TerminalServiceImpl implements TerminalService {
         if (BeanUtil.isEmpty(sysUser)) {
             Asserts.fail("用户不存在");
         }
-        Integer uid = sysUser.getUserId();
+        Integer uid = sysUser.getUid();
         if (uid == null) {
             Asserts.fail("用户不存在");
         }

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UserServiceImpl.java

@@ -3,7 +3,7 @@ package com.shxy.xymanager_service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.shxy.xymanager_common.bean.PermissionDetail;
-import com.shxy.xymanager_common.bean.SysUser;
+import com.shxy.xymanager_common.entity.SysUser;
 import com.shxy.xymanager_common.dto.TerminalsAndStatusDto;
 import com.shxy.xymanager_common.entity.*;
 import com.shxy.xymanager_common.enums.CommonStatus;
@@ -60,7 +60,7 @@ public class UserServiceImpl implements UserService {
         if (BeanUtil.isEmpty(sysUser)) {
             Asserts.fail("用户不存在");
         }
-        Integer uid = sysUser.getUserId();
+        Integer uid = sysUser.getUid();
         if (uid == null) {
             Asserts.fail("用户不存在");
         }

xymanager_service/src/main/java/com/shxy/xymanager_service/service/SysUserService.java

@@ -32,7 +32,7 @@ public interface SysUserService {
      * @param userId 用户ID
      * @return 用户对象信息
      */
-     SysUser selectUserById(Integer userId);
+     com.shxy.xymanager_common.entity.SysUser selectUserById(Integer userId);
 
     ServiceBody<String> addUser(SysUserVo vo);