1、APP网关查询我的车辆

blade-service-api/estate-api/src/main/java/org/springblade/estate/dto/CarDTO.java

@@ -19,6 +19,7 @@ package org.springblade.estate.dto;
 import com.baomidou.mybatisplus.plugins.Page;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
+import org.springblade.core.mp.support.Query;
 import org.springblade.estate.entity.Car;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -43,5 +44,6 @@ public class CarDTO extends Car {
 
 	private String idCard;
 
+	private Query query;
 
 }

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

@@ -52,10 +52,10 @@ public class Car extends BaseEntity {
 		@ApiModelProperty(value = "车辆类型")
 		private Integer type;
 	/**
-	* 车辆性质(货运、客运、营运、非运营,出租)
-	*/
-		@ApiModelProperty(value = "车辆性质(货运、客运、营运、非运营,出租)")
-		private Integer properties;
+	 * 车辆性质(货运、客运、营运、非运营,出租)
+	 */
+	@ApiModelProperty(value = "车辆性质(货运、客运、营运、非运营,出租)")
+	private Integer properties;
 	/**
 	* 车辆型号
 	*/

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

@@ -1,14 +1,12 @@
 package org.springblade.estate.feign;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.CarDTO;
 import org.springblade.estate.entity.Car;
 import org.springblade.estate.vo.CarVO;
 import org.springframework.stereotype.Component;
-import org.springblade.core.mp.support.Query;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -66,7 +64,7 @@ public class CarClientFallback implements ICarClient {
         }
 
 	@Override
-	public R<Page<Car>> page(CarDTO carDTO) {
+	public R<BladePage<CarVO>> page(CarDTO carDTO) {
 		return R.data(null);
 	}
 

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

@@ -2,6 +2,7 @@ package org.springblade.estate.feign;
 
 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.entity.Car;
@@ -74,5 +75,5 @@ public interface ICarClient  {
 	 * @return
 	 */
 	@PostMapping("/page")
-	R<Page<Car>> page(@RequestBody CarDTO carDto);
+	R<BladePage<CarVO>> page(@RequestBody CarDTO carDto);
 }

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

@@ -10,6 +10,7 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import org.springblade.common.utils.BeanMapUtil;
+import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -28,7 +29,6 @@ import org.springblade.estate.service.ICarService;
 import org.springblade.core.boot.ctrl.BladeController;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * 车辆信息 client
@@ -106,24 +106,10 @@ public class CarClient implements ICarClient {
 
 	@Override
 	@PostMapping("/page")
-	public R<Page<Car>> page(@RequestBody CarDTO carDto) {
-    	Query query = new Query();
-		Page<Car> queryPage = carDto.getPage();
-		query.setCurrent(queryPage.getCurrent());
-		query.setSize(queryPage.getSize());
-		Page<Car> carPage = new Page<>();
-		LambdaQueryWrapper<Car> wrapper = Condition.getQueryWrapper(new Car()).lambda()
-			.eq(Objects.nonNull(carDto.getPersonPhone()),Car::getPersonPhone, carDto.getPersonPhone())
-			.eq(Objects.nonNull(carDto.getPersonId()),Car::getPersonId,carDto.getPersonId())
-			.eq(Objects.nonNull(carDto.getAgencyId()),Car::getAgencyId,carDto.getAgencyId())
-			.eq(Objects.nonNull(carDto.getResidentialId()),Car::getResidentialId,carDto.getResidentialId())
-			.orderByDesc(Car::getCreateTime);
-		IPage<Car> carIPage = this.carService.page(Condition.getPage(query), wrapper);
-		carPage.setCurrent((int)carIPage.getCurrent());
-		carPage.setSize((int)carIPage.getSize());
-		carPage.setRecords(carIPage.getRecords());
-		carPage.setTotal(carIPage.getTotal());
-		return R.data(carPage);
+	public R<BladePage<CarVO>> page(@RequestBody CarDTO carDto) {
+		IPage<Car> carIPage = this.carService.page(Condition.getPage(carDto.getQuery()), Condition.getQueryWrapper(carDto));
+		IPage<CarVO> pageVO = CarWrapper.build().pageVO(carIPage);
+		return R.data(BladePage.of(pageVO));
 	}
 
 

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

@@ -8,6 +8,8 @@ import lombok.SneakyThrows;
 import org.springblade.common.constant.OperationConstant;
 import org.springblade.community.entity.Residential;
 import org.springblade.community.feign.IResidentialClient;
+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.StringUtil;
 import org.springblade.enterprise.entity.Staff;
@@ -19,14 +21,12 @@ import org.springblade.estate.entity.Car;
 import org.springblade.estate.feign.IApplyUserClient;
 import org.springblade.estate.feign.ICarClient;
 import org.springblade.estate.vo.ApplyUserVO;
+import org.springblade.estate.vo.CarVO;
 import org.springblade.person.entity.HouseUser;
 import org.springblade.person.feign.IHouseUserClient;
 import org.springblade.person.feign.IMemberClient;
 import org.springblade.person.vo.HouseUserVO;
-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.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -81,14 +81,22 @@ public class CarController {
 	}
 
 
-	@PostMapping(value = "/page")
+	@GetMapping(value = "/page/member")
 	@SneakyThrows
-	public Map<String,Object> getPage(@RequestBody CarDTO carDto){
-		Map<String,Object> map = new HashMap<>();
-		R<Page<Car>> page = this.carClient.page(carDto);
-		if(page != null){
-			map.put("carPage",page.getData());
-		}
-		return map;
+	public R<BladePage<CarVO>> getMemberCarPage(@RequestParam(value = "residentialId") Long residentialId, @RequestParam(value = "memberId") Long memberId, Query query){
+		CarDTO carDTO = new CarDTO();
+		carDTO.setQuery(query);
+		carDTO.setMemberId(memberId);
+		carDTO.setResidentialId(residentialId);
+		return carClient.page(carDTO);
+	}
+
+	@PostMapping(value = "/page/admin")
+	@SneakyThrows
+	public R<BladePage<CarVO>> getAdminCarPage(@RequestParam(value = "residentialId") Long residentialId, Query query){
+		CarDTO carDTO = new CarDTO();
+		carDTO.setQuery(query);
+		carDTO.setResidentialId(residentialId);
+		return carClient.page(carDTO);
 	}
 }