From 9cf1e7609737cce8670ec3bdb2c3be5ede9942ab Mon Sep 17 00:00:00 2001 From: yujintao Date: Wed, 25 Sep 2019 16:58:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E6=97=B6?= =?UTF-8?q?=E5=B0=86=E7=BD=91=E6=A0=BC=E5=90=8D=E7=A7=B0=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/EpdcAppAuthorizationDTO.java | 9 +++-- .../epdc/service/impl/AppUserServiceImpl.java | 1 + .../esua/epdc/constant/UserFieldConsant.java | 21 ++++++++++++ .../epdc/service/impl/UserServiceImpl.java | 33 +++++++++++-------- 4 files changed, 47 insertions(+), 17 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/UserFieldConsant.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppAuthorizationDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppAuthorizationDTO.java index 4526d09b7..368adae3b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppAuthorizationDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppAuthorizationDTO.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ @@ -39,5 +39,8 @@ public class EpdcAppAuthorizationDTO implements Serializable { * 用户状态[AppUserStateEnum] */ private String userState; - + /** + * 网格名称 + */ + private String grid; } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 74c6fdbea..ef6e8cd49 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -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"); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/UserFieldConsant.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/UserFieldConsant.java new file mode 100644 index 000000000..36bf2f875 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/UserFieldConsant.java @@ -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"; +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 79e429815..7cbfd7c46 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -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 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 implem public Result getUserForLoginByOpenId(String openId) { QueryWrapper 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 userEntityList = this.baseDao.selectList(wrapper); if (CollUtil.isNotEmpty(userEntityList)) { @@ -190,10 +193,11 @@ public class UserServiceImpl extends BaseServiceImpl implem public Result getUserInfoByOpenId(String openId) { QueryWrapper 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 implem @Override public Result getUserInfoByUnionId(String unionId) { QueryWrapper 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)); }