Merge remote-tracking branch 'origin/master' into master

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

@@ -43,110 +43,111 @@ public class GuestRecord extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 访客名称
-	*/
-		@ApiModelProperty(value = "访客名称")
-		private String guestName;
-	/**
-	* 手机号
-	*/
-		@ApiModelProperty(value = "手机号")
-		private String guestTel;
-	/**
-	* 性别  0-未定义  1-男 2-女
-	*/
-		@ApiModelProperty(value = "性别  0-未定义  1-男 2-女")
-		private Integer guestSex;
-	/**
-	* 访问缘由
-	*/
-		@ApiModelProperty(value = "访问缘由")
-		private String guestReason;
-	/**
-	* 所属园区id
-	*/
-		@ApiModelProperty(value = "所属园区id")
-		private Long agencyId;
-	/**
-	* 所属园区名称
-	*/
-		@ApiModelProperty(value = "所属园区名称")
-		private String agencyName;
-	/**
-	* 所属小区id
-	*/
-		@ApiModelProperty(value = "所属小区id")
-		private Long residentialId;
-	/**
-	* 小区名称
-	*/
-		@ApiModelProperty(value = "小区名称")
-		private String residentialName;
-	/**
-	* 楼栋id
-	*/
-		@ApiModelProperty(value = "楼栋id")
-		private Long buildingId;
-	/**
-	* 楼栋名称
-	*/
-		@ApiModelProperty(value = "楼栋名称")
-		private String buildingName;
-	/**
-	* 所属单元id
-	*/
-		@ApiModelProperty(value = "所属单元id")
-		private Long unitId;
-	/**
-	* 单元名称
-	*/
-		@ApiModelProperty(value = "单元名称")
-		private String unitName;
-	/**
-	* 所属房间id
-	*/
-		@ApiModelProperty(value = "所属房间id")
-		private Long roomId;
-	/**
-	* 所属房间名称
-	*/
-		@ApiModelProperty(value = "所属房间名称")
-		private String roomName;
-	/**
-	* 要访问的住户姓名
-	*/
-		@ApiModelProperty(value = "要访问的住户姓名")
-		private String userName;
-	/**
-	* 访问的住户的id
-	*/
-		@ApiModelProperty(value = "访问的住户的id")
-		private Long userId;
-	/**
-	* 企业id
-	*/
-		@ApiModelProperty(value = "企业id")
-		private Long enterpriseId;
-	/**
-	* 企业名称
-	*/
-		@ApiModelProperty(value = "企业名称")
-		private String enterpriseName;
-	/**
-	* 存储位置（通过该字段快速查询，所有的子节点）
-	*/
-		@ApiModelProperty(value = "存储位置（通过该字段快速查询，所有的子节点）")
-		private String orgPosition;
-	/**
-	* 审核状态：0-待审核 1-审核通过 2-审核不通过
-	*/
-		@ApiModelProperty(value = "审核状态：0-待审核 1-审核通过 2-审核不通过")
-		private Integer auditStatus;
-	/**
-	* 脸部照片url（没有域名）
-	*/
-		@ApiModelProperty(value = "脸部照片url（没有域名）")
-		private String faceUrl;
+	 * 访客名称
+	 */
+	@ApiModelProperty(value = "访客名称")
+	private String guestName;
+	/**
+	 * 手机号
+	 */
+	@ApiModelProperty(value = "手机号")
+	private String guestTel;
+	/**
+	 * 性别  0-未定义  1-男 2-女
+	 */
+	@ApiModelProperty(value = "性别  0-未定义  1-男 2-女")
+	private Integer guestSex;
+	/**
+	 * 访问缘由
+	 */
+	@ApiModelProperty(value = "访问缘由")
+	private String guestReason;
+	/**
+	 * 所属园区id
+	 */
+	@ApiModelProperty(value = "所属园区id")
+	private Long agencyId;
+	/**
+	 * 所属园区名称
+	 */
+	@ApiModelProperty(value = "所属园区名称")
+	private String agencyName;
+	/**
+	 * 所属小区id
+	 */
+	@ApiModelProperty(value = "所属小区id")
+	private Long residentialId;
+	/**
+	 * 小区名称
+	 */
+	@ApiModelProperty(value = "小区名称")
+	private String residentialName;
+	/**
+	 * 楼栋id
+	 */
+	@ApiModelProperty(value = "楼栋id")
+	private Long buildingId;
+	/**
+	 * 楼栋名称
+	 */
+	@ApiModelProperty(value = "楼栋名称")
+	private String buildingName;
+	/**
+	 * 所属单元id
+	 */
+	@ApiModelProperty(value = "所属单元id")
+	private Long unitId;
+	/**
+	 * 单元名称
+	 */
+	@ApiModelProperty(value = "单元名称")
+	private String unitName;
+	/**
+	 * 所属房间id
+	 */
+	@ApiModelProperty(value = "所属房间id")
+	private Long roomId;
+	/**
+	 * 所属房间名称
+	 */
+	@ApiModelProperty(value = "所属房间名称")
+	private String roomName;
+	/**
+	 * 要访问的住户姓名
+	 */
+	@ApiModelProperty(value = "要访问的住户姓名")
+	private String userName;
+	/**
+	 * 访问的住户的id
+	 * 社区传memberId
+	 */
+	@ApiModelProperty(value = "访问的住户的id")
+	private Long userId;
+	/**
+	 * 企业id
+	 */
+	@ApiModelProperty(value = "企业id")
+	private Long enterpriseId;
+	/**
+	 * 企业名称
+	 */
+	@ApiModelProperty(value = "企业名称")
+	private String enterpriseName;
+	/**
+	 * 存储位置（通过该字段快速查询，所有的子节点）
+	 */
+	@ApiModelProperty(value = "存储位置（通过该字段快速查询，所有的子节点）")
+	private String orgPosition;
+	/**
+	 * 审核状态：0-待审核 1-审核通过 2-审核不通过
+	 */
+	@ApiModelProperty(value = "审核状态：0-待审核 1-审核通过 2-审核不通过")
+	private Integer auditStatus;
+	/**
+	 * 脸部照片url（没有域名）
+	 */
+	@ApiModelProperty(value = "脸部照片url（没有域名）")
+	private String faceUrl;
 
 	/**
 	 * 人脸md5
@@ -154,25 +155,25 @@ public class GuestRecord extends BaseEntity {
 	@ApiModelProperty(value = "人脸md5")
 	private String imageMd5;
 	/**
-	* openId
-	*/
-		@ApiModelProperty(value = "openId")
-		private String openId;
+	 * openId
+	 */
+	@ApiModelProperty(value = "openId")
+	private String openId;
 	/**
-	* 访问时间
-	*/
-		@ApiModelProperty(value = "访问时间")
-		private String interviewTime;
+	 * 访问时间
+	 */
+	@ApiModelProperty(value = "访问时间")
+	private String interviewTime;
 	/**
-	* 身份证
-	*/
-		@ApiModelProperty(value = "身份证")
-		private String guestIdcard;
+	 * 身份证
+	 */
+	@ApiModelProperty(value = "身份证")
+	private String guestIdcard;
 	/**
-	* 审核意见
-	*/
-		@ApiModelProperty(value = "审核意见")
-		private String opinion;
+	 * 审核意见
+	 */
+	@ApiModelProperty(value = "审核意见")
+	private String opinion;
 
 
 	/**
@@ -207,15 +208,18 @@ public class GuestRecord extends BaseEntity {
 	@ApiModelProperty(value = "登记来源")
 	private Integer registerSource;
 
-	@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "预约开始时间")
 	private Date beginTime;
 
-	@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "预约结束时间")
 	private Date endTime;
 
+	@ApiModelProperty("0社区，1园区")
+	private Integer tenantType;
+
 
 }

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

@@ -30,6 +30,11 @@ public class GuestRecordClientFallback implements IGuestRecordClient {
             return null;
         }
 
+	@Override
+	public Integer count(GuestRecord guestRecord) {
+		return null;
+	}
+
 	@Override
 	public BladePage<GuestRecordVO> page(GuestRecordDTO guestRecord) {
 		return null;

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

@@ -36,7 +36,14 @@ public interface IGuestRecordClient {
 	 * 查询
 	 */
 	@GetMapping("/list")
