|
|
|
@ -24,6 +24,7 @@ import com.alibaba.fastjson.JSON; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource; |
|
|
|
import com.elink.esua.epdc.commons.mybatis.enums.EpdcDelFlagEnum; |
|
|
|
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
|
@ -40,6 +41,7 @@ import com.elink.esua.epdc.dao.PartyAuthenticationFailedDao; |
|
|
|
import com.elink.esua.epdc.dao.PartyMembersDao; |
|
|
|
import com.elink.esua.epdc.dao.UserAuthenticateHistoryDao; |
|
|
|
import com.elink.esua.epdc.dao.UserDao; |
|
|
|
import com.elink.esua.epdc.datasources.DataSourceNames; |
|
|
|
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; |
|
|
|
import com.elink.esua.epdc.dto.UserDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO; |
|
|
|
@ -109,6 +111,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
private PartyAuthenticationFailedDao partyAuthenticationFailedDao; |
|
|
|
|
|
|
|
@Override |
|
|
|
@DataSource(value = DataSourceNames.FIRST) |
|
|
|
public PageData<UserDTO> page(Map<String, Object> params) { |
|
|
|
String[] paramKeys = new String[]{"streetId", "communityId", "gridId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"}; |
|
|
|
if (AppUserUtils.isDefaultQuery(params, paramKeys)) { |
|
|
|
@ -137,6 +140,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@DataSource(value = DataSourceNames.FIRST) |
|
|
|
public UserDTO get(String id) { |
|
|
|
UserEntity entity = baseDao.selectById(id); |
|
|
|
UserDTO resultDTO = ConvertUtils.sourceToTarget(entity, UserDTO.class); |
|
|
|
@ -327,6 +331,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@DataSource(value = DataSourceNames.FIRST) |
|
|
|
public Result<EpdcUserInfoResultDTO> getInfoById(String id) { |
|
|
|
|
|
|
|
return new Result<EpdcUserInfoResultDTO>().ok(baseDao.selectOneInfoById(id)); |
|
|
|
@ -377,6 +382,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@DataSource(value = DataSourceNames.FIRST) |
|
|
|
public Result<EpdcUserRegisterAuditMsgResultDTO> getUserRegisterAuditResult(String userId) { |
|
|
|
EpdcUserRegisterAuditMsgResultDTO dto = this.baseDao.getUserRegisterAuditResult(userId); |
|
|
|
return new Result().ok(dto); |
|
|
|
@ -568,6 +574,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@DataSource(value = DataSourceNames.FIRST) |
|
|
|
public Result<String> verifyUserCompleteData(UserDTO userDto) { |
|
|
|
|
|
|
|
String userId = userDto.getId(); |
|
|
|
@ -694,6 +701,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
@DataSource(value = DataSourceNames.FIRST) |
|
|
|
public Result<EpdcResidentDetailResultDTO> residentDetail(String userId) { |
|
|
|
if (StringUtils.isBlank(userId)) { |
|
|
|
return new Result<EpdcResidentDetailResultDTO>().error("用户Id不能为空"); |
|
|
|
@ -753,6 +761,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
@DataSource(value = DataSourceNames.FIRST) |
|
|
|
public Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId) { |
|
|
|
if (StringUtils.isBlank(userId)) { |
|
|
|
return new Result<EpdcPartyMemberDetailDto>().error("用户Id不能为空"); |
|
|
|
@ -772,6 +781,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@DataSource(value = DataSourceNames.FIRST) |
|
|
|
public Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto) { |
|
|
|
// authenticatedFlag是否已认证 0否 1是
|
|
|
|
// partyFlag 是否党员,0否,1是
|
|
|
|
@ -803,11 +813,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@DataSource(value = DataSourceNames.FIRST) |
|
|
|
public Result<Integer> getUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) { |
|
|
|
return new Result<Integer>().ok(baseDao.selectCountUnauthorizedAmount(fromDto)); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@DataSource(value = DataSourceNames.FIRST) |
|
|
|
public Result<EpdcUserRegisterInfoResultDTO> getUserLastSwitchGird(String openId) { |
|
|
|
QueryWrapper<UserEntity> wrapper = new QueryWrapper<>(); |
|
|
|
wrapper.eq(UserFieldConsant.WX_OPEN_ID, openId) |
|
|
|
@ -840,6 +852,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
* @Date 2019/12/7 13:58 |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
@DataSource(value = DataSourceNames.FIRST) |
|
|
|
public Result<UserDTO> queryUserDto(EpdcAppQueryUserInfoFormDTO formDto) { |
|
|
|
UserDTO user = selectUserByWxInfo(formDto.getOpenId(), formDto.getUnionId()); |
|
|
|
return new Result().ok(user); |
|
|
|
@ -854,6 +867,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
* @Date 2019/12/19 15:03 |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
@DataSource(value = DataSourceNames.FIRST) |
|
|
|
public Result<List<EpdcGridUserResultDTO>> listGridUserResultDTO(List<Long> gridIdList) { |
|
|
|
return new Result<List<EpdcGridUserResultDTO>>().ok(baseDao.selectListGridUserResultDTO(gridIdList)); |
|
|
|
} |
|
|
|
|