|
@ -21,16 +21,18 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil; |
|
|
import cn.afterturn.easypoi.excel.entity.ImportParams; |
|
|
import cn.afterturn.easypoi.excel.entity.ImportParams; |
|
|
import cn.hutool.core.collection.CollUtil; |
|
|
import cn.hutool.core.collection.CollUtil; |
|
|
import com.alibaba.fastjson.JSON; |
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
|
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; |
|
|
import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource; |
|
|
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.enums.EpdcDelFlagEnum; |
|
|
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; |
|
|
|
|
|
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils; |
|
|
import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils; |
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
import com.elink.esua.epdc.commons.tools.constant.NumConstant; |
|
|
import com.elink.esua.epdc.commons.tools.constant.NumConstant; |
|
|
|
|
|
import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant; |
|
|
import com.elink.esua.epdc.commons.tools.constant.StrConstant; |
|
|
import com.elink.esua.epdc.commons.tools.constant.StrConstant; |
|
|
import com.elink.esua.epdc.commons.tools.enums.UserAuthTypeEnum; |
|
|
import com.elink.esua.epdc.commons.tools.enums.UserAuthTypeEnum; |
|
|
import com.elink.esua.epdc.commons.tools.enums.UserSexEnum; |
|
|
import com.elink.esua.epdc.commons.tools.enums.UserSexEnum; |
|
@ -49,22 +51,9 @@ import com.elink.esua.epdc.dao.UserAuthenticateHistoryDao; |
|
|
import com.elink.esua.epdc.dao.UserDao; |
|
|
import com.elink.esua.epdc.dao.UserDao; |
|
|
import com.elink.esua.epdc.datasources.DataSourceNames; |
|
|
import com.elink.esua.epdc.datasources.DataSourceNames; |
|
|
import com.elink.esua.epdc.dto.*; |
|
|
import com.elink.esua.epdc.dto.*; |
|
|
import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.epdc.result.*; |
|
|
|
|
|
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; |
|
|
|
|
|
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; |
|
|
|
|
|
import com.elink.esua.epdc.commons.tools.utils.Result; |
|
|
|
|
|
import com.elink.esua.epdc.constant.AuthenticatedConsant; |
|
|
|
|
|
import com.elink.esua.epdc.constant.UserFieldConsant; |
|
|
|
|
|
import com.elink.esua.epdc.dao.*; |
|
|
|
|
|
import com.elink.esua.epdc.dto.CachingUserInfoDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.UserDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.UserGridRelationDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO; |
|
|
import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO; |
|
|
import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO; |
|
|
import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO; |
|
|
import com.elink.esua.epdc.dto.epdc.form.*; |
|
|
import com.elink.esua.epdc.dto.epdc.form.*; |
|
|
import com.elink.esua.epdc.dto.epdc.result.*; |
|
|
import com.elink.esua.epdc.dto.epdc.result.*; |
|
|
import com.elink.esua.epdc.entity.*; |
|
|
import com.elink.esua.epdc.entity.*; |
|
@ -75,15 +64,11 @@ import com.elink.esua.epdc.excel.UserExcel; |
|
|
import com.elink.esua.epdc.exception.UserModuleErrorCode; |
|
|
import com.elink.esua.epdc.exception.UserModuleErrorCode; |
|
|
import com.elink.esua.epdc.feign.AdminFeignClient; |
|
|
import com.elink.esua.epdc.feign.AdminFeignClient; |
|
|
import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; |
|
|
import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; |
|
|
|
|
|
import com.elink.esua.epdc.rocketmq.dto.UserModifyDTO; |
|
|
|
|
|
import com.elink.esua.epdc.rocketmq.producer.UserModifyProducer; |
|
|
import com.elink.esua.epdc.service.*; |
|
|
import com.elink.esua.epdc.service.*; |
|
|
import com.elink.esua.epdc.util.AppUserUtils; |
|
|
import com.elink.esua.epdc.util.AppUserUtils; |
|
|
import com.google.common.collect.Lists; |
|
|
import com.google.common.collect.Lists; |
|
|
import com.elink.esua.epdc.exception.UserModuleErrorCode; |
|
|
|
|
|
import com.elink.esua.epdc.feign.AdminFeignClient; |
|
|
|
|
|
import com.elink.esua.epdc.service.PartyMembersService; |
|
|
|
|
|
import com.elink.esua.epdc.service.UserGridRelationService; |
|
|
|
|
|
import com.elink.esua.epdc.service.UserInvitationRecordService; |
|
|
|
|
|
import com.elink.esua.epdc.service.UserService; |
|
|
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
@ -94,10 +79,6 @@ import java.io.File; |
|
|
import java.text.ParseException; |
|
|
import java.text.ParseException; |
|
|
import java.text.SimpleDateFormat; |
|
|
import java.text.SimpleDateFormat; |
|
|
import java.util.*; |
|
|
import java.util.*; |
|
|
import java.util.Arrays; |
|
|
|
|
|
import java.util.Date; |
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 用户信息表 |
|
|
* 用户信息表 |
|
@ -135,6 +116,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
@Autowired |
|
|
@Autowired |
|
|
private AdminFeignClient adminFeignClient; |
|
|
private AdminFeignClient adminFeignClient; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private UserModifyProducer userModifyProducer; |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
@DataSource(value = DataSourceNames.FIRST) |
|
|
@DataSource(value = DataSourceNames.FIRST) |
|
|
public PageData<UserDTO> page(Map<String, Object> params) { |
|
|
public PageData<UserDTO> page(Map<String, Object> params) { |
|
@ -282,6 +266,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
userTagRelationService.addUserTagRelation(dto.getId(), UserTagEnum.PARTY_MEMBER.value()); |
|
|
userTagRelationService.addUserTagRelation(dto.getId(), UserTagEnum.PARTY_MEMBER.value()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 党员认证发送MQ消息
|
|
|
|
|
|
sendMqMessage(dto); |
|
|
|
|
|
|
|
|
return new Result<>(); |
|
|
return new Result<>(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -910,6 +897,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
userTagRelationService.addUserTagRelation(completeAppUser.getId(), UserTagEnum.PARTY_MEMBER.value()); |
|
|
userTagRelationService.addUserTagRelation(completeAppUser.getId(), UserTagEnum.PARTY_MEMBER.value()); |
|
|
// 生成党员认证通过记录
|
|
|
// 生成党员认证通过记录
|
|
|
generateUserAuthenticateHistory(completeAppUser, UserAuthTypeEnum.PARTY_AUTH, YesOrNoEnum.YES, null); |
|
|
generateUserAuthenticateHistory(completeAppUser, UserAuthTypeEnum.PARTY_AUTH, YesOrNoEnum.YES, null); |
|
|
|
|
|
// 党员认证发送MQ消息
|
|
|
|
|
|
sendMqMessage(ConvertUtils.sourceToTarget(formDto.getCompleteAppUser(), UserDTO.class)); |
|
|
return Boolean.TRUE; |
|
|
return Boolean.TRUE; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -1677,4 +1666,20 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
partyMembersDao.insert(entity); |
|
|
partyMembersDao.insert(entity); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 发送MQ消息 |
|
|
|
|
|
* |
|
|
|
|
|
* @param dto |
|
|
|
|
|
* @return void |
|
|
|
|
|
* @author zhy |
|
|
|
|
|
* @date 2021/8/30 14:09 |
|
|
|
|
|
*/ |
|
|
|
|
|
private void sendMqMessage(UserDTO dto) { |
|
|
|
|
|
|
|
|
|
|
|
UserModifyDTO body = new UserModifyDTO(); |
|
|
|
|
|
body.setUserId(dto.getId()); |
|
|
|
|
|
userModifyProducer.sendMessage(RocketMqConstant.MQ_TOPIC_USER, RocketMqConstant.MQ_TAG_USER, |
|
|
|
|
|
dto.getId(), JSONObject.toJSONString(body)); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|