业务端居民用户详情接口DTO类名修改

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

@@ -1,7 +1,7 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDto;
+import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.service.WorkUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,7 +27,7 @@ public class ApiWorkUserController {
      * @return
      */
     @GetMapping("residentDetail")
-    public Result<EpdcResidentDetailResultDto> residentDetail(String userId){
+    public Result<EpdcResidentDetailResultDTO> residentDetail(String userId){
         return workUserService.residentDetail(userId);
     }
 }

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

@@ -258,5 +258,5 @@ public interface UserFeignClient {
      * @return
      */
     @GetMapping("app-user/epdc-app/user/residentDetail/{userId}")
-    Result<EpdcResidentDetailResultDto> residentDetail(@PathVariable("userId") String userId);
+    Result<EpdcResidentDetailResultDTO> residentDetail(@PathVariable("userId") String userId);
 }

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

@@ -122,7 +122,7 @@ public class UserFeignClientFallback implements UserFeignClient {
     }
 
     @Override
-    public Result<EpdcResidentDetailResultDto> residentDetail(String userId) {
+    public Result<EpdcResidentDetailResultDTO> residentDetail(String userId) {
         return  ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "residentDetail", userId);
     }
 }

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

@@ -1,7 +1,7 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDto;
+import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 
 /**
  * 工作端，用户登录、用户管理 相关业务接口
@@ -15,5 +15,5 @@ public interface WorkUserService {
 	 * @param userId 用户Id
 	 * @return
 	 */
-	Result<EpdcResidentDetailResultDto> residentDetail(String userId);
+	Result<EpdcResidentDetailResultDTO> residentDetail(String userId);
 }

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

@@ -1,7 +1,7 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDto;
+import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.service.WorkUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +24,7 @@ public class WorkUserServiceImpl implements WorkUserService {
 	 * @return
 	 */
 	@Override
-	public Result<EpdcResidentDetailResultDto> residentDetail(String userId) {
+	public Result<EpdcResidentDetailResultDTO> residentDetail(String userId) {
 		return userFeignClient.residentDetail(userId);
 	}
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailGridResultDto.java → esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailGridResultDTO.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @Description:
  */
 @Data
-public class EpdcResidentDetailGridResultDto implements Serializable {
+public class EpdcResidentDetailGridResultDTO implements Serializable {
 	private static final long serialVersionUID = 487797487058257867L;
 	/**
 	 * 市区-街道-社区-网格

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDto.java → esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java

@@ -11,7 +11,7 @@ import java.util.List;
  * @Description:
  */
 @Data
-public class EpdcResidentDetailResultDto  implements Serializable {
+public class EpdcResidentDetailResultDTO implements Serializable {
 	private static final long serialVersionUID = -6060670578626439431L;
 	/**
 	 * 用户ID
@@ -48,5 +48,5 @@ public class EpdcResidentDetailResultDto  implements Serializable {
 	/**
 	 * 扫码网格列表
 	 */
-	private List<EpdcResidentDetailGridResultDto>  gridList;
+	private List<EpdcResidentDetailGridResultDTO>  gridList;
 }

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

@@ -6,7 +6,7 @@ import com.elink.esua.epdc.dto.UserDTO;
 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.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDto;
+import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
@@ -256,7 +256,7 @@ public class EpdcAppUserController {
      * @return
      */
     @GetMapping("residentDetail/{userId}")
-    public Result<EpdcResidentDetailResultDto> residentDetail(@PathVariable("userId") String userId){
+    public Result<EpdcResidentDetailResultDTO> residentDetail(@PathVariable("userId") String userId){
         return userService.residentDetail(userId);
     }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java

@@ -20,7 +20,7 @@ package com.elink.esua.epdc.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
 import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDto;
+import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
@@ -104,5 +104,5 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @param userId 用户Id
      * @return
      */
-	  EpdcResidentDetailResultDto residentDetailByUserId(@Param("userId")String userId);
+	  EpdcResidentDetailResultDTO residentDetailByUserId(@Param("userId")String userId);
 }

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

@@ -24,7 +24,7 @@ import com.elink.esua.epdc.dto.UserDTO;
 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.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDto;
+import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
@@ -204,5 +204,5 @@ public interface UserService extends BaseService<UserEntity> {
      * @param userId 用户Id
      * @return
      */
-	  Result<EpdcResidentDetailResultDto> residentDetail(String userId);
+	  Result<EpdcResidentDetailResultDTO> residentDetail(String userId);
 }

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

@@ -44,7 +44,7 @@ import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO;
 import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDto;
+import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
 import com.elink.esua.epdc.entity.PartyAuthenticationFailedEntity;
 import com.elink.esua.epdc.entity.PartyMembersEntity;
@@ -502,11 +502,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
      * @return
      */
     @Override
-    public Result<EpdcResidentDetailResultDto> residentDetail(String userId) {
+    public Result<EpdcResidentDetailResultDTO> residentDetail(String userId) {
         if(StringUtils.isBlank(userId)){
-            return new Result<EpdcResidentDetailResultDto>().error("用户Id不能为空");
+            return new Result<EpdcResidentDetailResultDTO>().error("用户Id不能为空");
         }
-        EpdcResidentDetailResultDto dto = this.baseDao.residentDetailByUserId(userId);
+        EpdcResidentDetailResultDTO dto = this.baseDao.residentDetailByUserId(userId);
         return new Result().ok(dto);
     }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -90,7 +90,7 @@
             u.register_time desc
     </select>
     <!--  根据userId获取居民详情（已认证或待认证（提交信息待审核）的居民用户）  -->
-    <resultMap id="EpdcResidentDetailResultDtoMap" type="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDto">
+    <resultMap id="EpdcResidentDetailResultDtoMap" type="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO">
         <id column="id" property="userId"/>
         <result column="REAL_NAME" property="realName"/>
         <result column="IDENTITY_NO" property="identityNo"/>
@@ -99,7 +99,7 @@
         <result column="DWELLING_PLACE" property="dwellingPlace"/>
         <result column="PARTY_FLAG" property="partyFlag"/>
         <result column="state" property="state"/>
-        <collection property="gridList" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDto" >
+        <collection property="gridList" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDTO" >
             <result column="completeName" property="completeName"/>
             <result column="leaderFlag" property="leaderFlag"/>
         </collection>