-    List<GuestRecordVO> list(@SpringQueryMap GuestRecord guestRecord);
+	List<GuestRecordVO> list(@SpringQueryMap GuestRecord guestRecord);
+
+
+	/**
+	 * 查询
+	 */
+	@GetMapping("/count")
+	Integer count(@SpringQueryMap GuestRecord guestRecord);
 
 	/**
 	 * 查询

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

@@ -24,8 +24,9 @@ import org.springblade.estate.service.IGuestRecordService;
 import org.springblade.core.mp.support.Query;
 
 import java.util.List;
+
 /**
- *  client
+ * client
  *
  * @author lianghanqiang
  * @since 2021-03-30
@@ -37,27 +38,32 @@ import java.util.List;
 
 public class GuestRecordRecordClient implements IGuestRecordClient {
 
-    private final IGuestRecordService guestService;
+	private final IGuestRecordService guestService;
 
-        /**
-     * 详情
-     */
-    @Override
-    @GetMapping("/detail")
-    public GuestRecordVO detail(@SpringQueryMap GuestRecord guestRecord) {
-        GuestRecord detail = guestService.getOne(Condition.getQueryWrapper(guestRecord));
-        return GuestRecordWrapper.build().entityVO(detail);
-        }
+	/**
+	 * 详情
+	 */
+	@Override
+	@GetMapping("/detail")
+	public GuestRecordVO detail(@SpringQueryMap GuestRecord guestRecord) {
+		GuestRecord detail = guestService.getOne(Condition.getQueryWrapper(guestRecord));
+		return GuestRecordWrapper.build().entityVO(detail);
+	}
 
