1、社区物业报修

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

@@ -179,6 +179,12 @@ public class Repair extends BaseEntity {
 	@ApiModelProperty(value = "小区ID")
 	private Long residentialId;
 
+	/**
+	 * 会员ID
+	 */
+	@ApiModelProperty(value = "会员ID")
+	private Long memberId;
+
 	/**
 	 * 工单组ID
 	 */

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

@@ -3,6 +3,7 @@ package org.springblade.estate.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.tool.api.R;
 import org.springblade.estate.dto.CarDTO;
 import org.springblade.estate.dto.RepairDTO;
@@ -72,7 +73,7 @@ public interface IRepairClient  {
 	 * @return
 	 */
 	@PostMapping("/page")
-	R<IPage<RepairVO>> page(@RequestBody RepairDTO repairDTO);
+	R<BladePage<RepairVO>> page(@RequestBody RepairDTO repairDTO);
 
 
 }

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

@@ -1,13 +1,11 @@
 package org.springblade.estate.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.tool.api.R;
 import org.springblade.estate.dto.RepairDTO;
 import org.springblade.estate.entity.Repair;
 import org.springblade.estate.vo.RepairVO;
 import org.springframework.stereotype.Component;
-import javax.validation.Valid;
 import java.util.List;
 
 @Component
@@ -64,7 +62,7 @@ public class RepairClientFallback implements IRepairClient {
         }
 
 	@Override
-	public R<IPage<RepairVO>> page(RepairDTO repairDTO) {
+	public R<BladePage<RepairVO>> page(RepairDTO repairDTO) {
 		return null;
 	}
 

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

@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import org.springblade.common.utils.GenerateNum;
+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.tool.api.R;
@@ -98,18 +99,14 @@ public class RepairClient implements IRepairClient {
 
 	@Override
 	@PostMapping("/page")
-	public R<IPage<RepairVO>> page(@RequestBody RepairDTO repairDTO) {
+	public R<BladePage<RepairVO>> page(@RequestBody RepairDTO repairDTO) {
 		Query query = new Query();
 		Page<Repair> queryPage = repairDTO.getPage();
 		query.setCurrent(queryPage.getCurrent());
 		query.setSize(queryPage.getSize());
-		Page<Repair> result = new Page<>();
 		IPage<Repair> repairIPage = this.repairService.page(Condition.getPage(query), Condition.getQueryWrapper(repairDTO));
-		result.setCurrent((int)repairIPage.getCurrent());
-		result.setSize((int)repairIPage.getSize());
-		result.setRecords(repairIPage.getRecords());
-		result.setTotal(repairIPage.getTotal());
-		return R.data(RepairWrapper.build().pageVO(repairIPage));
+		IPage<RepairVO> pageVO = RepairWrapper.build().pageVO(repairIPage);
+		return R.data(BladePage.of(pageVO));
 	}
 
 

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

@@ -35,6 +35,7 @@
         <result property="pic" column="pic"/>
         <result property="agencyId" column="agency_id"/>
         <result property="residentialId" column="resiential_id"/>
+        <result property="memberId" column="member_id"/>
         <result property="enterpriseId" column="enterprise_id"/>
         <result property="workOrderGroupId" column="work_order_group_id"/>
         <result property="workOrderGroupUserId" column="work_order_group_user_id"/>

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

@@ -1,32 +1,23 @@
 package org.springblade.app.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.plugins.Page;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang.StringUtils;
 import org.springblade.community.entity.Residential;
 import org.springblade.community.feign.IResidentialClient;
+import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.estate.dto.RepairDTO;
 import org.springblade.estate.entity.Repair;
-import org.springblade.estate.feign.ICarClient;
 import org.springblade.estate.feign.IRepairClient;
 import org.springblade.estate.vo.RepairVO;
-import org.springblade.person.entity.HouseUser;
-import org.springblade.person.feign.IHouseUserClient;
-import org.springblade.person.vo.HouseUserVO;
 import org.springblade.system.expand.feign.IConfClient;
 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;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -43,12 +34,11 @@ public class EstateRepairController {
 
 	private final IRepairClient repairClient;
 	private final IResidentialClient residentialClient;
-	private final IHouseUserClient houseUserClient;
 	private final IConfClient confClient;
 
 	@PostMapping(value = "/estateRepairList")
-	public R<IPage<RepairVO>> getEstateRepairList(@RequestBody RepairDTO repairDTO){
-		R<IPage<RepairVO>> page = this.repairClient.page(repairDTO);
+	public R<BladePage<RepairVO>> getEstateRepairList(@RequestBody RepairDTO repairDTO){
+		R<BladePage<RepairVO>> page = this.repairClient.page(repairDTO);
 		return page;
 	}
 
@@ -58,7 +48,7 @@ public class EstateRepairController {
 		Assert.hasText(repairDTO.getReportorPhone(), "上报人联系电话必传");
 		Assert.notNull(repairDTO.getResidentialId(), "上报小区必传");
 		repairDTO.setRepairNo(generateRepairNO());
-		Residential residential = residentialClient.getById(repairDTO.getId());
+		Residential residential = residentialClient.getById(repairDTO.getResidentialId());
 		Assert.notNull(residential, "小区不存在");
 		repairDTO.setTenantId(residential.getTenantId());
 		if(StringUtil.isNotBlank(repairDTO.getPic())){

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

@@ -55,10 +55,10 @@ public class GuestRecordController {
 			guestRecord.setEndTime(DateUtil.parse(guestRecord.getInterviewTime() + " 23:59:59", "yyyy-MM-dd HH:mm:ss"));
 		}
 		if(id == null){
-			String imageUri = guestRecord.getImageUri();
+			String imageUri = guestRecord.getFaceUrl();
 			if(StringUtil.isNotBlank(imageUri)){
 				String path = confClient.removePrefix(imageUri);
-				guestRecord.setImageUri(path);
+				guestRecord.setFaceUrl(path);
 			}
 			return R.status(guestRecordClient.save(guestRecord));
 		}else{