添加修改用户信息接口

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

@@ -150,13 +150,22 @@ public class ApiAppUserController {
      * 党建小程序注册接口
      */
 
-    @Deprecated
     @PostMapping("user/npm/register")
     public Result<EpdcAppRegisterCallbackDTO> npmUserRegister(@RequestBody EpdcUserNpmRegisterFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return appUserService.npmUserRegister(formDto);
     }
 
+    /**
+     * 党建小程序注册接口
+     */
+
+    @PostMapping("user/npm/update")
+    public Result<String> npmUserUpdate(@RequestBody EpdcUserNpmRegisterFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return appUserService.npmUserUpdate(formDto);
+    }
+
 
     /**
      * 党建小程序登陆新接口

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

@@ -519,4 +519,7 @@ public interface UserFeignClient {
 
     @PostMapping("app-user/epdc-app/user/npmRegister")
     Result nmpUserRegister(UserDTO userDTO);
+
+    @PostMapping("app-user/epdc-app/user/npmUpdate")
+    Result<String> npmUserUpdate(UserDTO userDTO);
 }

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

@@ -261,4 +261,9 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result nmpUserRegister(UserDTO userDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "nmpUserRegister", userDTO);
     }
+
+    @Override
+    public Result<String> npmUserUpdate(UserDTO userDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "npmUserUpdate", userDTO);
+    }
 }

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

@@ -392,4 +392,6 @@ public interface AppUserService {
      * @return
      */
     Result<EpdcAppRegisterCallbackDTO> npmUserRegister(EpdcUserNpmRegisterFormDTO formDto);
+
+    Result<String> npmUserUpdate(EpdcUserNpmRegisterFormDTO formDto);
 }

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

