diff --git a/device/pom.xml b/device/pom.xml index 1d045f75..853636c7 100644 --- a/device/pom.xml +++ b/device/pom.xml @@ -34,6 +34,11 @@ 1.0.0 compile + + com.njcn.gather + user + 1.0.0 + diff --git a/user/src/main/java/com/njcn/gather/user/user/controller/SysUserController.java b/user/src/main/java/com/njcn/gather/user/user/controller/SysUserController.java index 5ec2d87c..fb52814c 100644 --- a/user/src/main/java/com/njcn/gather/user/user/controller/SysUserController.java +++ b/user/src/main/java/com/njcn/gather/user/user/controller/SysUserController.java @@ -8,12 +8,12 @@ import com.njcn.common.pojo.constant.SecurityConstants; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.JwtUtil; import com.njcn.common.utils.LogUtil; import com.njcn.gather.user.pojo.constant.UserValidMessage; import com.njcn.gather.user.user.pojo.param.SysUserParam; import com.njcn.gather.user.user.pojo.po.SysUser; import com.njcn.gather.user.user.service.ISysUserService; -import com.njcn.gather.user.user.util.JwtUtil; import com.njcn.web.controller.BaseController; import com.njcn.web.utils.HttpResultUtil; import io.swagger.annotations.Api; diff --git a/user/src/main/java/com/njcn/gather/user/user/service/ISysUserService.java b/user/src/main/java/com/njcn/gather/user/user/service/ISysUserService.java index ea32f020..4cab6ea7 100644 --- a/user/src/main/java/com/njcn/gather/user/user/service/ISysUserService.java +++ b/user/src/main/java/com/njcn/gather/user/user/service/ISysUserService.java @@ -116,4 +116,11 @@ public interface ISysUserService extends IService { */ SysUser getUserByLoginNameAndPassword(String loginName, String password); + /** + * 根据用户ID判断是否是管理员用户 + * @param userId 用户ID + * @return true表示是管理员用户,false表示不是管理员用户 + */ + boolean isAdmin(String userId); + } diff --git a/user/src/main/java/com/njcn/gather/user/user/service/impl/SysUserServiceImpl.java b/user/src/main/java/com/njcn/gather/user/user/service/impl/SysUserServiceImpl.java index 8ba1e61b..02c349e8 100644 --- a/user/src/main/java/com/njcn/gather/user/user/service/impl/SysUserServiceImpl.java +++ b/user/src/main/java/com/njcn/gather/user/user/service/impl/SysUserServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.utils.sm.Sm4Utils; import com.njcn.db.mybatisplus.constant.DbConstant; +import com.njcn.gather.user.pojo.constant.RoleConst; import com.njcn.gather.user.pojo.constant.UserState; import com.njcn.gather.user.pojo.enums.UserResponseEnum; import com.njcn.gather.user.user.mapper.SysUserMapper; @@ -180,6 +181,20 @@ public class SysUserServiceImpl extends ServiceImpl impl .eq(SysUser::getPassword, password).one(); } + @Override + public boolean isAdmin(String userId) { + SysUser user = lambdaQuery().ne(SysUser::getState, UserState.DELETE).eq(SysUser::getId, userId).one(); + if (ObjectUtil.isNotNull(user)) { + List sysRoles = sysUserRoleService.listRoleByUserId(user.getId()); + for (SysRole sysRole : sysRoles) { + if (sysRole.getType().compareTo(RoleConst.TYPE_ADMINISTRATOR) <= 0) { + return true; + } + } + } + return false; + } + /** * 校验重复 *