用户多网格操作相关接口修改

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

@@ -158,7 +158,7 @@ public class ApiAppUserController {
     }
 
     /**
-     * 网格长在小程序切换网格
+     * 用户小程序切换网格
      *
      * @param userDetail
      * @param gridId
@@ -167,29 +167,28 @@ public class ApiAppUserController {
      * @date 2019/10/23 10:38
      */
     @GetMapping("user/switchGrid/{gridId}")
-    public Result<EpdcAppAuthorizationDTO> gridLeaderSwitchGrid(@LoginUser TokenDto userDetail, @PathVariable("gridId") String gridId) {
+    public Result<EpdcAppAuthorizationDTO> userSwitchGrid(@LoginUser TokenDto userDetail, @PathVariable("gridId") String gridId) {
-        return appUserService.gridLeaderSwitchGrid(userDetail, gridId);
+        return appUserService.userSwitchGrid(userDetail, gridId);
     }
 
     /**
-     * 获取网格长管理的所有网格
+     * 获取用户的所有网格列表
      *
      * @param userDetail
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcLeaderGridResultDTO>>
      * @author work@yujt.net.cn
      * @date 2019/10/23 15:58
      */
-    @GetMapping("user/listGridForLeader")
+    @GetMapping("user/listGrid")
-    public Result<List<EpdcLeaderGridResultDTO>> listGridForLeader(@LoginUser TokenDto userDetail) {
+    public Result<List<EpdcLeaderGridResultDTO>> listUserGrid(@LoginUser TokenDto userDetail) {
-        return appUserService.listGridForLeader(userDetail.getUserId());
+        return appUserService.listUserGrid(userDetail.getUserId());
     }
 
     /**
-     *
      * 更新用户微信信息
      *
-     * @params [tokenDto, formDto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [tokenDto, formDto]
      * @author liuchuang
      * @since 2019/10/28 9:58
      */

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

@@ -203,8 +203,8 @@ public interface UserFeignClient {
      * @author work@yujt.net.cn
      * @date 2019/10/23 13:33
      */
-    @GetMapping(value = "app-user/epdc-app/usergrid/leaderSwitchGrid", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "app-user/epdc-app/usergrid/userSwitchGrid", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<UserGridRelationDTO> leaderSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto);
+    Result<UserGridRelationDTO> userSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto);
 
     /**
      * 获取网格长管理的网格列表
@@ -214,8 +214,8 @@ public interface UserFeignClient {
      * @author work@yujt.net.cn
      * @date 2019/10/23 13:34
      */
-    @GetMapping("app-user/epdc-app/usergrid/listGridForLeader/{userId}")
+    @GetMapping("app-user/epdc-app/usergrid/listUserGrid/{userId}")
-    Result<List<EpdcLeaderGridResultDTO>> listGridForLeader(@PathVariable("userId") String userId);
+    Result<List<EpdcLeaderGridResultDTO>> listUserGrid(@PathVariable("userId") String userId);
 
 
     /**

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

@@ -97,13 +97,13 @@ public class UserFeignClientFallback implements UserFeignClient {
     }
 
     @Override
-    public Result<UserGridRelationDTO> leaderSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto) {
+    public Result<UserGridRelationDTO> userSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "leaderSwitchGrid", switchGridDto);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "userSwitchGrid", switchGridDto);
     }
 
     @Override
-    public Result<List<EpdcLeaderGridResultDTO>> listGridForLeader(String userId) {
+    public Result<List<EpdcLeaderGridResultDTO>> listUserGrid(String userId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listGridForLeader", userId);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listUserGrid", userId);
     }
 
     @Override

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

@@ -124,7 +124,7 @@ public interface AppUserService {
     Result<EpdcAppAuthorizationDTO> maGridLeaderRegister(EpdcGridLeaderRegisterSubmitFormDTO formDto);
 
     /**
-     * 网格长在小程序切换网格
+     * 用户小程序切换网格
      *
      * @param userDetail
      * @param gridId
@@ -132,17 +132,17 @@ public interface AppUserService {
      * @author work@yujt.net.cn
      * @date 2019/10/23 10:40
      */
-    Result<EpdcAppAuthorizationDTO> gridLeaderSwitchGrid(TokenDto userDetail, String gridId);
+    Result<EpdcAppAuthorizationDTO> userSwitchGrid(TokenDto userDetail, String gridId);
 
     /**
-     * 获取网格长管理的所有网格
+     * 获取用户的所有网格列表
      *
      * @param userId
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcLeaderGridResultDTO>>
      * @author work@yujt.net.cn
      * @date 2019/10/23 15:58
      */
-    Result<List<EpdcLeaderGridResultDTO>> listGridForLeader(String userId);
+    Result<List<EpdcLeaderGridResultDTO>> listUserGrid(String userId);
 
     /**
      * 用户注册、获取Token

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

@@ -11,6 +11,7 @@ import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcGridLeaderRegisterFormDTO;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
@@ -253,7 +254,6 @@ public class AppUserServiceImpl implements AppUserService {
         appUser.setLastLoginTime(now);
         appUser.setRegisterTime(now);
         appUser.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value());
-        appUser.setGridId(NumConstant.ZERO_L);
         appUser.setRegisterSource(AppUserRegisterSourceEnum.MA.value());
         appUser.setRegisterWay(AppUserRegisterWayEnum.WX.value());
         appUser.setMobile(mobile);
@@ -521,7 +521,7 @@ public class AppUserServiceImpl implements AppUserService {
     }
 
     @Override
-    public Result<EpdcAppAuthorizationDTO> gridLeaderSwitchGrid(TokenDto userDetail, String gridId) {
+    public Result<EpdcAppAuthorizationDTO> userSwitchGrid(TokenDto userDetail, String gridId) {
 
         String userId = userDetail.getUserId();
 
@@ -529,7 +529,7 @@ public class AppUserServiceImpl implements AppUserService {
         switchGrid.setAppUserId(userId);
         switchGrid.setGridId(gridId);
         // 更新用户-网格关系表，更新将要切换的网格的 SWITCHED_TIME 字段
-        Result<UserGridRelationDTO> appUserResult = userFeignClient.leaderSwitchGrid(switchGrid);
+        Result<UserGridRelationDTO> appUserResult = userFeignClient.userSwitchGrid(switchGrid);
         if (!appUserResult.success()) {
             return new Result().error(appUserResult.getMsg());
         }
@@ -542,8 +542,8 @@ public class AppUserServiceImpl implements AppUserService {
     }
 
     @Override
-    public Result<List<EpdcLeaderGridResultDTO>> listGridForLeader(String userId) {
+    public Result<List<EpdcLeaderGridResultDTO>> listUserGrid(String userId) {
-        return userFeignClient.listGridForLeader(userId);
+        return userFeignClient.listUserGrid(userId);
     }
 
     /**
@@ -677,6 +677,7 @@ public class AppUserServiceImpl implements AppUserService {
     public Result<EpdcAppAuthorizationDTO> completeUserInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) {
 
         UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class);
+        userDto.setId(tokenDto.getUserId());
 
         // 党员提交，验证身份证号
         if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {
@@ -692,22 +693,18 @@ public class AppUserServiceImpl implements AppUserService {
         }
         // 验证手机号
         this.checkSmsCode(userDto.getMobile(), infoDto.getSmsCode());
-
-
-        userDto.setId(tokenDto.getUserId());
         // 验证用户提交的信息
         Result verifyResult = userFeignClient.verifyUserCompleteData(userDto);
         if (!verifyResult.success()) {
             return new Result().error(verifyResult.getMsg());
         }
 
+        UserGridRelationDTO userGrid = this.packageUserGridRelationInfo(tokenDto.getGridId());
+        EpdcCompleteAppUserDTO completeAppUserDto = ConvertUtils.sourceToTarget(userDto, EpdcCompleteAppUserDTO.class);
+        completeAppUserDto = this.packageUserCompleteInfo(completeAppUserDto);
         // 组装对象，准备保存用户信息
         EpdcAppUserCompleteInfoFormDTO dto = new EpdcAppUserCompleteInfoFormDTO();
-
+        dto.setCompleteAppUser(completeAppUserDto);
-        UserGridRelationDTO userGrid = this.packageUserGridRelationInfo(tokenDto.getGridId());
-        userDto = this.packageUserCompleteInfo(userDto);
-
-        dto.setUserDto(userDto);
         dto.setUserGridRelation(userGrid);
 
         Result<UserDTO> completeResult = userFeignClient.completeUserInfo(dto);
@@ -736,27 +733,37 @@ public class AppUserServiceImpl implements AppUserService {
         return new Result().error("获取用户信息失败");
     }
 
-    private UserDTO packageUserCompleteInfo(UserDTO userDto) {
+    private EpdcCompleteAppUserDTO packageUserCompleteInfo(EpdcCompleteAppUserDTO dto) {
 
-        if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {
+        String road = dto.getRoad();
-            userDto.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value());
+        String villageName = dto.getVillageName();
-            userDto.setSex(IdentityNoUtils.getSex(userDto.getIdentityNo()));
+        String dwellingPlace = dto.getDwellingPlace();
-            userDto.setNickname(
+        String identityNo = dto.getIdentityNo();
-                    userDto.getRoad().concat("-").concat(userDto.getRealName().substring(NumConstant.ZERO, NumConstant.ONE))
+
-                            .concat(NumConstant.ZERO_STR.equals(userDto.getSex()) ? "女士" : "先生"));
+        if (YesOrNoEnum.YES.value().equals(dto.getPartyFlag())) {
-            userDto.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(userDto.getIdentityNo()), DateUtils.DATE_PATTERN));
+            dto.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value());
+            dto.setSex(IdentityNoUtils.getSex(identityNo));
+            dto.setNickname(
+                    road.concat("-").concat(dto.getRealName().substring(NumConstant.ZERO, NumConstant.ONE))
+                            .concat(NumConstant.ZERO_STR.equals(dto.getSex()) ? "女士" : "先生"));
+            dto.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(identityNo), DateUtils.DATE_PATTERN));
         } else {
-            userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value());
+            dto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value());
         }
 
-        PhoneDto phoneDto = PhoneUtil.getPhoneDto(userDto.getMobile());
+        String address = road
+                .concat(StringUtils.isNotBlank(villageName) ? villageName : "")
+                .concat(StringUtils.isNotBlank(dwellingPlace) ? dwellingPlace : "");
+        dto.setAddress(address);
+
+        PhoneDto phoneDto = PhoneUtil.getPhoneDto(dto.getMobile());
         if (phoneDto != null) {
-            userDto.setMobileCarrier(phoneDto.getCarrier());
+            dto.setMobileCarrier(phoneDto.getCarrier());
-            userDto.setMobileCity(phoneDto.getCityName());
+            dto.setMobileCity(phoneDto.getCityName());
-            userDto.setMobileProvince(phoneDto.getProvinceName());
+            dto.setMobileProvince(phoneDto.getProvinceName());
         }
 
-        return userDto;
+        return dto;
     }
 
     /**

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

@@ -0,0 +1,97 @@
+package com.elink.esua.epdc.dto.epdc;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 完善个人信息，传送数据到user模块
+ *
+ * @author work@yujt.net.cn
+ * @date 2019/10/29 09:15
+ */
+@Data
+public class EpdcCompleteAppUserDTO implements Serializable {
+
+
+    private static final long serialVersionUID = -8356026348661169354L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 性别(女性-0，男性-1)
+     */
+    private String sex;
+
+    /**
+     * 生日
+     */
+    private Date birthday;
+
+    /**
+     * 真实姓名
+     */
+    private String realName;
+
+    /**
+     * 身份证号
+     */
+    private String identityNo;
+
+    /**
+     * 所在道路（如山东路168号）
+     */
+    private String road;
+
+    private String address;
+
+    /**
+     * 小区名称
+     */
+    private String villageName;
+
+    /**
+     * 住处（楼栋-单元-房间）
+     */
+    private String dwellingPlace;
+
+    /**
+     * 是否是党员(0-否，1-是)
+     */
+    private String partyFlag;
+
+    /**
+     * 手机号所属省份
+     */
+    private String mobileProvince;
+
+    /**
+     * 手机号所属城市
+     */
+    private String mobileCity;
+
+    /**
+     * 手机号所属运营商
+     */
+    private String mobileCarrier;
+
+    /**
+     * 状态(0-未审核，1-审核通过，2-审核未通过)
+     */
+    private String state;
+
+}

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

@@ -1,7 +1,7 @@
 package com.elink.esua.epdc.dto.epdc.form;
 
-import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,7 +17,7 @@ public class EpdcAppUserCompleteInfoFormDTO implements Serializable {
 
     private static final long serialVersionUID = 6891651684067520384L;
 
-    private UserDTO userDto;
+    private EpdcCompleteAppUserDTO completeAppUser;
 
     private UserGridRelationDTO userGridRelation;
 }

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

@@ -17,5 +17,5 @@ public class EpdcLeaderGridResultDTO implements Serializable {
 
     private String grid;
 
-    private String gridId;
+    private Long gridId;
 }

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

@@ -50,9 +50,9 @@ public class EpdcUserGridRelationController {
      * @author work@yujt.net.cn
      * @date 2019/10/23 11:04
      */
-    @GetMapping("leaderSwitchGrid")
+    @GetMapping("userSwitchGrid")
-    public Result<UserGridRelationDTO> leaderSwitchGrid(@RequestBody EpdcLeaderSwitchGridFormDTO switchGridDto) {
+    public Result<UserGridRelationDTO> userSwitchGrid(@RequestBody EpdcLeaderSwitchGridFormDTO switchGridDto) {
-        return userGridRelationService.leaderSwitchGrid(switchGridDto);
+        return userGridRelationService.userSwitchGrid(switchGridDto);
     }
 
     /**
@@ -63,8 +63,8 @@ public class EpdcUserGridRelationController {
      * @author work@yujt.net.cn
      * @date 2019/10/23 13:26
      */
-    @GetMapping("listGridForLeader/{userId}")
+    @GetMapping("listUserGrid/{userId}")
     public Result<List<EpdcLeaderGridResultDTO>> listGridForLeader(@PathVariable("userId") String userId) {
-        return userGridRelationService.listGridForLeader(userId);
+        return userGridRelationService.listUserGridForApi(userId);
     }
 }

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

@@ -104,7 +104,7 @@ public interface UserGridRelationService extends BaseService<UserGridRelationEnt
      * @author work@yujt.net.cn
      * @date 2019/10/23 11:05
      */
-    Result<UserGridRelationDTO> leaderSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto);
+    Result<UserGridRelationDTO> userSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto);
 
     /**
      * 获取网格长管理的网格列表
@@ -114,7 +114,7 @@ public interface UserGridRelationService extends BaseService<UserGridRelationEnt
      * @author work@yujt.net.cn
      * @date 2019/10/23 13:28
      */
-    Result<List<EpdcLeaderGridResultDTO>> listGridForLeader(String userId);
+    Result<List<EpdcLeaderGridResultDTO>> listUserGridForApi(String userId);
 
     /**
      * 获取用户绑定网格信息

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

@@ -103,7 +103,7 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl<UserGridRelatio
     }
 
     @Override
-    public Result<UserGridRelationDTO> leaderSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto) {
+    public Result<UserGridRelationDTO> userSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto) {
 
         UpdateWrapper<UserGridRelationEntity> wrapper = new UpdateWrapper<>();
         wrapper.eq(UserFieldConsant.USER_ID, switchGridDto.getAppUserId())
@@ -127,7 +127,7 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl<UserGridRelatio
     }
 
     @Override
-    public Result<List<EpdcLeaderGridResultDTO>> listGridForLeader(String userId) {
+    public Result<List<EpdcLeaderGridResultDTO>> listUserGridForApi(String userId) {
         QueryWrapper<UserGridRelationEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(UserFieldConsant.USER_ID, userId)
                 .orderByDesc(UserFieldConsant.SWITCHED_TIME);

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

@@ -37,6 +37,7 @@ import com.elink.esua.epdc.dao.PartyMembersDao;
 import com.elink.esua.epdc.dao.UserDao;
 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.form.*;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
@@ -400,25 +401,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result<UserDTO> completeUserInfo(EpdcAppUserCompleteInfoFormDTO formDto) {
-        UserDTO formUser = formDto.getUserDto();
+        EpdcCompleteAppUserDTO completeAppUser = formDto.getCompleteAppUser();
-        UserDTO userDto = new UserDTO();
-
-        userDto.setPartyFlag(formUser.getPartyFlag());
-        userDto.setMobile(formUser.getMobile());
-        userDto.setMobileCarrier(formUser.getMobileCarrier());
-        userDto.setMobileCity(formUser.getMobileCity());
-        userDto.setMobileProvince(formUser.getMobileProvince());
-
-        userDto.setRealName(formUser.getRealName());
-        userDto.setNickname(formUser.getNickname());
-        userDto.setState(formUser.getState());
-        userDto.setSex(formUser.getSex());
-        userDto.setIdentityNo(formUser.getIdentityNo());
-
-        userDto.setRoad(formUser.getRoad());
-        userDto.setVillageName(formUser.getVillageName());
-        userDto.setDwellingPlace(formUser.getDwellingPlace());
 
+        UserDTO userDto = ConvertUtils.sourceToTarget(completeAppUser,UserDTO.class);
         UserGridRelationDTO userGridRelation = formDto.getUserGridRelation();
 
         if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {