elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

用户登录时将网格名称返回前端

dev
yujintao 6 years ago
parent
1b8654b92a
commit
9cf1e76097
4 changed files with 47 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppAuthorizationDTO.java
  2. 1
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
  3. 21
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/UserFieldConsant.java
  4. 33
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

9
esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppAuthorizationDTO.java
View File

@ -1,8 +1,8 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
*
* <p>
* https://www.renren.io
*
* <p>
* 版权所有，侵权必究！
*/
@ -39,5 +39,8 @@ public class EpdcAppAuthorizationDTO implements Serializable {
* 用户状态[AppUserStateEnum]
*/
private String userState;
/**
* 网格名称
*/
private String grid;
}

1
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
View File

@ -179,6 +179,7 @@ public class AppUserServiceImpl implements AppUserService {
authorization.setToken(token);
authorization.setUserId(userId);
authorization.setExpire(expire);
authorization.setGrid(userDto.getGrid());
return new Result().ok(authorization);
} else {
return new Result().error("Login failed");

21
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/UserFieldConsant.java
View File

@ -0,0 +1,21 @@
package com.elink.esua.epdc.constant;
/**
* 用户模块字段常量
*
* @author work@yujt.net.cn
* @date 19/9/25 16:50
*/
public interface UserFieldConsant {
String NICKNAME = "NICKNAME";
String FACE_IMG = "FACE_IMG";
String REAL_NAME = "REAL_NAME";
String GRID = "GRID";
String PARTY_FLAG = "PARTY_FLAG";
String REMARK = "REMARK";
String WX_OPEN_ID = "WX_OPEN_ID";
String WX_UNION_ID = "WX_UNION_ID";
String IDENTITY_NO = "IDENTITY_NO";
String REGISTER_TIME = "REGISTER_TIME";
}

33
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
View File

@ -29,6 +29,7 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.constant.UserFieldConsant;
import com.elink.esua.epdc.dao.UserDao;
import com.elink.esua.epdc.dto.PartyMembersDTO;
import com.elink.esua.epdc.dto.UserDTO;
@ -101,14 +102,14 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
wrapper.eq(StringUtils.isNotBlank(streetId), FieldConstant.STREET_ID, streetId);
wrapper.eq(StringUtils.isNotBlank(communityId), FieldConstant.COMMUNITY_ID, communityId);
wrapper.eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId);
wrapper.eq(StringUtils.isNotBlank(realName), "REAL_NAME", realName);
wrapper.eq(StringUtils.isNotBlank(realName), UserFieldConsant.REAL_NAME, realName);
wrapper.eq(StringUtils.isNotBlank(mobile), FieldConstant.MOBILE, mobile);
wrapper.eq(StringUtils.isNotBlank(identityNo), "IDENTITY_NO", identityNo);
wrapper.ge(StringUtils.isNotBlank(startTime), "REGISTER_TIME", startTime);
wrapper.lt(StringUtils.isNotBlank(endTime), "REGISTER_TIME", endTime);
wrapper.eq(StringUtils.isNotBlank(identityNo), UserFieldConsant.IDENTITY_NO, identityNo);
wrapper.ge(StringUtils.isNotBlank(startTime), UserFieldConsant.REGISTER_TIME, startTime);
wrapper.lt(StringUtils.isNotBlank(endTime), UserFieldConsant.REGISTER_TIME, endTime);
wrapper.eq(StringUtils.isNotBlank(auditState), FieldConstant.STATE, auditState);
wrapper.in(CollUtil.isNotEmpty(deptIdList), FieldConstant.GRID_ID, deptIdList);
wrapper.eq(StringUtils.isNotBlank(isParty), "PARTY_FLAG", isParty);
wrapper.eq(StringUtils.isNotBlank(isParty), UserFieldConsant.PARTY_FLAG, isParty);
return wrapper;
}
@ -174,9 +175,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
public Result<UserDTO> getUserForLoginByOpenId(String openId) {
QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
// 根据openId获取已提交注册的用户信息
wrapper.eq("WX_OPEN_ID", openId)
.select(FieldConstant.ID, "NICKNAME", "FACE_IMG", FieldConstant.MOBILE, "REAL_NAME",
FieldConstant.STATE, FieldConstant.GRID_ID, "PARTY_FLAG", "REMARK")
wrapper.eq(UserFieldConsant.WX_OPEN_ID, openId)
.select(FieldConstant.ID, UserFieldConsant.NICKNAME, UserFieldConsant.FACE_IMG,
FieldConstant.MOBILE, UserFieldConsant.REAL_NAME,
FieldConstant.STATE, UserFieldConsant.GRID, FieldConstant.GRID_ID,
UserFieldConsant.PARTY_FLAG, UserFieldConsant.REMARK)
.orderByDesc(FieldConstant.CREATED_TIME);
List<UserEntity> userEntityList = this.baseDao.selectList(wrapper);
if (CollUtil.isNotEmpty(userEntityList)) {
@ -190,10 +193,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
public Result<UserDTO> getUserInfoByOpenId(String openId) {
QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
// 根据openId查询审核中或审核通过的用户信息
wrapper.eq("WX_OPEN_ID", openId)
wrapper.eq(UserFieldConsant.WX_OPEN_ID, openId)
.ne(FieldConstant.STATE, AppUserAuditStateEnum.AUDIT_FAILURE.value())
.select(FieldConstant.ID, "NICKNAME", "FACE_IMG", FieldConstant.MOBILE, "REAL_NAME",
FieldConstant.STATE, FieldConstant.GRID_ID, "PARTY_FLAG");
.select(FieldConstant.ID, UserFieldConsant.NICKNAME, UserFieldConsant.FACE_IMG,
FieldConstant.MOBILE, UserFieldConsant.REAL_NAME,
FieldConstant.STATE, FieldConstant.GRID_ID, UserFieldConsant.PARTY_FLAG);
UserEntity userEntity = this.baseDao.selectOne(wrapper);
return new Result().ok(ConvertUtils.sourceToTarget(userEntity, UserDTO.class));
}
@ -201,10 +205,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
@Override
public Result<UserDTO> getUserInfoByUnionId(String unionId) {
QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
wrapper.eq("WX_UNION_ID", unionId)
wrapper.eq(UserFieldConsant.WX_UNION_ID, unionId)
.ne(FieldConstant.STATE, AppUserAuditStateEnum.AUDIT_FAILURE.value())
.select(FieldConstant.ID, "NICKNAME", "FACE_IMG", FieldConstant.MOBILE, "REAL_NAME",
FieldConstant.STATE, FieldConstant.GRID_ID, "PARTY_FLAG");
.select(FieldConstant.ID, UserFieldConsant.NICKNAME, UserFieldConsant.FACE_IMG,
FieldConstant.MOBILE, UserFieldConsant.REAL_NAME,
FieldConstant.STATE, FieldConstant.GRID_ID, UserFieldConsant.PARTY_FLAG);
UserEntity userEntity = this.baseDao.selectOne(wrapper);
return new Result().ok(ConvertUtils.sourceToTarget(userEntity, UserDTO.class));
}

Write Preview
Loading…
Cancel
Save