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

修复无法更新党员报道信息的问题；

master
luyan 2 years ago
parent
2210fa24e5
commit
1e1a660bfb
7 changed files with 129 additions and 80 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. 6
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
  2. 3
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
  3. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
  4. 7
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
  5. 84
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
  6. 2
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ReportPartyController.java
  7. 102
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserDjylServiceImpl.java

6
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
View File

@ -459,6 +459,12 @@ public class ApiAppUserController {
return appUserService.saveReportparty(dto);
}
@PostMapping("/reportparty/update")
public Result<EpdcPartyMemberRegistDTO> updateReportparty(@LoginUser TokenDto tokenDto, @RequestBody ReportPartyDTO dto) {
dto.setDeptId(tokenDto.getGridId());
return appUserService.updateReportparty(dto);
}
@PostMapping("/reportparty/getByIdCardAndName")
public Result getByIdCardAndName(@LoginUser TokenDto tokenDto, @RequestBody ReportPartyDTO dto) {
return appUserService.getByIdCardAndName(dto);

3
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
View File

@ -515,6 +515,9 @@ public interface UserFeignClient {
@PostMapping("/app-user/reportparty/save")
Result saveReportparty(ReportPartyDTO dto);
@PostMapping("/app-user/reportparty/update")
Result updateReportparty(ReportPartyDTO dto);
/**
* 获取在职党员报到信息
*

5
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
View File

@ -278,6 +278,11 @@ public class UserFeignClientFallback implements UserFeignClient {
return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "saveReportparty", dto);
}
@Override
public Result updateReportparty(ReportPartyDTO dto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateReportparty", dto);
}
@Override
public Result getByIdCardAndName(ReportPartyDTO dto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getByIdCardAndName", dto);

7
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
View File

@ -425,4 +425,11 @@ public interface AppUserService {
* @return
*/
Result forgotPwd(UserDTO userDTO);
/**
* 更新党员报道
* @param dto
* @return
*/
Result<EpdcPartyMemberRegistDTO> updateReportparty(ReportPartyDTO dto);
}

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

@ -56,8 +56,6 @@ import me.chanjar.weixin.mp.api.WxMpService;
import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
import me.chanjar.weixin.mp.bean.result.WxMpUser;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -78,7 +76,7 @@ import java.util.List;
@Slf4j
@Service
public class AppUserServiceImpl implements AppUserService {
private static final Logger logger = LoggerFactory.getLogger(AppUserServiceImpl.class);
@Autowired
private AppUserRedis appUserRedis;
@ -248,7 +246,7 @@ public class AppUserServiceImpl implements AppUserService {
if (!userInfoResult.success()) {
return new Result().error(userInfoResult.getMsg());
}
return this.getTokenByUserDto(userInfoResult.getData(),null);
return this.getTokenByUserDto(userInfoResult.getData(), null);
}
private Result<EpdcAppAuthorizationDTO> getNPMTokenByOpenId(WxMaJscode2SessionResult wxMaJscode2SessionResult, EpdcAppUserTokenFormDTO loginDto) {
@ -280,7 +278,7 @@ public class AppUserServiceImpl implements AppUserService {
authorization.setUserState(AppUserStatesEnum.STATE_NOT_REGISTERED.value());
return new Result().ok(authorization);
}
if(StringUtils.isEmpty(loginDto.getMobile()) || !userDto.getMobile().equals(loginDto.getMobile())){
if (StringUtils.isEmpty(loginDto.getMobile()) || !userDto.getMobile().equals(loginDto.getMobile())) {
return new Result<EpdcAppAuthorizationDTO>().error(-1, "请确认账号或密码是否正确！");
}
if (StringUtils.isNotEmpty(loginDto.getPassword())) {
@ -1486,7 +1484,7 @@ public class AppUserServiceImpl implements AppUserService {
@Override
public Result
volunteerAuthenticate(TokenDto tokenDto, EpdcCompleteVolunteerInfoFormDTO formDto) {
logger.info("志愿者认证wxCode=" + formDto.getWxCode() + ";userId=" + tokenDto.getUserId());
log.info("志愿者认证wxCode=" + formDto.getWxCode() + ";userId=" + tokenDto.getUserId());
if (StringUtils.isNotBlank(formDto.getSmsCode())) {
this.checkSmsCode(formDto.getMobile(), formDto.getSmsCode());
@ -1673,6 +1671,38 @@ public class AppUserServiceImpl implements AppUserService {
return new Result<EpdcPartyMemberRegistDTO>().ok(partyMemberRegistDTO);
}
@Override
public Result<EpdcPartyMemberRegistDTO> updateReportparty(ReportPartyDTO dto) {
EpdcPartyMemberRegistDTO partyMemberRegistDTO = new EpdcPartyMemberRegistDTO();
CityCenterFromDTO formDTO = new CityCenterFromDTO();
if (dto.getDeptId() != null) {
formDTO.setDeptId(Long.parseLong(dto.getAllDeptIds()[dto.getAllDeptIds().length - 2]));
SysDeptDTO liveDept = adminFeignClient.getDeptInfo(formDTO).getData();
partyMemberRegistDTO.setLiveAddress(liveDept.getAddress());
partyMemberRegistDTO.setLiveCommunity(liveDept.getName());
partyMemberRegistDTO.setLiveMobile(liveDept.getMobile());
partyMemberRegistDTO.setLiveSecretaryName(liveDept.getSecretaryName());
partyMemberRegistDTO.setLiveTelephone(liveDept.getTelephone());
partyMemberRegistDTO.setLiveStreetName(liveDept.getStreetName());
partyMemberRegistDTO.setLiveLongitude(liveDept.getLongitude());
partyMemberRegistDTO.setLiveLatitude(liveDept.getLatitude());
}
if (null != dto.getCouplingCommunity()) {
formDTO.setDeptId(Long.parseLong(dto.getCouplingCommunity()[dto.getCouplingCommunity().length - 2]));
SysDeptDTO couplingDept = adminFeignClient.getDeptInfo(formDTO).getData();
partyMemberRegistDTO.setCouplingAddress(couplingDept.getAddress());
partyMemberRegistDTO.setCouplingCommunity(couplingDept.getName());
partyMemberRegistDTO.setCouplingMobile(couplingDept.getMobile());
partyMemberRegistDTO.setCouplingSecretaryName(couplingDept.getSecretaryName());
partyMemberRegistDTO.setCouplingelephone(couplingDept.getTelephone());
partyMemberRegistDTO.setCouplingStreetName(couplingDept.getStreetName());
partyMemberRegistDTO.setCouplingLongitude(couplingDept.getLongitude());
partyMemberRegistDTO.setCouplingLatitude(couplingDept.getLatitude());
}
userFeignClient.updateReportparty(dto);
return new Result<EpdcPartyMemberRegistDTO>().ok(partyMemberRegistDTO);
}
@Override
public Result getByIdCardAndName(ReportPartyDTO dto) {
return userFeignClient.getByIdCardAndName(dto);
@ -1731,36 +1761,38 @@ public class AppUserServiceImpl implements AppUserService {
private UserDTO generateNpmUserDTO(EpdcUserNpmRegisterFormDTO formDto) {
EpdcUserRegistFormDTO epdcUserRegistFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcUserRegistFormDTO.class);
if(StringUtils.isNotEmpty(formDto.getPassword())){
if (StringUtils.isNotEmpty(formDto.getPassword())) {
String pwd = PasswordUtils.encode(formDto.getPassword());
epdcUserRegistFormDTO.setPassword(pwd);
npmVerifyUserRegisterData(epdcUserRegistFormDTO);
}
epdcUserRegistFormDTO.setRoad("");
if (null != formDto.getCouplingCommunity()) {
epdcUserRegistFormDTO.setCouplingCommunity(String.join(",", formDto.getCouplingCommunity()));
}
npmVerifyUserRegisterData(epdcUserRegistFormDTO);
Long deptId;
if (formDto.getAllDeptIds() != null && formDto.getAllDeptIds().length > 1) {
deptId = Long.parseLong(formDto.getAllDeptIds()[formDto.getAllDeptIds().length - 1]);
} else {
UserDetail user = SecurityUser.getUser();
deptId = user.getDeptId();
}
WxMaJscode2SessionResult nmpWxUser = this.getNMPWxUser(formDto.getWxCode());
UserDTO userDTO = new UserDTO();
//判断是否在市北居住，如果居住，需要填写社区信息
if (formDto.getShibei() == 1) {
Long deptId;
if (formDto.getAllDeptIds() != null && formDto.getAllDeptIds().length > 1) {
deptId = Long.parseLong(formDto.getAllDeptIds()[formDto.getAllDeptIds().length - 1]);
} else {
UserDetail user = SecurityUser.getUser();
deptId = user.getDeptId();
}
// 获取网格机构详情
Result<CompleteDeptDTO> adminDeptResult = adminFeignClient.getCompleteDept(deptId);
if (!adminDeptResult.success() || null == adminDeptResult.getData()) {
throw new RenException("查询网格信息失败");
}
CompleteDeptDTO completeDept = adminDeptResult.getData();
// 获取网格机构详情
Result<CompleteDeptDTO> adminDeptResult = adminFeignClient.getCompleteDept(deptId);
if (!adminDeptResult.success() || null == adminDeptResult.getData()) {
throw new RenException("查询网格信息失败");
epdcUserRegistFormDTO.setGridId(deptId);
WxMaJscode2SessionResult nmpWxUser = this.getNMPWxUser(formDto.getWxCode());
userDTO = this.packageUserDto(epdcUserRegistFormDTO, nmpWxUser.getUnionid(), nmpWxUser.getOpenid(), completeDept);
userDTO.setDeptId(deptId);
}
CompleteDeptDTO completeDept = adminDeptResult.getData();
epdcUserRegistFormDTO.setGridId(deptId);
UserDTO userDTO = this.packageUserDto(epdcUserRegistFormDTO, nmpWxUser.getUnionid(), nmpWxUser.getOpenid(), completeDept);
userDTO.setDeptId(deptId);
userDTO.setHobbies(formDto.getHobbies());
userDTO.setPartyFlag(String.valueOf(formDto.getPartyFlag()));
userDTO.setShibei(formDto.getShibei());

2
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ReportPartyController.java
View File

@ -89,7 +89,7 @@ public class ReportPartyController {
return new Result();
}
@PutMapping
@PostMapping("update")
public Result update(@RequestBody ReportPartyDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);

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

@ -88,57 +88,52 @@ public class UserDjylServiceImpl extends BaseServiceImpl<UserDjylDao, UserDjylEn
@Transactional(rollbackFor = Exception.class)
public Result npmUserRegister(UserDTO userDto) {
//修改数据库结构
Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userDto.getGridId().toString());
if (!parentAndAllDeptDTOResult.success()) {
return new Result<EpdcUserRegisterInfoResultDTO>().error(parentAndAllDeptDTOResult.getMsg());
if(null != userDto.getGridId()){
Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userDto.getGridId().toString());
if (!parentAndAllDeptDTOResult.success()) {
return new Result<EpdcUserRegisterInfoResultDTO>().error(parentAndAllDeptDTOResult.getMsg());
}
UserGridRelationDTO dto = new UserGridRelationDTO();
dto.setUserId(userDto.getUserId());
dto.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
dto.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
dto.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
dto.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
dto.setGridId(parentAndAllDeptDTOResult.getData().getGridId());
dto.setGrid(parentAndAllDeptDTOResult.getData().getGrid());
dto.setSwitchedTime(new Date());
userGridRelationService.save(dto);
userDto.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
}
UserDjylEntity entity = ConvertUtils.sourceToTarget(userDto, UserDjylEntity.class);
insert(entity);
UserGridRelationDTO dto = new UserGridRelationDTO();
dto.setUserId(entity.getId());
dto.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
dto.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
dto.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
dto.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
dto.setGridId(parentAndAllDeptDTOResult.getData().getGridId());
dto.setGrid(parentAndAllDeptDTOResult.getData().getGrid());
dto.setSwitchedTime(new Date());
userGridRelationService.save(dto);
userDto.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
return new Result().ok(userDto);
}
@Override
public Result<String> npmUserUpdate(UserDTO userDto) {
//修改数据库结构
Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userDto.getGridId().toString());
if (!parentAndAllDeptDTOResult.success()) {
return new Result<String>().error(parentAndAllDeptDTOResult.getMsg());
}
UserDjylEntity djylEntity = baseDao.selectById(userDto.getUserId());
userDto.setPassword(djylEntity.getPassword());
userDto.setId(djylEntity.getId());
UserDjylEntity entity = ConvertUtils.sourceToTarget(userDto, UserDjylEntity.class);
entity.setId(userDto.getUserId());
if (StringUtils.isNotEmpty(userDto.getFaceImg())) {
entity.setFaceImg(userDto.getFaceImg());
} else {
entity.setFaceImg(null);
if(null != userDto.getGridId()){
Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userDto.getGridId().toString());
if (!parentAndAllDeptDTOResult.success()) {
return new Result<String>().error(parentAndAllDeptDTOResult.getMsg());
}
UserGridRelationEntity gridRelation = new UserGridRelationEntity();
gridRelation.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
gridRelation.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
gridRelation.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
gridRelation.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
gridRelation.setGridId(parentAndAllDeptDTOResult.getData().getGridId());
gridRelation.setGrid(parentAndAllDeptDTOResult.getData().getGrid());
LambdaUpdateWrapper<UserGridRelationEntity> updateWrapper = Wrappers.lambdaUpdate();
updateWrapper.eq(UserGridRelationEntity::getUserId, entity.getId());
userGridRelationService.update(gridRelation, updateWrapper);
}
baseDao.updateById(entity);
UserGridRelationEntity gridRelation = new UserGridRelationEntity();
gridRelation.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
gridRelation.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
gridRelation.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
gridRelation.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
gridRelation.setGridId(parentAndAllDeptDTOResult.getData().getGridId());
gridRelation.setGrid(parentAndAllDeptDTOResult.getData().getGrid());
LambdaUpdateWrapper<UserGridRelationEntity> updateWrapper = Wrappers.lambdaUpdate();
updateWrapper.eq(UserGridRelationEntity::getUserId, entity.getId());
userGridRelationService.update(gridRelation, updateWrapper);
return new Result<String>().ok("修改成功");
}
@ -154,7 +149,6 @@ public class UserDjylServiceImpl extends BaseServiceImpl<UserDjylDao, UserDjylEn
@Transactional(rollbackFor = Exception.class)
public Result<EpdcUserRegisterInfoResultDTO> namSaveUserOrBindGrid(EpdcUserRegisterBindGridFormDTO fromDto) {
UserDTO formUserDto = fromDto.getUserDTO();
UserGridRelationDTO userGridRel = fromDto.getGridRelationDTO();
// 用户注册
if (NumConstant.ZERO == fromDto.getRegisterState()) {
UserDjylEntity userEntity = ConvertUtils.sourceToTarget(formUserDto, UserDjylEntity.class);
@ -164,25 +158,28 @@ public class UserDjylServiceImpl extends BaseServiceImpl<UserDjylDao, UserDjylEn
return new Result<EpdcUserRegisterInfoResultDTO>().error("用户注册失败");
}
}
userGridRel.setUserId(formUserDto.getId());
//修改数据库结构
Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRel.getGridId().toString());
if (!parentAndAllDeptDTOResult.success()) {
return new Result<EpdcUserRegisterInfoResultDTO>().error(parentAndAllDeptDTOResult.getMsg());
UserGridRelationDTO userGridRel = fromDto.getGridRelationDTO();
//如果注册用户有组织信息
if(null != userGridRel){
userGridRel.setUserId(formUserDto.getId());
//修改数据库结构
Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRel.getGridId().toString());
if (!parentAndAllDeptDTOResult.success()) {
return new Result<EpdcUserRegisterInfoResultDTO>().error(parentAndAllDeptDTOResult.getMsg());
}
userGridRel.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
userGridRel.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
userGridRel.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
userGridRel.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
// 用户绑定网格
userGridRelationService.save(userGridRel);
}
userGridRel.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
userGridRel.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
userGridRel.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
userGridRel.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
// 用户绑定网格
userGridRelationService.save(userGridRel);
// 组装用户注册信息
EpdcUserRegisterInfoResultDTO resultDto = new EpdcUserRegisterInfoResultDTO();
resultDto.setRegisterState(NumConstant.TWO);
resultDto.setGrid(userGridRel.getGrid());
resultDto.setGridId(userGridRel.getGridId());
resultDto.setUserDTO(formUserDto);
// 记录邀请记录
if (StringUtils.isNotEmpty(fromDto.getInviteUserId())) {
UserInvitationRecordEntity entity = new UserInvitationRecordEntity();
@ -195,7 +192,6 @@ public class UserDjylServiceImpl extends BaseServiceImpl<UserDjylDao, UserDjylEn
entity.setGridId(userGridRel.getGridId());
userInvitationRecordService.insert(entity);
}
return new Result<EpdcUserRegisterInfoResultDTO>().ok(resultDto);
}

Write Preview
Loading…
Cancel
Save