@@ -557,7 +557,7 @@ public class AppUserServiceImpl implements AppUserService {
         user.setRegisterTime(now);
         user.setLastLoginTime(now);
         user.setState(AppUserAuditStateEnum.UNDER_AUDIT.value());
-        user.setPartyFlag(YesOrNoEnum.NO.value());
+        user.setPartyFlag(formDto.getPartFlag()==null? YesOrNoEnum.NO.value():String.valueOf(formDto.getPartFlag()));
         user.setRegisterWay(AppUserRegisterWayEnum.WX.value());
         user.setRegisterSource(AppUserRegisterSourceEnum.WP.value());
         user.setFaceImg(USER_FACE);
@@ -1563,6 +1563,17 @@ public class AppUserServiceImpl implements AppUserService {
 
     @Override
     public Result<EpdcAppRegisterCallbackDTO> npmUserRegister(EpdcUserNpmRegisterFormDTO formDto) {
+        UserDTO userDTO = generateUserDTO(formDto,true);
+        return userFeignClient.nmpUserRegister(userDTO);
+    }
+
+    @Override
+    public Result<String> npmUserUpdate(EpdcUserNpmRegisterFormDTO formDto) {
+        UserDTO userDTO = generateUserDTO(formDto,false);
+        return userFeignClient.npmUserUpdate(userDTO);
+    }
+
+    private UserDTO generateUserDTO(EpdcUserNpmRegisterFormDTO formDto,boolean isRegister){
         EpdcUserRegistFormDTO epdcUserRegistFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcUserRegistFormDTO.class);
         epdcUserRegistFormDTO.setRoad("");
 
@@ -1576,7 +1587,12 @@ public class AppUserServiceImpl implements AppUserService {
             deptId = user.getDeptId();
         }
 
-        WxMaJscode2SessionResult nmpWxUser = this.getNMPWxUser(formDto.getWxCode());
+        WxMaJscode2SessionResult nmpWxUser ;
+        if (isRegister){
+            nmpWxUser = this.getNMPWxUser(formDto.getWxCode());
+        }else{
+            nmpWxUser = new WxMaJscode2SessionResult();
+        }
 
         // 获取网格机构详情
         Result<CompleteDeptDTO> adminDeptResult = adminFeignClient.getCompleteDept(deptId);
@@ -1593,15 +1609,12 @@ public class AppUserServiceImpl implements AppUserService {
         userDTO.setWorkUnit(formDto.getWorkUnit());
         userDTO.setWorkType(formDto.getWorkType());
         userDTO.setWorkIndustry(formDto.getWorkIndustry());
+        userDTO.setWorkIndustryText(formDto.getWorkIndustryText());
         // IP地址
         HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
         userDTO.setLastLoginIp(IpUtils.getIpAddr(request));
 
-        return saveNmpRegistryInfo(userDTO);
-    }
-
-    private Result<EpdcAppRegisterCallbackDTO> saveNmpRegistryInfo(UserDTO userDTO) {
-        return userFeignClient.nmpUserRegister(userDTO);
+        return userDTO;
     }
 
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserDTO.java

@@ -385,4 +385,14 @@ public class UserDTO implements Serializable {
      * 是否居住在市北
      */
     private Integer shibei;
+
+    /**
+     * 所属行业其他
+     */
+    private String workIndustryText;
+
+    /**
+     * 用户Id
+     */
+    private String userId;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserNpmRegisterFormDTO.java

@@ -71,4 +71,14 @@ public class EpdcUserNpmRegisterFormDTO implements Serializable {
      * 是否党员 0、否  1、是
      */
     private Integer partyFlag;
+
+    /**
+     * 所属行业（其他）
+     */
+    private String workIndustryText;
+
+    /**
+     * 用户Id
+     */
+    private String userId;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserRegistFormDTO.java

@@ -63,4 +63,14 @@ public class EpdcUserRegistFormDTO implements Serializable {
      */
     @NotBlank(message = "微信code不能为空")
     private String wxCode;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 是否党员 0、否 1、是
+     */
+    private Integer partFlag;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserController.java

@@ -121,6 +121,16 @@ public class EpdcAppUserController {
         return userService.npmUserRegister(userDto);
     }
 
+    /**
+     * 党建小程序注册
+     *
+     * @param userDto
+     */
+    @PostMapping("npmUpdate")
+    public Result<String> npmUserUpdate(@RequestBody UserDTO userDto) {
+        return userService.npmUserUpdate(userDto);
+    }
+
 
     /**
      * 网格长注册

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserEntity.java

@@ -288,4 +288,9 @@ public class UserEntity extends DeptScope {
      * 是否居住在市北
      */
     private Integer shibei;
+
+    /**
+     * 所属行业其他
+     */
+    private String workIndustryText;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserService.java

@@ -481,4 +481,11 @@ public interface UserService extends BaseService<UserEntity> {
      * @return
      */
     Result npmUserRegister(UserDTO userDto);
+
+    /**
+     * 党建小程序用户个人信息修改
+     * @param userDto
+     * @return
+     */
+    Result<String> npmUserUpdate(UserDTO userDto);
 }

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

@@ -22,25 +22,14 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
-import com.elink.esua.epdc.user.dao.*;
-import com.elink.esua.epdc.user.datasources.DataSourceNames;
-import com.elink.esua.epdc.user.dto.*;
-import com.elink.esua.epdc.user.dto.PointLogFormDTO;
-import com.elink.esua.epdc.user.dto.epdc.form.*;
-import com.elink.esua.epdc.user.dto.epdc.result.*;
-import com.elink.esua.epdc.user.dto.epdc.result.StandardBearerStatusResultDTO;
-import com.elink.esua.epdc.user.dto.epdc.result.UserPartyStandardAppltResultDTO;
-import com.elink.esua.epdc.user.entity.*;
-import com.elink.esua.epdc.user.enums.PartyMemFlagStatusEnum;
-import com.elink.esua.epdc.user.exception.UserModuleErrorCode;
-import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
-import com.elink.esua.epdc.user.service.*;
 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.mybatis.utils.DeptEntityUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
@@ -51,21 +40,31 @@ import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.*;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.user.constant.AuthenticatedConsant;
 import com.elink.esua.epdc.user.constant.UserFieldConsant;
-import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.user.dao.*;
+import com.elink.esua.epdc.user.datasources.DataSourceNames;
+import com.elink.esua.epdc.user.dto.*;
 import com.elink.esua.epdc.user.dto.epdc.EpdcCompleteAppUserDTO;
 import com.elink.esua.epdc.user.dto.epdc.EpdcGridLeaderRegisterDTO;
 import com.elink.esua.epdc.user.dto.epdc.UserCarInfoDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.*;
+import com.elink.esua.epdc.user.dto.epdc.result.*;
 import com.elink.esua.epdc.user.dto.product.result.EpmetUserBaseInfoDTO;
 import com.elink.esua.epdc.user.dto.product.result.EpmetUserResiInfoDTO;
+import com.elink.esua.epdc.user.entity.*;
 import com.elink.esua.epdc.user.enums.AppUserAuditStateEnum;
 import com.elink.esua.epdc.user.enums.AppUserStatesEnum;
+import com.elink.esua.epdc.user.enums.PartyMemFlagStatusEnum;
 import com.elink.esua.epdc.user.enums.PartyMemberRegFlagEnum;
 import com.elink.esua.epdc.user.excel.UserExcel;
+import com.elink.esua.epdc.user.exception.UserModuleErrorCode;
 import com.elink.esua.epdc.user.feign.AdminFeignClient;
 import com.elink.esua.epdc.user.feign.PointFeignClient;
 import com.elink.esua.epdc.user.redis.UserRedis;
+import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
+import com.elink.esua.epdc.user.service.*;
 import com.elink.esua.epdc.user.util.AppUserUtils;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
@@ -502,6 +501,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         if (StringUtils.isNotBlank(mobile)) {
             QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
             wrapper.eq(FieldConstant.MOBILE, mobile);
+            wrapper.ne(formDto.getUserId()!=null,FieldConstant.ID,formDto.getUserId());
             Integer count = this.baseDao.selectCount(wrapper);
             if (count > NumConstant.ZERO) {
                 return new Result().error("手机号已被注册");
@@ -513,6 +513,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         if (StringUtils.isNotBlank(identityNo)) {
             QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
             wrapper.eq(UserFieldConsant.IDENTITY_NO, identityNo);
+            wrapper.ne(formDto.getUserId()!=null,FieldConstant.ID,formDto.getUserId());
             Integer count = this.baseDao.selectCount(wrapper);
             if (count > NumConstant.ZERO) {
                 return new Result().error("身份证号已被注册");
@@ -2075,4 +2076,36 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         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());
+        }
+
+        UserEntity entity = ConvertUtils.sourceToTarget(userDto, UserEntity.class);
+        entity.setId(userDto.getUserId());
+        baseDao.updateById(entity);
+
+        UserGridRelationEntity entity1 = new UserGridRelationEntity();
+        LambdaUpdateWrapper<UserGridRelationEntity> updateWrapper = Wrappers.lambdaUpdate();
+//        updateWrapper.set(UserGridRelationEntity::getAllDeptIds,parentAndAllDeptDTOResult.getData().getAllDeptIds());
+//        updateWrapper.set(UserGridRelationEntity::getAllDeptNames,parentAndAllDeptDTOResult.getData().getAllDeptNames());
+//        updateWrapper.set(UserGridRelationEntity::getParentDeptIds,parentAndAllDeptDTOResult.getData().getParentDeptIds());
+//        updateWrapper.set(UserGridRelationEntity::getParentDeptNames,parentAndAllDeptDTOResult.getData().getParentDeptNames());
+//        updateWrapper.set(UserGridRelationEntity::getGridId,parentAndAllDeptDTOResult.getData().getGridId());
+//        updateWrapper.set(UserGridRelationEntity::getGrid,parentAndAllDeptDTOResult.getData().getGrid());
+        entity1.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
+        entity1.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
+        entity1.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
+        entity1.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
+        entity1.setGridId(parentAndAllDeptDTOResult.getData().getGridId());
+        entity1.setGrid(parentAndAllDeptDTOResult.getData().getGrid());
+        updateWrapper.eq(UserGridRelationEntity::getUserId,entity.getId());
+        userGridRelationService.update(entity1,updateWrapper);
+
+        return new Result<String>().ok("修改成功");
+    }
 }