diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml index bbdde729a..6a9698ceb 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml @@ -21,6 +21,7 @@ + @@ -28,7 +29,7 @@ id, user_id, name, remark, mobile, email, org_email, main_admin, is_admin, unionid, avatar, jobnumber, is_leader, leader_dept_ids, face_url, user_status, deleted, create_time, - update_time + update_time,online_status user_region_ids diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserDO.java index 0853b5407..bf4f60d1e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserDO.java @@ -77,4 +77,7 @@ public class EnterpriseUserDO implements Serializable { @ApiModelProperty("部门集合(region_ids)") private String userRegionIds; + + @ApiModelProperty("在线状态") + private Integer onlineStatus; } \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/context/LoginUserInfo.java b/coolstore-partner-service/src/main/java/com/cool/store/context/LoginUserInfo.java index 2aca6c41d..5d5c2c74d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/context/LoginUserInfo.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/context/LoginUserInfo.java @@ -30,4 +30,6 @@ public class LoginUserInfo { private String avatar; private SysRoleDO sysRole; + + private Integer onlineStatus; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java index a651443b2..eb2e11280 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java @@ -68,6 +68,7 @@ public class LoginServiceImpl implements LoginService { currentUser.setIsAdmin(enterpriseUser.getIsAdmin()); currentUser.setMobile(enterpriseUser.getMobile()); currentUser.setSysRole(sysRole); + currentUser.setOnlineStatus(enterpriseUser.getOnlineStatus()); currentUser.setAvatar(enterpriseUser.getAvatar()); //生成令牌 RandomNumberGenerator randomNumberGenerator = new SecureRandomNumberGenerator();