1、applyUser的checkStatus字段改为auditStatus

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IRoomClient.java

@@ -66,7 +66,7 @@ public interface IRoomClient  {
 	 * 删除 房间表
 	 */
 	@PostMapping("/getListByRoomIds")
-	List<Room> getListByRoomIds( @RequestParam List<Long> ids);
+	List<RoomVO> getListByRoomIds( @RequestParam List<Long> ids);
 
 
 }

blade-service-api/community-api/src/main/java/org/springblade/community/feign/RoomClientFallback.java

@@ -66,7 +66,7 @@ public class RoomClientFallback implements IRoomClient {
         }
 
 	@Override
-	public List<Room> getListByRoomIds(List<Long> ids) {
+	public List<RoomVO> getListByRoomIds(List<Long> ids) {
 		return new ArrayList<>();
 	}
 

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/ApplyUser.java

@@ -76,7 +76,7 @@ public class ApplyUser extends BaseEntity {
 	* 申请记录审核状态：-1：未上传，0-待审核 1-审核通过 2-审核不通过
 	*/
 		@ApiModelProperty(value = "申请记录审核状态：-1：未上传，0-待审核 1-审核通过 2-审核不通过")
-		private Integer checkState;
+		private Integer auditStatus;
 	/**
 	* i_check_state=2(审核不通过)时必填
 	*/
@@ -158,11 +158,6 @@ public class ApplyUser extends BaseEntity {
 		@ApiModelProperty(value = "小区名称")
 		private String residentialName;
 	/**
-	* 存储位置（通过该字段快速查询，所有的子节点）
-	*/
-		@ApiModelProperty(value = "存储位置（通过该字段快速查询，所有的子节点）")
-		private String orgPosition;
-	/**
 	* 住户来源创建类型，0-小程序添加 1-后台添加  2-后台导入 3-app添加
 	*/
 		@ApiModelProperty(value = "住户来源创建类型，0-小程序添加 1-后台添加  2-后台导入 3-app添加")

blade-service-api/person-api/src/main/java/org/springblade/person/dto/HouseUserDTO.java

@@ -19,6 +19,7 @@ package org.springblade.person.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.support.Query;
 import org.springblade.person.entity.HouseUser;
 
 import java.util.ArrayList;
@@ -41,4 +42,6 @@ public class HouseUserDTO extends HouseUser {
 	@ApiModelProperty("会员id")
 	private Long memberId;
 
+	private Query query;
+
 }

blade-service-api/person-api/src/main/java/org/springblade/person/dto/MemberDTO.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.person.dto;
 
+import org.springblade.core.mp.support.Query;
 import org.springblade.person.entity.Member;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -33,4 +34,8 @@ public class MemberDTO extends Member {
 
 	private Long residentialId;
 
+	private Long roomId;
+
+	private Query query;
+
 }

blade-service-api/person-api/src/main/java/org/springblade/person/entity/HouseUser.java

@@ -137,6 +137,12 @@ public class HouseUser extends TenantEntity {
 	*/
 		@ApiModelProperty(value = "备注")
 		private String remark;
+
+	/**
+	 * 会员ID
+	 */
+	@ApiModelProperty(value = "会员ID")
+	private Long memberId;
 	/**
 	 * 园区Id
 	 */

blade-service-api/person-api/src/main/java/org/springblade/person/feign/HouseUserClientFallback.java

@@ -1,6 +1,8 @@
 package org.springblade.person.feign;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.plugins.Page;
+import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.person.dto.HouseUserDTO;
@@ -111,7 +113,12 @@ public class HouseUserClientFallback implements IHouseUserClient {
     }
 
 	@Override
-	public List<HouseUser> getListByMember(Long memberId, Long residentialId) {
+	public List<HouseUserVO> getListByMember(Long memberId, Long residentialId, Long roomId) {
+		return null;
+	}
+
+	@Override
+	public R<BladePage<HouseUserVO>> getPageByMember(HouseUserDTO houseUserDTO) {
 		return null;
 	}
 

blade-service-api/person-api/src/main/java/org/springblade/person/feign/IHouseUserClient.java

@@ -1,8 +1,11 @@
 package org.springblade.person.feign;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.plugins.Page;
 import io.swagger.annotations.ApiParam;
+import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
 import org.springblade.person.dto.HouseUserDTO;
 import org.springblade.person.entity.HouseUser;
 import org.springblade.person.vo.HouseUserVO;
@@ -123,6 +126,9 @@ public interface IHouseUserClient {
 	int count(@Valid @RequestBody HouseUser houseUser);
 
 	@GetMapping("/getListByMember")
-	List<HouseUser> getListByMember(@RequestParam(value = "memberId") Long memberId, @RequestParam(value = "residentialId", required = false) Long residentialId);
+	List<HouseUserVO> getListByMember(@RequestParam(value = "memberId") Long memberId, @RequestParam(value = "residentialId", required = false) Long residentialId, @RequestParam(value = "roomId") Long roomId);
+
+	@PostMapping("/getPageByMember")
+	R<BladePage<HouseUserVO>> getPageByMember(@RequestBody HouseUserDTO houseUserDTO);
 
 }

blade-service/community/src/main/java/org/springblade/community/feign/RoomClient.java

@@ -136,8 +136,8 @@ public class RoomClient implements IRoomClient {
 
 	@Override
 	@PostMapping("/getListByRoomIds")
-	public List<Room> getListByRoomIds(List<Long> ids) {
-		return roomService.getBaseMapper().selectList(new QueryWrapper<>(new Room()).lambda().in(Room::getId,ids));
+	public List<RoomVO> getListByRoomIds(List<Long> ids) {
+		return RoomWrapper.build().listVO(roomService.getBaseMapper().selectList(new QueryWrapper<>(new Room()).lambda().in(Room::getId,ids)));
 	}
 
 

blade-service/estate/src/main/java/org/springblade/estate/controller/ApplyUserController.java

@@ -143,7 +143,7 @@ public class ApplyUserController extends BladeController {
 		applyUser.setFaceUrl(confClient.removePrefix(applyUser.getFaceUrl()));
 		applyUser.setPassportImgUri(confClient.removePrefix(applyUser.getPassportImgUri()));
 		applyUser.setEntryImgUri(confClient.removePrefix(applyUser.getEntryImgUri()));
-		if (applyUser.getCheckState() == CommonConstant.UserAuditStatus.pass.getValue()) {
+		if (applyUser.getAuditStatus() == CommonConstant.UserAuditStatus.pass.getValue()) {
 			if (applyUserService.updateById(applyUser)) {
 				Long userId = applyUser.getUserId();
 				if(userId != null){ //属于针对住户重新编辑信息后审核，只需更改原住户信息即可，无需重新创建住户
@@ -191,8 +191,8 @@ public class ApplyUserController extends BladeController {
 					houseUser.setFaceUrl(applyUser.getFaceUrl());
 					houseUser.setImageMd5(applyUser.getImageMd5());
 					houseUser.setPassportImgUri(applyUser.getPassportImgUri());
-					houseUser.setOrgPosition(applyUser.getOrgPosition());
 					houseUser.setEntryImgUri(applyUser.getEntryImgUri());
+					houseUser.setMemberId(applyUser.getMemberId());
 
 					//新增房间住户数量
 					roomVO.setUserCount(roomVO.getUserCount() == null? 1 : roomVO.getUserCount() + 1);

blade-service/estate/src/main/java/org/springblade/estate/feign/ApplyUserClient.java

@@ -137,7 +137,7 @@ public class ApplyUserClient implements IApplyUserClient {
 			lambda.eq(ApplyUser::getMemberId,applyUserDTO.getMemberId());
 		}
 		if(applyUserDTO.getCheckStates().size()>0){
-			lambda.in(ApplyUser::getCheckState,applyUserDTO.getCheckStates());
+			lambda.in(ApplyUser::getAuditStatus,applyUserDTO.getCheckStates());
 		}
 		if(applyUserDTO.getRoomIds().size()>0){
 			lambda.in(ApplyUser::getRoomId,applyUserDTO.getRoomIds());
@@ -163,7 +163,7 @@ public class ApplyUserClient implements IApplyUserClient {
     	LambdaQueryWrapper<ApplyUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
     	lambdaQueryWrapper.eq(applyUserDTO.getUserId() != null, ApplyUser::getUserId, applyUserDTO.getUserId());
     	lambdaQueryWrapper.eq(applyUserDTO.getMemberId() != null, ApplyUser::getMemberId, applyUserDTO.getMemberId());
-    	lambdaQueryWrapper.eq(ApplyUser::getCheckState, applyUserDTO.getCheckState());
+    	lambdaQueryWrapper.eq(ApplyUser::getAuditStatus, applyUserDTO.getAuditStatus());
 		return applyUserService.list(lambdaQueryWrapper);
 	}
 
@@ -175,7 +175,7 @@ public class ApplyUserClient implements IApplyUserClient {
     	lambda.eq(ApplyUser::getMemberId, memberId);
     	lambda.eq(residentialId != null, ApplyUser::getResidentialId, residentialId);
     	lambda.eq( roomId!= null, ApplyUser::getRoomId, roomId);
-    	lambda.eq(auditStatus != null, ApplyUser::getCheckState, auditStatus);
+    	lambda.eq(auditStatus != null, ApplyUser::getAuditStatus, auditStatus);
 		return applyUserService.list(lambda);
 	}
 

blade-service/estate/src/main/java/org/springblade/estate/mapper/ApplyUserMapper.xml

@@ -17,7 +17,7 @@
         <result column="name" property="name"/>
         <result column="room_id" property="roomId"/>
         <result column="room_name" property="roomName"/>
-        <result column="check_state" property="checkState"/>
+        <result column="audit_status" property="auditStatus"/>
         <result column="check_opinion" property="checkOpinion"/>
         <result column="check_date" property="checkDate"/>
         <result column="type" property="type"/>
@@ -25,7 +25,7 @@
         <result column="id_card" property="idCard"/>
         <result column="passport_img_uri" property="passportImgUri"/>
         <result column="entry_img_uri" property="entryImgUri"/>
-        <result column="tel" property="tel"/>
+        <result column="phone" property="phone"/>
         <result column="sex" property="sex"/>
         <result column="unit_id" property="unitId"/>
         <result column="unit_name" property="unitName"/>
@@ -33,7 +33,6 @@
         <result column="building_name" property="buildingName"/>
         <result column="residential_id" property="residentialId"/>
         <result column="residential_name" property="residentialName"/>
-        <result column="org_position" property="orgPosition"/>
         <result column="create_type" property="createType"/>
         <result column="face_url" property="faceUrl"/>
         <result column="image_md5" property="image_md5"/>

blade-service/estate/src/main/java/org/springblade/estate/service/impl/ApplyUserServiceImpl.java

@@ -231,7 +231,7 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 		Boolean result = false;
 		ApplyUser applyUser = this.getById(condition.getId());
 
-		if (applyUser.getCheckState() == OperationConstant.ZERO) {
+		if (applyUser.getAuditStatus() == OperationConstant.ZERO) {
 			//更新记录状态
 			condition.setFaceUrl(confClient.removePrefix(condition.getFaceUrl()));
 			condition.setCheckDate(new Date());
@@ -240,7 +240,7 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 			Member member = new Member();
 			member.setId(applyUser.getMemberId());
 			//当操作是审核通过操作
-			if (result && condition.getCheckState() == 1) {
+			if (result && condition.getAuditStatus() == 1) {
 				//认证状态：{ 0：未认证，1：待审核，2：已认证 }
 				member.setState(OperationConstant.TWO);
 				HouseUser oldUser = null;
@@ -374,7 +374,6 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 			user.setAuditStatus(-1); //未上传人脸
 			user.setFaceEnable(-1); //未上传人脸
 		}
-		user.setOrgPosition(applyUser.getOrgPosition());
 		user.setSex(applyUser.getSex());
 		user.setNationality(applyUser.getNationality());
 		if (StringUtils.isNotBlank(applyUser.getPassportImgUri())) {

blade-service/person/src/main/java/org/springblade/person/feign/HouseUserClient.java

@@ -11,6 +11,7 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import org.springblade.common.constant.CommonConstant;
+import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -18,6 +19,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.enterprise.entity.Staff;
 import org.springblade.estate.entity.ApplyUser;
+import org.springblade.estate.entity.Repair;
 import org.springblade.estate.feign.IApplyUserClient;
 import org.springblade.person.dto.HouseUserDTO;
 import org.springblade.person.entity.HouseUser;
@@ -184,17 +186,30 @@ public class HouseUserClient implements IHouseUserClient {
 
 	@Override
 	@GetMapping("/getListByMember")
-	public List<HouseUser> getListByMember(@RequestParam(value = "memberId") Long memberId, @RequestParam(value = "residentialId", required = false) Long residentialId) {
-		List<ApplyUser> applyUserList = applyUserClient.getListByMember(memberId, residentialId, null, CommonConstant.UserAuditStatus.pass.getValue());
-		List<HouseUser> userList = new ArrayList<>();
-		if(applyUserList.size() > 0){
-			List<Long> userIdList = applyUserList.stream().map(ApplyUser::getUserId).collect(Collectors.toList());
-			LambdaQueryWrapper<HouseUser> lambda = new LambdaQueryWrapper<>();
-			lambda.in(HouseUser::getId, userIdList);
-			userList = houseUserService.list(lambda);
-			return userList;
-		}
-		return userList;
+	public List<HouseUserVO> getListByMember(@RequestParam(value = "memberId") Long memberId, @RequestParam(value = "residentialId", required = false) Long residentialId, @RequestParam(value = "roomId") Long roomId) {
+		LambdaQueryWrapper<HouseUser> lambda = new LambdaQueryWrapper<>();
+		lambda.eq(HouseUser::getMemberId, memberId);
+		lambda.eq(residentialId != null, HouseUser::getResidentialId, residentialId);
+		lambda.eq(roomId != null, HouseUser::getRoomId, roomId);
+		return HouserUserWrapper.build().listVO(houseUserService.list(lambda));
+//		List<ApplyUser> applyUserList = applyUserClient.getListByMember(memberId, residentialId, null, CommonConstant.UserAuditStatus.pass.getValue());
+//		List<HouseUser> userList = new ArrayList<>();
+//		if(applyUserList.size() > 0){
+//			List<Long> userIdList = applyUserList.stream().map(ApplyUser::getUserId).collect(Collectors.toList());
+//			LambdaQueryWrapper<HouseUser> lambda = new LambdaQueryWrapper<>();
+//			lambda.in(HouseUser::getId, userIdList);
+//			userList = houseUserService.list(lambda);
+//			return userList;
+//		}
+//		return userList;
+	}
+
+	@Override
+	@PostMapping("/getPageByMember")
+	public R<BladePage<HouseUserVO>> getPageByMember(@RequestBody HouseUserDTO houseUserDTO) {
+		IPage<HouseUser> houseUserIPage = this.houseUserService.page(Condition.getPage(houseUserDTO.getQuery()), Condition.getQueryWrapper(houseUserDTO));
+		IPage<HouseUserVO> houseUserVOIPage = HouserUserWrapper.build().pageVO(houseUserIPage);
+		return R.data(BladePage.of(houseUserVOIPage));
 	}
 
 

blade-service/person/src/main/java/org/springblade/person/mapper/HouseUserMapper.xml

@@ -19,7 +19,6 @@
         <result column="nation" property="nation"/>
         <result column="native_place" property="nativePlace"/>
         <result column="nationality" property="nationality"/>
-        <result column="registered_residence" property="registeredResidence"/>
         <result column="political" property="political"/>
         <result column="marital_status" property="maritalStatus"/>
         <result column="educational_level" property="educationalLevel"/>
@@ -46,7 +45,7 @@
         <result column="entry_img_uri" property="entryImgUri"/>
         <result column="passport_img_uri" property="passportImgUri"/>
         <result column="org_position" property="orgPosition"/>
-        <result column="is_member" property="isMemeber"/>
+        <result column="member_id" property="memberId"/>
         <result column="check_opinion" property="checkOpinion"/>
     </resultMap>
 

blade-service/person/src/main/java/org/springblade/person/service/impl/HouseUserServiceImpl.java

@@ -108,7 +108,7 @@ public class HouseUserServiceImpl extends BaseServiceImpl<HouseUserMapper, House
 		//查询和user有关系的会员
 		ApplyUser condition = new ApplyUser();
 		condition.setUserId(userId);
-		condition.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+		condition.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 		List<ApplyUserVO> list = this.applyUserClient.list(condition);
 		if(list!=null && list.size()>0){
 			//删除和user有关系的
@@ -119,7 +119,7 @@ public class HouseUserServiceImpl extends BaseServiceImpl<HouseUserMapper, House
 					//重新拼凑查询条件，查询与member关联的user个数
 					condition.setUserId(null);
 					condition.setMemberId(mau.getMemberId());
-					condition.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+					condition.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 					//统计
 					List<ApplyUserVO> applyUserList = this.applyUserClient.list(condition);
 					//会员已经没有了关联的住户，会员状态改为未认证

community-app-gateway/src/main/java/org/springblade/app/controller/ApplyUserController.java

@@ -244,7 +244,7 @@ public class ApplyUserController {
 		hashMap.put("result_msg", "审核失败");
 		//审核人类型：1-业主，2-后台
 		applyUser.setOperatorType(1);
-		if (applyUser.getCheckState().equals(CommonConstant.UserAuditStatus.pass.getValue())){
+		if (applyUser.getAuditStatus().equals(CommonConstant.UserAuditStatus.pass.getValue())){
 			//要审核通过的话，必须有时间和身份验证的限制
 			boolean timeRange = false;
 			try {

community-app-gateway/src/main/java/org/springblade/app/controller/CarController.java

@@ -59,7 +59,7 @@ public class CarController {
 			applyUser.setMemberId(carDto.getMemberId());
 			applyUser.setName(carDto.getPersonName());
 			applyUser.setIdCard(carDto.getIdCard());
-			applyUser.setCheckState(OperationConstant.ONE);
+			applyUser.setAuditStatus(OperationConstant.ONE);
 			applyUser.setPhone(carDto.getPersonPhone());
 			ApplyUserVO applyUserVO = applyUserClient.detail(applyUser);
 			Assert.notNull(applyUserVO,"当前您未完成住户认证");

community-app-gateway/src/main/java/org/springblade/app/controller/EstateController.java

@@ -5,27 +5,28 @@ import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.springblade.app.vo.RoomVO;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.community.entity.Residential;
 import org.springblade.community.entity.Room;
 import org.springblade.community.feign.IResidentialClient;
 import org.springblade.community.feign.IRoomClient;
+import org.springblade.community.vo.RoomVO;
+import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.estate.entity.ApplyUser;
 import org.springblade.estate.feign.IApplyUserClient;
 import org.springblade.estate.vo.ApplyUserVO;
+import org.springblade.person.dto.MemberDTO;
 import org.springblade.person.entity.HouseUser;
 import org.springblade.person.feign.IHouseUserClient;
 import org.springblade.person.vo.HouseUserVO;
 import org.springblade.system.expand.entity.Conf;
 import org.springblade.system.expand.feign.IConfClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Created By lidexi in 2021/4/25
@@ -54,8 +55,8 @@ public class EstateController {
 	 *            }
 	 * @return ResultBean<hashMap> 返回结果
 	 */
-	@PostMapping(value = "/getRoomByMemberId")
-	public Map<String, Object> getRoomByMemberId(@RequestBody Map<String, String> map) {
+	@PostMapping(value = "/getRoomByMemberIdBak")
+	public Map<String, Object> getRoomByMemberIdBak(@RequestBody Map<String, String> map) {
 
 		Map<String, Object> hashMap = new HashMap<>();
 		//result_code:0-失败  1-成功
@@ -73,7 +74,7 @@ public class EstateController {
 			if (residentialId != null) {
 				applyUser.setResidentialId(Long.valueOf(residentialId));
 			}
-			applyUser.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+			applyUser.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 			List<ApplyUserVO> list = this.applyUserClient.list(applyUser);
 			if (list == null || list.size() == 0) {
 				//hashMap.put("result_msg", "没有查询到与会员对应的住户信息");
@@ -88,7 +89,7 @@ public class EstateController {
 				//查询会员对应住户
 				List<HouseUserVO> users = this.houseUserClient.getListByUserIds(userIds);
 				//查询会员对应的房间
-				List<Room> rooms = this.roomClient.getListByRoomIds(roomIds);
+				List<RoomVO> rooms = this.roomClient.getListByRoomIds(roomIds);
 				if (rooms == null || rooms.size() == 0) {
 					hashMap.put("result_msg", "没有相关房屋信息");
 				} else {
@@ -104,19 +105,19 @@ public class EstateController {
 								Integer doorNeedAudit = 1;
 								if (residential != null) {
 									doorNeedAudit = residential.getDoorNeedAudit();
-									roomVO.setDoorNeedAudit(doorNeedAudit);
-									roomVO.setPersonTel(residential.getPersonPhone());
+//									roomVO.setDoorNeedAudit(doorNeedAudit);
+//									roomVO.setPersonTel(residential.getPersonPhone());
 								}
-								roomVO.setRelationshipType(user.getType());
+//								roomVO.setRelationshipType(user.getType());
 								roomVO.setResidentialId(user.getResidentialId());
 								if (StringUtils.isNotBlank(user.getFaceUrl())) {
-									roomVO.setImageUri(user.getFaceUrl());
+//									roomVO.setImageUri(user.getFaceUrl());
 								}
-								roomVO.setUserId(user.getId());
-								roomVO.setIdcard(user.getIdCard());
-								roomVO.setFaceBeginDate(user.getFaceBeginDate());
-								roomVO.setFaceEndDate(user.getFaceEndDate());
-								roomVO.setFaceEnable(user.getFaceEnable());
+//								roomVO.setUserId(user.getId());
+//								roomVO.setIdcard(user.getIdCard());
+//								roomVO.setFaceBeginDate(user.getFaceBeginDate());
+//								roomVO.setFaceEndDate(user.getFaceEndDate());
+//								roomVO.setFaceEnable(user.getFaceEnable());
 								if (user.getFaceEndDate() != null) {
 									Conf searchConf = new Conf();
 									searchConf.setConfToken("expire.notice.days");
@@ -124,7 +125,7 @@ public class EstateController {
 									if (conf != null) {
 										Integer days = Integer.parseInt(conf.getConfValue());
 										int compare = DateUtil.compare(DateUtil.offsetDay(new Date(), days), user.getFaceEndDate());
-										roomVO.setFaceValid(compare > 0 ? false : true);
+//										roomVO.setFaceValid(compare > 0 ? false : true);
 									}
 								}
 								roomVOS.add(roomVO);
@@ -144,4 +145,19 @@ public class EstateController {
 		}
 		return hashMap;
 	}
+
+	/**
+	 * 功能描述: 通过会员id获取会员的房屋列表
+	 *
+	 * @return ResultBean<hashMap> 返回结果
+	 */
+	@PostMapping(value = "/getRoomByMemberId")
+	public R<List<RoomVO>> getRoomByMemberId(@RequestBody MemberDTO memberDTO) {
+		Assert.notNull(memberDTO.getResidentialId(), "小区必传");
+		Assert.notNull(memberDTO.getId(), "会员必传");
+		List<HouseUserVO> userList = houseUserClient.getListByMember(memberDTO.getId(), memberDTO.getResidentialId(), memberDTO.getRoomId());
+		List<Long> roomIdList = userList.stream().map(HouseUser::getRoomId).collect(Collectors.toList());
+		List<RoomVO> roomList = roomClient.getListByRoomIds(roomIdList);
+		return R.data(roomList);
+	}
 }

community-app-gateway/src/main/java/org/springblade/app/controller/GuestAuthorizeController.java

@@ -59,7 +59,7 @@ public class GuestAuthorizeController {
 				return hashMap;
 			}
 			ApplyUser searchEntity = new ApplyUser();
-			searchEntity.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+			searchEntity.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 			searchEntity.setMemberId(Long.valueOf(member_id));
 			List<ApplyUserVO> list = this.applyUserClient.list(searchEntity);
 			if (list == null || list.size() == 0) {
@@ -141,7 +141,7 @@ public class GuestAuthorizeController {
 //            }
 			ApplyUser searchEntity = new ApplyUser();
 			searchEntity.setMemberId(Long.valueOf(member_id));
-			searchEntity.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+			searchEntity.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 			List<ApplyUserVO> list = this.applyUserClient.list(searchEntity);
 
 			if (list == null || list.size() == 0) {
@@ -244,7 +244,7 @@ public class GuestAuthorizeController {
 			}
 			ApplyUser applyUser = new ApplyUser();
 			applyUser.setMemberId(Long.valueOf(member_id));
-			applyUser.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+			applyUser.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 			List<ApplyUserVO> list = this.applyUserClient.list(applyUser);
 			if (list == null || list.size() == 0) {
 				hashMap.put("result_msg", "没有查询到与会员对应的住户信息");

community-app-gateway/src/main/java/org/springblade/app/controller/GuestRecordController.java

@@ -71,7 +71,7 @@ public class GuestRecordController {
 			}
 			ApplyUser applyUser = new ApplyUser();
 			applyUser.setMemberId(Long.valueOf(member_id));
-			applyUser.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+			applyUser.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 			List<ApplyUserVO> list = this.applyUserClient.list(applyUser);
 			if (list == null || list.size() == 0) {
 				hashMap.put("result_msg", "没有查询到与会员对应的住户信息");

community-app-gateway/src/main/java/org/springblade/app/controller/HouseUserController.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.constant.OperationConstant;
+import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -160,8 +161,8 @@ public class HouseUserController {
 	 *            }
 	 * @return ResultBean<hashMap> 返回结果
 	 */
-	@PostMapping(value = "/getAllUserByMemberId")
-	public Map<String, Object> getAllUserByMemberId(@RequestBody Map<String, String> map) {
+	@PostMapping(value = "/getAllUserByMemberIdBak")
+	public Map<String, Object> getAllUserByMemberIdBak(@RequestBody Map<String, String> map) {
 
 		Map<String, Object> hashMap = new HashMap<>();
 		//result_code:0-失败  1-成功
@@ -187,7 +188,7 @@ public class HouseUserController {
 			}
 			//查询会员对应的user
 			ApplyUser applyUser = new ApplyUser();
-			applyUser.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+			applyUser.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 			applyUser.setMemberId(Long.valueOf(member_id));
 			List<ApplyUserVO> applyUserVOList = applyUserClient.list(applyUser);
 //			MemberAndUser memberAndUser = new MemberAndUser();
@@ -250,6 +251,16 @@ public class HouseUserController {
 		return hashMap;
 	}
 
+	/**
+	 * 功能描述: 获取房屋成员 By  memberId
+	 */
+	@PostMapping(value = "/getRoomUserByMemberId")
+	public R<BladePage<HouseUserVO>> getRoomUserByMemberId(@RequestBody HouseUserDTO houseUserDTO) {
+		Assert.notNull(houseUserDTO.getResidentialId(), "小区必传");
+		Assert.notNull(houseUserDTO.getId(), "会员必传");
+		return houseUserClient.getPageByMember(houseUserDTO);
+	}
+
 	/**
 	 * 功能描述: 修改我的家人
 	 *
@@ -349,7 +360,7 @@ public class HouseUserController {
 
 							boolean b = houseUserClient.update(user);
 							if (b) {
-								applyUser.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+								applyUser.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 								applyUser.setUserId(user.getId());
 								applyUser.setRoomId(user.getRoomId());
 								applyUser.setOperatorType(OperationConstant.ONE);//后台审核类型
@@ -358,7 +369,7 @@ public class HouseUserController {
 								hashMap.put("result_msg", "提交修改成功");
 							}
 						} else {
-							applyUser.setCheckState(CommonConstant.UserAuditStatus.wait.getValue());
+							applyUser.setAuditStatus(CommonConstant.UserAuditStatus.wait.getValue());
 							applyUser.setUserId(user.getId());
 							applyUser.setRoomId(user.getRoomId());
 							ApplyUserVO applyUserVO = this.applyUserClient.detail(applyUser);
@@ -392,7 +403,6 @@ public class HouseUserController {
 					applyUser.setBuildingId(user.getBuildingId());
 					applyUser.setResidentialName(user.getResidentialName());
 					applyUser.setResidentialId(user.getResidentialId());
-					applyUser.setOrgPosition(user.getOrgPosition());
 					applyUser.setCreateType(Integer.valueOf(create_type));
 					applyUser.setRecordType(OperationConstant.TWO);
 					//修改的属性**********开始*******
@@ -639,7 +649,7 @@ public class HouseUserController {
 			if (StringUtil.isNotBlank(member_id)) {
 				applyUserDTO.setMemberId(Long.valueOf(member_id));
 			}
-			applyUserDTO.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+			applyUserDTO.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 			List<ApplyUser> applyUserList = applyUserClient.getByAuditStatus(applyUserDTO);
 			List<Long> idList = applyUserList.stream().map(ApplyUser::getId).collect(Collectors.toList());
 			if (idList.size() > 0) {

community-app-gateway/src/main/java/org/springblade/app/controller/IotDeviceController.java

@@ -44,7 +44,7 @@ public class IotDeviceController {
 		ApplyUser searchApplyUser = new ApplyUser();
 		searchApplyUser.setResidentialId(Long.valueOf(residential_id));
 		searchApplyUser.setMemberId(Long.valueOf(member_id));
-		searchApplyUser.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+		searchApplyUser.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 		List<ApplyUserVO> applyUsers = applyUserClient.list(searchApplyUser);
 		//提取房间id
 		List<Long> roomIds = applyUsers.stream().map(ApplyUser::getRoomId).collect(Collectors.toList());

community-app-gateway/src/main/java/org/springblade/app/controller/MemberController.java

@@ -18,10 +18,12 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.api.ResultCode;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.device.dto.DoorDeviceDTO;
 import org.springblade.device.entity.DoorDevice;
 import org.springblade.device.feign.IDoorDeviceClient;
 import org.springblade.device.vo.DoorDeviceVO;
+import org.springblade.estate.dto.ApplyUserDTO;
 import org.springblade.estate.entity.ApplyUser;
 import org.springblade.estate.entity.GuestRecord;
 import org.springblade.estate.feign.IApplyUserClient;
@@ -29,6 +31,7 @@ import org.springblade.estate.feign.IGuestRecordClient;
 import org.springblade.estate.feign.IUserAccessPermissionsClient;
 import org.springblade.estate.vo.ApplyUserVO;
 import org.springblade.estate.vo.UserAccessPermissionsVO;
+import org.springblade.person.dto.HouseUserDTO;
 import org.springblade.person.dto.MemberDTO;
 import org.springblade.person.entity.HouseUser;
 import org.springblade.person.entity.Member;
@@ -281,8 +284,8 @@ public class MemberController {
 	 *            }
 	 * @return ResultBean<hashMap> 返回结果
 	 */
-	@PostMapping(value = "/authentication")
-	public Map<String, Object> authentication(@RequestBody Map<String, String> map) {
+	@PostMapping(value = "/authenticationBak")
+	public Map<String, Object> authenticationBak(@RequestBody Map<String, String> map) {
 		Map<String, Object> hashMap = new HashMap<>();
 		//result_code:0-失败  1-成功
 		hashMap.put("result_code", 0);
@@ -390,7 +393,7 @@ public class MemberController {
 				ApplyUser applyUser = new ApplyUser();
 				applyUser.setMemberId(Long.valueOf(member_id));
 				applyUser.setRoomId(Long.valueOf(room_id));
-				applyUser.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+				applyUser.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 				List<ApplyUserVO> list = this.applyUserClient.list(applyUser);
 				if (list == null || list.size() == 0) {
 					hashMap.put("result_msg", "用户不是该房屋成员");
@@ -422,7 +425,7 @@ public class MemberController {
 			ApplyUser applyUser = new ApplyUser();
 			applyUser.setName(name);
 			applyUser.setRoomId(Long.valueOf(room_id));
-			applyUser.setCheckState(CommonConstant.UserAuditStatus.wait.getValue());
+			applyUser.setAuditStatus(CommonConstant.UserAuditStatus.wait.getValue());
 			ApplyUserVO applyUserVO = this.applyUserClient.detail(applyUser);
 			if (applyUserVO != null) {
 				hashMap.put("result_msg", "名字" + name + "已有一条申请记录处于待审核状态，请勿重复提交，等待物业审核");
@@ -456,9 +459,8 @@ public class MemberController {
 					applyUser.setMemberId(Long.valueOf(member_id));
 
 				}
-				applyUser.setCheckState(CommonConstant.UserAuditStatus.wait.getValue());
+				applyUser.setAuditStatus(CommonConstant.UserAuditStatus.wait.getValue());
 
-				applyUser.setOrgPosition(room.getOrgPosition());
 
 				applyUser.setCreateType(Integer.valueOf(create_type));
 				applyUser.setRoomName(room.getName());
@@ -484,7 +486,7 @@ public class MemberController {
 				} else if (applyUser.getRecordType() == 1) {
 					applyUser.setOperatorType(OperationConstant.ONE);//后台审核类型
 					if(applyUser.getType() == OperationConstant.ZERO){
-						applyUser.setCheckState(CommonConstant.UserAuditStatus.wait.getValue());
+						applyUser.setAuditStatus(CommonConstant.UserAuditStatus.wait.getValue());
 						boolean save = this.applyUserClient.save(applyUser);
 						if(save){
 							hashMap.put("result_code", 1);
@@ -493,7 +495,7 @@ public class MemberController {
 							hashMap.put("result_msg", "认证申请失败");
 						}
 					}else{
-						applyUser.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+						applyUser.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 						applyUser.setOperatorName(operatorName);
 						applyUser.setCheckDate(new Date());
 						if(this.applyUserClient.addApplyUserForFamily(applyUser)){
@@ -515,6 +517,29 @@ public class MemberController {
 		return hashMap;
 	}
 
+	/**
+	 * 功能描述: 会员--认证成住户 | 新增家人
+	 * @return ResultBean<hashMap> 返回结果
+	 */
+	@PostMapping(value = "/authentication")
+	public R authentication(@RequestBody ApplyUserDTO applyUserDTO) {
+		Assert.notNull(applyUserDTO.getMemberId(), "会员必传");
+		Assert.notNull(applyUserDTO.getType(), "认证住户类型必传");
+		Assert.notNull(applyUserDTO.getResidentialId(), "小区必传");
+		Assert.notNull(applyUserDTO.getRoomId(), "房间必传");
+		List<HouseUserVO> userList = houseUserClient.getListByMember(applyUserDTO.getMemberId(), applyUserDTO.getResidentialId(), applyUserDTO.getRoomId());
+		for(HouseUserVO houseUserVO : userList){
+			String name = applyUserDTO.getName();
+			String idCard = applyUserDTO.getIdCard();
+			Assert.isTrue(!(houseUserVO.getName().equals(name) && houseUserVO.getIdCard().equals(idCard)), "该住户已完成认证，请勿重复认证");
+		}
+		boolean authentication = applyUserClient.authentication(applyUserDTO);
+		if(authentication){
+			return R.status(true);
+		}
+		return R.status(false);
+	}
+
 
 	/**
 	 * 功能描述: 通过会员id获取授权的设备列表
@@ -549,7 +574,7 @@ public class MemberController {
 
 			ApplyUser searchApplyUser = new ApplyUser();
 			searchApplyUser.setMemberId(Long.valueOf(member_id));
-			searchApplyUser.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+			searchApplyUser.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 			searchApplyUser.setResidentialId(Long.valueOf(residential_id));
 			List<ApplyUserVO> list = this.applyUserClient.list(searchApplyUser);
 			if (list == null || list.size() == 0) {
@@ -661,7 +686,7 @@ public class MemberController {
 				if(user_id == null){
 					ApplyUser searchApplyUser = new ApplyUser();
 					searchApplyUser.setMemberId(Long.valueOf(member_id));
-					searchApplyUser.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+					searchApplyUser.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 					List<ApplyUserVO> list = applyUserClient.list(searchApplyUser);
 					if(list != null && list.size() >0){
 						user_id = list.get(0).getUserId().toString();
@@ -710,7 +735,7 @@ public class MemberController {
 			Assert.notNull(guestRecord, "访客记录不存在，请重新登记");
 			return doorDeviceClient.remoteOpenDoor(guestRecord.getId().toString(), guestRecord.getGuestName(), CommonConstant.UserFlag.GUEST_FLAG.getValue(), openDoorDto.getSerialNum(), openDoorDto.getDeviceFactory(), true);
 		}else if(CommonConstant.UserFlag.HOUSE_USER_FLAG.getValue().equals(openDoorDto.getUserType())){
-			List<HouseUser> houseUserList = houseUserClient.getListByMember(openDoorDto.getMemberId(), openDoorDto.getResidentialId());
+			List<HouseUserVO> houseUserList = houseUserClient.getListByMember(openDoorDto.getMemberId(), openDoorDto.getResidentialId(), openDoorDto.getRoomId());
 			Assert.notEmpty(houseUserList, "设备所在小区无住户");
 			HouseUser one = houseUserList.get(0);
 			return doorDeviceClient.remoteOpenDoor(one.getId().toString(), one.getName(), CommonConstant.UserFlag.HOUSE_USER_FLAG.getValue(), openDoorDto.getSerialNum(), openDoorDto.getDeviceFactory(), true);

community-app-gateway/src/main/java/org/springblade/app/controller/MiniProgramController.java

@@ -170,7 +170,7 @@ public class MiniProgramController {
 
 			ApplyUser applyUser = new ApplyUser();
 			applyUser.setMemberId(memberVO.getId());
-			applyUser.setCheckState(CommonConstant.UserAuditStatus.pass.getValue());
+			applyUser.setAuditStatus(CommonConstant.UserAuditStatus.pass.getValue());
 			boolean anyHousePass = false;
 			List<ApplyUserVO> applyUserVOList = applyUserClient.list(applyUser);
 			if (applyUserVOList != null && applyUserVOList.size() > 0){

community-app-gateway/src/main/java/org/springblade/app/controller/ResidentialController.java

@@ -7,6 +7,14 @@ import org.apache.commons.lang.StringUtils;
 import org.springblade.community.entity.Residential;
 import org.springblade.community.feign.IResidentialClient;
 import org.springblade.community.vo.ResidentialVO;
+import org.springblade.community.vo.RoomVO;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.person.dto.MemberDTO;
+import org.springblade.person.entity.HouseUser;
+import org.springblade.person.feign.IHouseUserClient;
+import org.springblade.person.vo.HouseUserVO;
+import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,6 +24,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Created By lidexi in 2021/4/25
@@ -28,6 +37,7 @@ import java.util.Map;
 public class ResidentialController {
 
 	private final IResidentialClient residentialClient;
+	private final IHouseUserClient houseUserClient;
 
 	/**
 	 * 功能描述: 通过区编号获取小区列表--国家标准省市区编号
@@ -72,4 +82,18 @@ public class ResidentialController {
 		}
 		return hashMap;
 	}
+
+	/**
+	 * 功能描述: 通过会员id获取会员的房屋列表
+	 *
+	 * @return ResultBean<hashMap> 返回结果
+	 */
+	@PostMapping(value = "/getResidentialListByMember")
+	public R<List<Residential>> getResidentialListByMember(@RequestBody MemberDTO memberDTO) {
+		Assert.notNull(memberDTO.getId(), "会员必传");
+		List<HouseUserVO> userList = houseUserClient.getListByMember(memberDTO.getId(), memberDTO.getResidentialId(), memberDTO.getRoomId());
+		List<Long> residentialIdList = userList.stream().map(HouseUser::getResidentialId).distinct().collect(Collectors.toList());
+		List<Residential> residentialList = residentialClient.listByIds(Func.join(residentialIdList));
+		return R.data(residentialList);
+	}
 }

community-app-gateway/src/main/java/org/springblade/app/dto/OpenDoorDto.java

@@ -16,6 +16,8 @@ public class OpenDoorDto {
 
 	private Long residentialId;
 
+	private Long roomId;
+
 	/**
 	 * ZH_ 住户
 	 * FK_ 访客