重名修改

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java → epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/NewUserRoleResultDTO.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @DESC
  */
 @Data
-public class UserRoleResultDTO implements Serializable {
+public class NewUserRoleResultDTO implements Serializable {
 
     private static final long serialVersionUID = -7761042062413503637L;
 
@@ -31,7 +31,7 @@ public class UserRoleResultDTO implements Serializable {
      */
     private Boolean selected;
 
-    public UserRoleResultDTO() {
+    public NewUserRoleResultDTO() {
         this.roleId = "";
         this.roleKey = "";
         this.roleName = "";

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java

@@ -6,7 +6,7 @@ import com.epmet.dto.form.GetStaffExistRoleFormDTO;
 import com.epmet.dto.form.InitDefaultOperationsFormDTO;
 import com.epmet.dto.form.ListOpePermsFormDTO;
 import com.epmet.dto.form.RoleUserFormDTO;
-import com.epmet.dto.result.UserRoleResultDTO;
+import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.feign.fallback.GovAccessFeignClientFallBackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -50,6 +50,6 @@ public interface GovAccessFeignClient {
      * @date 2022/7/13 09:59
      */
     @PostMapping("/gov/access/govroleuser/getStaffExistRole")
-    Result<List<UserRoleResultDTO>> getStaffExistRole(@RequestBody GetStaffExistRoleFormDTO formDTO);
+    Result<List<NewUserRoleResultDTO>> getStaffExistRole(@RequestBody GetStaffExistRoleFormDTO formDTO);
 
 }

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java

@@ -7,7 +7,7 @@ import com.epmet.dto.form.GetStaffExistRoleFormDTO;
 import com.epmet.dto.form.InitDefaultOperationsFormDTO;
 import com.epmet.dto.form.ListOpePermsFormDTO;
 import com.epmet.dto.form.RoleUserFormDTO;
-import com.epmet.dto.result.UserRoleResultDTO;
+import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.feign.GovAccessFeignClient;
 
 import java.util.List;
@@ -37,7 +37,7 @@ public class GovAccessFeignClientFallBack implements GovAccessFeignClient {
     }
 
     @Override
-    public Result<List<UserRoleResultDTO>> getStaffExistRole(GetStaffExistRoleFormDTO formDTO) {
+    public Result<List<NewUserRoleResultDTO>> getStaffExistRole(GetStaffExistRoleFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getStaffExistRole", formDTO);
     }
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java

@@ -27,7 +27,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.GovRoleUserDTO;
 import com.epmet.dto.form.GetStaffExistRoleFormDTO;
 import com.epmet.dto.form.RoleUserFormDTO;
-import com.epmet.dto.result.UserRoleResultDTO;
+import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.service.GovRoleUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -151,8 +151,8 @@ public class GovRoleUserController {
      * @date 2022/7/13 09:59
      */
     @PostMapping("getStaffExistRole")
-    public Result<List<UserRoleResultDTO>> getStaffExistRole(@RequestBody GetStaffExistRoleFormDTO formDTO){
+    public Result<List<NewUserRoleResultDTO>> getStaffExistRole(@RequestBody GetStaffExistRoleFormDTO formDTO){
-        return new Result<List<UserRoleResultDTO>>().ok(govRoleUserService.getStaffExistRole(formDTO));
+        return new Result<List<NewUserRoleResultDTO>>().ok(govRoleUserService.getStaffExistRole(formDTO));
     }
 
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java

@@ -9,7 +9,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.result.UserRoleResultDTO;
+import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.entity.GovRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -31,6 +31,6 @@ public interface GovRoleDao extends BaseDao<GovRoleEntity> {
      * @author zxc
      * @date 2022/7/13 10:09
      */
-    List<UserRoleResultDTO> getCustomerRoles(@Param("customerId")String customerId);
+    List<NewUserRoleResultDTO> getCustomerRoles(@Param("customerId")String customerId);
 
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java

@@ -22,7 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.GovRoleUserDTO;
 import com.epmet.dto.form.GetStaffExistRoleFormDTO;
 import com.epmet.dto.form.RoleUserFormDTO;
-import com.epmet.dto.result.UserRoleResultDTO;
+import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.entity.GovRoleUserEntity;
 
 import java.util.List;
@@ -148,5 +148,5 @@ public interface GovRoleUserService extends BaseService<GovRoleUserEntity> {
      * @author zxc
      * @date 2022/7/13 09:59
      */
-    List<UserRoleResultDTO> getStaffExistRole(GetStaffExistRoleFormDTO formDTO);
+    List<NewUserRoleResultDTO> getStaffExistRole(GetStaffExistRoleFormDTO formDTO);
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java

@@ -29,7 +29,7 @@ import com.epmet.dao.GovRoleUserDao;
 import com.epmet.dto.GovRoleUserDTO;
 import com.epmet.dto.form.GetStaffExistRoleFormDTO;
 import com.epmet.dto.form.RoleUserFormDTO;
-import com.epmet.dto.result.UserRoleResultDTO;
+import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.entity.GovRoleUserEntity;
 import com.epmet.redis.GovRoleUserRedis;
 import com.epmet.service.GovRoleUserService;
@@ -191,8 +191,8 @@ public class GovRoleUserServiceImpl extends BaseServiceImpl<GovRoleUserDao, GovR
      * @date 2022/7/13 09:59
      */
     @Override
-    public List<UserRoleResultDTO> getStaffExistRole(GetStaffExistRoleFormDTO formDTO) {
+    public List<NewUserRoleResultDTO> getStaffExistRole(GetStaffExistRoleFormDTO formDTO) {
-        List<UserRoleResultDTO> result = new ArrayList<>();
+        List<NewUserRoleResultDTO> result = new ArrayList<>();
         result = govRoleDao.getCustomerRoles(formDTO.getCustomerId());
         if (CollectionUtils.isEmpty(result)){
             return result;
@@ -202,7 +202,7 @@ public class GovRoleUserServiceImpl extends BaseServiceImpl<GovRoleUserDao, GovR
             return result;
         }
         for (String id : roleIdList) {
-            for (UserRoleResultDTO r : result) {
+            for (NewUserRoleResultDTO r : result) {
                 if (id.equals(r.getRoleId())){
                     r.setSelected(true);
                 }

epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleDao.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.epmet.dao.GovRoleDao">
 
     <!-- 获取客户下所有角色 -->
-    <select id="getCustomerRoles" resultType="com.epmet.dto.result.UserRoleResultDTO">
+    <select id="getCustomerRoles" resultType="com.epmet.dto.result.NewUserRoleResultDTO">
         SELECT
             ID AS roleId,
             `name` AS roleName,

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java

@@ -28,7 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
-import com.epmet.dto.result.UserRoleResultDTO;
+import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.excel.UserRoleExcel;
 import com.epmet.service.UserRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -102,7 +102,7 @@ public class UserRoleController {
 	 * @Date 2020.03.30 15:35
 	 **/
 	@PostMapping("getuserroleinfo")
-	public Result<List<UserRoleResultDTO>> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO) {
+	public Result<List<NewUserRoleResultDTO>> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO) {
 
 		ValidatorUtils.validateEntity(userRoleFormDTO);
 
@@ -130,7 +130,7 @@ public class UserRoleController {
 	 * @Date 14:24 2020-07-23
 	 **/
 	@GetMapping(value = "getuserroleinfobyuserid/{userId}")
-	public Result<List<UserRoleResultDTO>> getUserRoleInfoByUserId(@PathVariable("userId") String userId) {
+	public Result<List<NewUserRoleResultDTO>> getUserRoleInfoByUserId(@PathVariable("userId") String userId) {
 		return userRoleService.getUserRoleInfoByUserId(userId);
 	}
 
@@ -153,7 +153,7 @@ public class UserRoleController {
 	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UserRoleResultDTO>
 	 */
 	@PostMapping("getresidentrole")
-	public Result<UserRoleResultDTO> getUserResidentRole(@RequestBody UserResiInfoFormDTO formDTO) {
+	public Result<NewUserRoleResultDTO> getUserResidentRole(@RequestBody UserResiInfoFormDTO formDTO) {
-		return new Result<UserRoleResultDTO>().ok(userRoleService.getUserResidentRole(formDTO.getCustomerId(), formDTO.getUserId()));
+		return new Result<NewUserRoleResultDTO>().ok(userRoleService.getUserResidentRole(formDTO.getCustomerId(), formDTO.getUserId()));
 	}
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java

@@ -21,7 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.GetRoleKeyListFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
 import com.epmet.dto.result.PartyMemberUserIdsResultDTO;
-import com.epmet.dto.result.UserRoleResultDTO;
+import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.entity.UserRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -43,7 +43,7 @@ public interface UserRoleDao extends BaseDao<UserRoleEntity> {
      * @Author wangc
      * @Date 2020.03.30 15:35
      **/
-    List<UserRoleResultDTO> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
+    List<NewUserRoleResultDTO> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
 
     /**
      * @Description 根据用户Id、网格Id、客户Id查询用户角色key列表
@@ -62,7 +62,7 @@ public interface UserRoleDao extends BaseDao<UserRoleEntity> {
      * @Author zhangyong
      * @Date 14:24 2020-07-23
      **/
-    List<UserRoleResultDTO> getUserRoleInfoByUserId(@Param("userId") String userId);
+    List<NewUserRoleResultDTO> getUserRoleInfoByUserId(@Param("userId") String userId);
 
     /**
      * @param  formDTO
@@ -96,5 +96,5 @@ public interface UserRoleDao extends BaseDao<UserRoleEntity> {
      * @param userId
      * @return java.util.List<com.epmet.dto.result.UserRoleResultDTO>
      */
-    UserRoleResultDTO selectResidentRole(@Param("customerId") String customerId, @Param("userId") String userId);
+    NewUserRoleResultDTO selectResidentRole(@Param("customerId") String customerId, @Param("userId") String userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java

@@ -22,7 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
-import com.epmet.dto.result.UserRoleResultDTO;
+import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.entity.UserRoleEntity;
 
 import java.util.List;
@@ -103,7 +103,7 @@ public interface UserRoleService extends BaseService<UserRoleEntity> {
 	 * @Author wangc
 	 * @Date 2020.03.30 15:35
 	 **/
-	Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
+	Result<List<NewUserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
 
 	/**
 	 * 添加用户角色关系
@@ -121,7 +121,7 @@ public interface UserRoleService extends BaseService<UserRoleEntity> {
      * @Author zhangyong
      * @Date 14:24 2020-07-23
      **/
-	Result<List<UserRoleResultDTO>> getUserRoleInfoByUserId(String userId);
+	Result<List<NewUserRoleResultDTO>> getUserRoleInfoByUserId(String userId);
 
 	/**
 	 * @Description  查询此人是不是党员，true是党员，false不是党员
@@ -139,5 +139,5 @@ public interface UserRoleService extends BaseService<UserRoleEntity> {
 	 * @param userId
 	 * @return com.epmet.dto.result.UserRoleResultDTO
 	 */
-	UserRoleResultDTO getUserResidentRole(String customerId, String userId);
+	NewUserRoleResultDTO getUserResidentRole(String customerId, String userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -45,6 +45,7 @@ import com.epmet.dao.StaffRoleDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.entity.CustomerStaffEntity;
 import com.epmet.entity.GovStaffRoleEntity;
 import com.epmet.entity.StaffRoleEntity;
@@ -289,7 +290,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         resultDTO.setRoleList(staffRoleList);
         // 获取新角色
         GetStaffExistRoleFormDTO getStaffExistRoleFormDTO = ConvertUtils.sourceToTarget(fromDTO, GetStaffExistRoleFormDTO.class);
-        Result<List<UserRoleResultDTO>> staffExistRole = govAccessFeignClient.getStaffExistRole(getStaffExistRoleFormDTO);
+        Result<List<NewUserRoleResultDTO>> staffExistRole = govAccessFeignClient.getStaffExistRole(getStaffExistRoleFormDTO);
         if (!staffExistRole.success()){
             throw new EpmetException("getStaffExistRole method is failure");
         }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java

@@ -36,7 +36,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
-import com.epmet.dto.result.UserRoleResultDTO;
+import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.entity.RegisterRelationEntity;
 import com.epmet.entity.UserCustomerEntity;
 import com.epmet.feign.GovOrgFeignClient;
@@ -324,9 +324,9 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         userRoleFormDTO.setUserId(enterGridFormDTO.getUserId());
         userRoleFormDTO.setCustomerId(enterGridFormDTO.getCustomerId());
         userRoleFormDTO.setGridId(enterGridFormDTO.getGridId());
-        List<UserRoleResultDTO> roleList =  userRoleDao.getUserRoleInfo(userRoleFormDTO);
+        List<NewUserRoleResultDTO> roleList =  userRoleDao.getUserRoleInfo(userRoleFormDTO);
         List<String> roleListString = new ArrayList<>();
-        for(UserRoleResultDTO role : roleList){
+        for(NewUserRoleResultDTO role : roleList){
             roleListString.add(role.getRoleKey());
         }
         resultObj.setUserRoleList(roleListString);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -464,7 +464,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         UserRoleFormDTO roleParam = new UserRoleFormDTO();
         roleParam.setGridId(currentGrid.getGridId());
         roleParam.setUserId(param.getUserId());
-        List<UserRoleResultDTO> roleList = userRoleDao.getUserRoleInfo(roleParam);
+        List<NewUserRoleResultDTO> roleList = userRoleDao.getUserRoleInfo(roleParam);
         List<ExtRoleMapResultDTO> roleListFormat = new LinkedList<>();
         if(null != roleList && !roleList.isEmpty()){
             roleList.forEach(role -> {

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java

@@ -29,7 +29,7 @@ import com.epmet.dao.UserRoleDao;
 import com.epmet.dto.RoleDTO;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
-import com.epmet.dto.result.UserRoleResultDTO;
+import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.entity.UserRoleEntity;
 import com.epmet.service.RoleService;
 import com.epmet.service.UserRoleService;
@@ -114,8 +114,8 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
 	 * @Date 2020.03.30 15:35
 	 **/
 	@Override
-	public Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) {
+	public Result<List<NewUserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) {
-		return new Result<List<UserRoleResultDTO>>().ok(baseDao.getUserRoleInfo(userRoleFormDTO));
+		return new Result<List<NewUserRoleResultDTO>>().ok(baseDao.getUserRoleInfo(userRoleFormDTO));
 	}
 
 	@Override
@@ -131,9 +131,9 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
 	}
 
 	@Override
-	public Result<List<UserRoleResultDTO>> getUserRoleInfoByUserId(String userId) {
+	public Result<List<NewUserRoleResultDTO>> getUserRoleInfoByUserId(String userId) {
-		List<UserRoleResultDTO> list = baseDao.getUserRoleInfoByUserId(userId);
+		List<NewUserRoleResultDTO> list = baseDao.getUserRoleInfoByUserId(userId);
-		return new Result<List<UserRoleResultDTO>>().ok(list);
+		return new Result<List<NewUserRoleResultDTO>>().ok(list);
 	}
 
 	/**
@@ -158,7 +158,7 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
 	 * @date 2021/4/22 10:48
 	 */
 	@Override
-	public UserRoleResultDTO getUserResidentRole(String customerId, String userId) {
+	public NewUserRoleResultDTO getUserResidentRole(String customerId, String userId) {
 		return baseDao.selectResidentRole(customerId, userId);
 	}
 

epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml

@@ -19,7 +19,7 @@
 
     <!-- 如果没有传gridId只查用户的非网格级别的身份 -->
     <select id="getUserRoleInfo" parameterType="com.epmet.dto.form.UserRoleFormDTO"
-            resultType="com.epmet.dto.result.UserRoleResultDTO">
+            resultType="com.epmet.dto.result.NewUserRoleResultDTO">
 
         SELECT
         DISTINCT
@@ -72,7 +72,7 @@
     </select>
 
     <select id="getUserRoleInfoByUserId" parameterType="java.lang.String"
-            resultType="com.epmet.dto.result.UserRoleResultDTO">
+            resultType="com.epmet.dto.result.NewUserRoleResultDTO">
         SELECT
         DISTINCT
         er.ROLE_NAME,
@@ -111,7 +111,7 @@
           AND er.DEL_FLAG = 0
           AND er.ROLE_KEY = 'partymember'
     </select>
-    <select id="selectResidentRole" resultType="com.epmet.dto.result.UserRoleResultDTO">
+    <select id="selectResidentRole" resultType="com.epmet.dto.result.NewUserRoleResultDTO">
         SELECT
             er.ROLE_NAME,
             er.ROLE_KEY