-    /**
-     * 查询
-     */
-    @Override
-    @GetMapping("/list")
-    public List<GuestRecordVO> list(@SpringQueryMap GuestRecord guestRecord) {
-        return GuestRecordWrapper.build().listVO(guestService.list(Condition.getQueryWrapper(guestRecord)));
-        }
+	/**
+	 * 查询
+	 */
+	@Override
+	@GetMapping("/list")
+	public List<GuestRecordVO> list(@SpringQueryMap GuestRecord guestRecord) {
+		return GuestRecordWrapper.build().listVO(guestService.list(Condition.getQueryWrapper(guestRecord)));
+	}
 
+	@Override
+	@GetMapping("/count")
+	public Integer count(@SpringQueryMap GuestRecord guestRecord) {
+		return guestService.count(Condition.getQueryWrapper(guestRecord));
+	}
 
 
 	@Override
@@ -65,7 +71,7 @@ public class GuestRecordRecordClient implements IGuestRecordClient {
 	public BladePage<GuestRecordVO> page(@RequestBody GuestRecordDTO guestRecordDTO) {
 		GuestRecord guestRecord = BeanUtil.copyProperties(guestRecordDTO, GuestRecord.class);
 		LambdaQueryWrapper<GuestRecord> queryWrapper = Condition.getQueryWrapper(guestRecord).lambda();
-		if(guestRecordDTO.getUserIds() != null && guestRecordDTO.getUserIds().size() > 0){
+		if (guestRecordDTO.getUserIds() != null && guestRecordDTO.getUserIds().size() > 0) {
 			queryWrapper.in(GuestRecord::getUserId, guestRecordDTO.getUserIds());
 		}
 		queryWrapper.orderByDesc(GuestRecord::getBeginTime, GuestRecord::getCreateTime);
@@ -76,46 +82,46 @@ public class GuestRecordRecordClient implements IGuestRecordClient {
 
 
 	/**
-     * 新增
-     */
-    @Override
-    @PostMapping("/save")
-    public boolean save(@Valid @RequestBody GuestRecord guestRecord) {
-        return guestService.save(guestRecord);
-        }
-
-    /**
-     * 修改
-     */
-    @Override
-    @PostMapping("/update")
-    public boolean update(@Valid @RequestBody GuestRecord guestRecord) {
-        return guestService.updateById(guestRecord);
-        }
-
-    /**
-     * 新增或修改
-     */
-    @Override
-    @PostMapping("/submit")
-    public boolean submit(@Valid @RequestBody GuestRecord guestRecord) {
-        return guestService.saveOrUpdate(guestRecord);
-        }
-
-
-    /**
-     * 删除
-     */
-    @Override
-    @PostMapping("/remove")
-    public boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        return guestService.deleteLogic(Func.toLongList(ids));
-        }
+	 * 新增
+	 */
+	@Override
+	@PostMapping("/save")
+	public boolean save(@Valid @RequestBody GuestRecord guestRecord) {
+		return guestService.save(guestRecord);
+	}
+
+	/**
+	 * 修改
+	 */
+	@Override
+	@PostMapping("/update")
+	public boolean update(@Valid @RequestBody GuestRecord guestRecord) {
+		return guestService.updateById(guestRecord);
+	}
+
+	/**
+	 * 新增或修改
+	 */
+	@Override
+	@PostMapping("/submit")
+	public boolean submit(@Valid @RequestBody GuestRecord guestRecord) {
+		return guestService.saveOrUpdate(guestRecord);
+	}
+
+
+	/**
+	 * 删除
+	 */
+	@Override
+	@PostMapping("/remove")
+	public boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return guestService.deleteLogic(Func.toLongList(ids));
+	}
 
 	@Override
 	@GetMapping("/getById")
 	public GuestRecord getById(@RequestParam Long id) {
-    	return guestService.getById(id);
+		return guestService.getById(id);
 	}
 
 	@Override

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

@@ -1,5 +1,6 @@
 package org.springblade.app.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.plugins.Page;
 import io.swagger.annotations.Api;
@@ -7,21 +8,24 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 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;
 import org.springblade.estate.dto.GuestRecordDTO;
 import org.springblade.estate.entity.ApplyUser;
+import org.springblade.estate.entity.GuestAuthorize;
 import org.springblade.estate.entity.GuestRecord;
 import org.springblade.estate.feign.IApplyUserClient;
+import org.springblade.estate.feign.IGuestAuthorizeClient;
 import org.springblade.estate.feign.IGuestRecordClient;
 import org.springblade.estate.vo.ApplyUserVO;
+import org.springblade.estate.vo.GuestAuthorizeVO;
 import org.springblade.estate.vo.GuestRecordVO;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -36,6 +40,7 @@ public class GuestRecordController {
 
 	private final IApplyUserClient applyUserClient;
 	private final IGuestRecordClient guestRecordClient;
+	private final IGuestAuthorizeClient guestAuthorizeClient;
 
 
 
@@ -45,6 +50,50 @@ public class GuestRecordController {
 		return R.data(list);
 	}
 
+	@PostMapping("page")
+	public R page(@RequestBody GuestRecordDTO guestRecordDTO){
+		BladePage<GuestRecordVO> page = guestRecordClient.page(guestRecordDTO);
+		return R.data(page);
+	}
+
+
+	@GetMapping("count")
+	public R count(GuestRecord guestRecord){
+		return R.data(guestRecordClient.count(guestRecord));
+	}
+
+
+	@PostMapping("submit")
+	public R submit(@RequestBody GuestRecord guestRecord){
+		//园区
+		guestRecord.setTenantType(OperationConstant.ZERO);
+		if (Objects.isNull(guestRecord.getId())) {
+			//新增
+			Long guestAuthId = guestRecord.getGuestAuthId();
+			Assert.notNull(guestAuthId);
+			GuestAuthorize ga = new GuestAuthorize();
+			ga.setId(guestAuthId);
+			GuestAuthorizeVO authorizeVO = guestAuthorizeClient.detail(ga);
+			Assert.notNull(authorizeVO, "找不到申请记录");
+			guestRecord.setAgencyId(authorizeVO.getAgencyId());
+			guestRecord.setAgencyName(authorizeVO.getAgencyName());
+			guestRecord.setResidentialId(authorizeVO.getResidentialId());
+			guestRecord.setResidentialName(authorizeVO.getResidentialName());
+			guestRecord.setBuildingId(authorizeVO.getBuildingId());
+			guestRecord.setBuildingName(authorizeVO.getBuildingName());
+			guestRecord.setUnitId(authorizeVO.getUnitId());
+			guestRecord.setUnitName(authorizeVO.getUnitName());
+			guestRecord.setRoomId(authorizeVO.getRoomId());
+			guestRecord.setRoomName(authorizeVO.getRoomName());
+
+			authorizeVO.setGuestTel(guestRecord.getGuestTel());
+			authorizeVO.setGuestName(guestRecord.getGuestName());
+			guestAuthorizeClient.submit(authorizeVO);
+		}
+		return R.status(this.guestRecordClient.submit(guestRecord));
+	}
+
+
 	/**
 	 * 功能描述: 通过会员id获取访客登记信息记录
 	 *