From c5a0ff2661fe362dddbe88c6a28d19c48c24c39b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 21 十月 2024 20:39:32 +0800 Subject: [PATCH] 最新版本541200007 --- server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java b/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java index 4e07d7d..ba4a587 100644 --- a/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java +++ b/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java @@ -1,8 +1,12 @@ package com.doumee.core.model; +import com.doumee.core.utils.Constants; +import com.doumee.dao.business.model.Company; import com.doumee.dao.system.model.SystemPermission; import com.doumee.dao.system.model.SystemRole; import com.doumee.dao.system.model.SystemUser; +import com.github.xiaoymin.knife4j.core.util.CollectionUtils; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.beans.BeanUtils; @@ -33,12 +37,49 @@ private Integer memberId; private Integer type; + private Integer needChangePwd; private String mobile; + private String sessionId; + + private Date loginDate; + @ApiModelProperty(value = "璐︽埛鏉ユ簮锛�0=鍚庡彴娣诲姞 锛� 2=鍙告満娉ㄥ唽") + private Integer source; private List<String> roles; private List<String> permissions; + private List<Integer> companyIdList; + private Company company; + //jwt鐧诲綍璁剧疆 + public static LoginUserInfo from(SystemUser user, List<SystemRole> roles, List<SystemPermission> permissions,Company company,String sessionId) { + if (user == null) { + return null; + } + // 鎷疯礉鐢ㄦ埛淇℃伅 + LoginUserInfo loginUserInfo = new LoginUserInfo(); + BeanUtils.copyProperties(user, loginUserInfo); + loginUserInfo.setCompany(company); + // 璁剧疆瑙掕壊淇℃伅 + List<String> rs = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(roles)){ + for (SystemRole role : roles) { + rs.add(role.getCode()); + } + } + loginUserInfo.setNeedChangePwd(Constants.formatIntegerNum(user.getNeedChangePwd())); + loginUserInfo.setSessionId(sessionId); + loginUserInfo.setRoles(rs); + // 璁剧疆鏉冮檺淇℃伅 + List<String> pms = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(permissions)){ + for (SystemPermission permission : permissions) { + pms.add(permission.getCode()); + } + } + loginUserInfo.setPermissions(pms); + return loginUserInfo; + } public static LoginUserInfo from(SystemUser user, List<SystemRole> roles, List<SystemPermission> permissions) { if (user == null) { return null; -- Gitblit v1.9.3