【功能优化】查询用户注册信息接口返还信息增加用户网格ID

1.gridId 参数不必需
2.返回参数当前用户绑定的网格id(gridId)

code/smart-community/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/MyResiUserInfoFormDTO.java

@@ -16,7 +16,7 @@ public class MyResiUserInfoFormDTO implements Serializable {
     private static final long serialVersionUID = -6534841370041338474L;
     @NotBlank(message = "客户Id不能为空")
     private String customerId;
-    @NotBlank(message = "网格Id不能为空")
+//    @NotBlank(message = "网格Id不能为空")
     private String gridId;
     @NotBlank(message = "用户Id不能为空")
     private String userId;

code/smart-community/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java

@@ -18,6 +18,11 @@ public class MyResiUserInfoResultDTO implements Serializable {
      * 用户id
      * */
     private String userId;
+
+    /**
+     * 居民所属网格ID
+     */
+    private String gridId;
     /**
      * 是否已注册居民，true ,false
      * */

code/smart-community/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/MineController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.Date;
 
 /**
@@ -38,7 +39,7 @@ import java.util.Date;
 @RequestMapping("mine")
 public class MineController {
 
-	@Autowired
+	@Resource
 	private EpmetUserFeignClient epmetUserFeignClient;
 	@Autowired
 	private RedisUtils redisUtils;
@@ -54,6 +55,7 @@ public class MineController {
 	Result<MyResiUserInfoResultDTO> getMyResiInfo(@LoginUser TokenDto tokenDto, @RequestBody MyResiUserInfoFormDTO myResiUserInfoFormDTO) {
 		myResiUserInfoFormDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(myResiUserInfoFormDTO);
+
 		return epmetUserFeignClient.resiMyselfMsg(myResiUserInfoFormDTO);
 	}
 

code/smart-community/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MyResiUserInfoFormDTO.java

@@ -16,7 +16,7 @@ public class MyResiUserInfoFormDTO implements Serializable {
     private static final long serialVersionUID = -6534841370041338474L;
     @NotBlank(message = "客户Id不能为空")
     private String customerId;
-    @NotBlank(message = "网格Id不能为空")
+//    @NotBlank(message = "网格Id不能为空")
     private String gridId;
     @NotBlank(message = "用户Id不能为空")
     private String userId;

code/smart-community/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java

@@ -18,6 +18,11 @@ public class MyResiUserInfoResultDTO implements Serializable {
      * 用户id
      * */
     private String userId;
+
+    /**
+     * 居民所属网格ID
+     */
+    private String gridId;
     /**
      * 是否已注册居民，true ,false
      * */

code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -211,6 +211,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         if (null != myselfMsg) {
             MyResiUserInfoResultDTO result = ConvertUtils.sourceToTarget(myselfMsg, MyResiUserInfoResultDTO.class);
+            RegisterRelationEntity registerRelation = registerRelationDao.selectRegisteredGridIdByUserId(myResiUserInfoFormDTO.getUserId());
+            if (null != registerRelation) {
+                result.setGridId(registerRelation.getGridId());
+            }
             //registerFlag 是否已注册居民，true ,false
             result.setRegisterFlag(StringUtils.isNotBlank(myselfMsg.getResiId()));
             if(StringUtils.isNotBlank(myselfMsg.getIdNum()) && StringUtils.isNotBlank(myselfMsg.getResiId())){