Merge remote-tracking branch 'remotes/origin/dev'

epmet-auth/src/main/resources/bootstrap.yml

@@ -145,7 +145,7 @@ thirdplat:
     appkey: @thirdplat.jcet.g.appkey@
     appsecret: @thirdplat.jcet.g.appsecret@
   pyld:
-    domain: https://epmet-ext9.elinkservice.cn/platform
+    domain: https://epmet-ext1-py.elinkservice.cn/platform
     appId: 7a5aec009ba4eba8e254ee64fe3775e1
     appKey: 14faef9af508d1c253b720ea5a43f9de
     appSecret: 38e7c2604c8dd33c445705d25eebbfc12a2f7ed8a87111e9e10a40312d3a1595

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@@ -8,10 +8,7 @@ import com.epmet.dto.form.CreatedTimeByUserIdFormDTO;
 import com.epmet.dto.form.StaffRoleFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
-import com.epmet.dto.result.CertifiedResultDTO;
-import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
-import com.epmet.dto.result.GovStaffRoleResultDTO;
-import com.epmet.dto.result.UserResiInfoResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -89,4 +86,14 @@ public interface EpmetUserFeignClient {
 	 */
 	@PostMapping("/epmetuser/staffrole/staffsinrole")
 	Result<List<GovStaffRoleResultDTO>> getStaffsInRole(@RequestBody StaffRoleFormDTO staffRoleFormDTO);
+
+	/**
+	 * 获取用户居民权限
+	 * @author zhaoqifeng
+	 * @date 2021/4/22 14:41 
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UserRoleResultDTO>
+	 */
+	@PostMapping("/epmetuser/userrole/getresidentrole")
+	Result<UserRoleResultDTO> getUserResidentRole(@RequestBody UserResiInfoFormDTO formDTO);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -9,10 +9,7 @@ import com.epmet.dto.form.CreatedTimeByUserIdFormDTO;
 import com.epmet.dto.form.StaffRoleFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
-import com.epmet.dto.result.CertifiedResultDTO;
-import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
-import com.epmet.dto.result.GovStaffRoleResultDTO;
-import com.epmet.dto.result.UserResiInfoResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -59,4 +56,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
 	public Result<List<GovStaffRoleResultDTO>> getStaffsInRole(StaffRoleFormDTO staffRoleFormDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffsInRole", staffRoleFormDTO);
 	}
+
+	@Override
+	public Result<UserRoleResultDTO> getUserResidentRole(UserResiInfoFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResidentRole", formDTO);
+	}
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -565,8 +565,11 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
 		userResiInfoFormDTO.setCustomerId(partyMemberInfoDTO.getCustomerId());
 		userResiInfoFormDTO.setUserId(partyMemberInfoDTO.getUserId());
-		Result<UserResiInfoResultDTO> userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
-		if (userResiInfoResult.success() && null == userResiInfoResult.getData()) {
+		Result<UserRoleResultDTO> residentRoleResult = epmetUserFeignClient.getUserResidentRole(userResiInfoFormDTO);
+		if (!residentRoleResult.success()) {
+			throw new RenException(residentRoleResult.getCode(), residentRoleResult.getMsg());
+		}
+		if (residentRoleResult.success() && null == residentRoleResult.getData()) {
 			UserResiInfoDTO userResiInfoDTO = ConvertUtils.sourceToTarget(partyMemberInfoDTO, UserResiInfoDTO.class);
 			userResiInfoDTO.setRegMobile(partyMemberInfoDTO.getMobile());
 			userResiInfoDTO.setResiVisitId(partyMemberInfoDTO.getPartymemberVisitId());

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

@@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 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.excel.UserRoleExcel;
@@ -132,4 +133,16 @@ public class UserRoleController {
 	public Result<List<UserRoleResultDTO>> getUserRoleInfoByUserId(@PathVariable("userId") String userId) {
 		return userRoleService.getUserRoleInfoByUserId(userId);
 	}
+
+	/**
+	 * 获取用户居民权限
+	 * @author zhaoqifeng
+	 * @date 2021/4/22 14:41
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UserRoleResultDTO>
+	 */
+	@PostMapping("getresidentrole")
+	public Result<UserRoleResultDTO> getUserResidentRole(@RequestBody UserResiInfoFormDTO formDTO) {
+		return new Result<UserRoleResultDTO>().ok(userRoleService.getUserResidentRole(formDTO.getCustomerId(), formDTO.getUserId()));
+	}
 }

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

@@ -81,4 +81,14 @@ public interface UserRoleDao extends BaseDao<UserRoleEntity> {
      * @date 2020/11/18 上午10:50
      */
     List<PartyMemberUserIdsResultDTO> selectPartyMemberUserIds();
+
+    /**
+     * 获取居民权限
+     * @author zhaoqifeng
+     * @date 2021/4/22 10:44
+     * @param customerId
+     * @param userId
+     * @return java.util.List<com.epmet.dto.result.UserRoleResultDTO>
+     */
+    UserRoleResultDTO selectResidentRole(@Param("customerId") String customerId, @Param("userId") String userId);
 }

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

@@ -122,4 +122,14 @@ public interface UserRoleService extends BaseService<UserRoleEntity> {
      * @Date 14:24 2020-07-23
      **/
 	Result<List<UserRoleResultDTO>> getUserRoleInfoByUserId(String userId);
+
+	/**
+	 * 获取用户居民权限
+	 * @author zhaoqifeng
+	 * @date 2021/4/22 10:48
+	 * @param customerId
+	 * @param userId
+	 * @return com.epmet.dto.result.UserRoleResultDTO
+	 */
+	UserRoleResultDTO getUserResidentRole(String customerId, String userId);
 }

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

@@ -138,4 +138,18 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
 		return new Result<List<UserRoleResultDTO>>().ok(list);
 	}
 
+	/**
+	 * 获取用户居民权限
+	 *
+	 * @param customerId
+	 * @param userId
+	 * @return com.epmet.dto.result.UserRoleResultDTO
+	 * @author zhaoqifeng
+	 * @date 2021/4/22 10:48
+	 */
+	@Override
+	public UserRoleResultDTO getUserResidentRole(String customerId, String userId) {
+		return baseDao.selectResidentRole(customerId, userId);
+	}
+
 }

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

@@ -111,5 +111,19 @@
           AND er.DEL_FLAG = 0
           AND er.ROLE_KEY = 'partymember'
     </select>
+    <select id="selectResidentRole" resultType="com.epmet.dto.result.UserRoleResultDTO">
+        SELECT
+            er.ROLE_NAME,
+            er.ROLE_KEY
+        FROM
+            USER_ROLE ur
+                JOIN EPMET_ROLE er ON ur.ROLE_ID = er.ID
+                AND er.ROLE_KEY = 'registered_resi'
+        WHERE
+            er.DEL_FLAG = 0
+          AND ur.DEL_FLAG = 0
+          AND ur.USER_ID = #{userId}
+          AND ur.CUSTOMER_ID = #{customerId}
+    </select>
 
 </mapper>