update

src/main/java/com/zhiqiyun/open/router/apis/PlaceApi.java

@@ -1,4 +1,70 @@
 package com.zhiqiyun.open.router.apis;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dliyun.oap.framework.annotation.ServiceMethod;
+import com.dliyun.oap.framework.annotation.ServiceMethodBean;
+import com.dliyun.oap.framework.response.OapResponse;
+import com.zhiqiyun.open.core.models.category.CategoryOccupation;
+import com.zhiqiyun.open.core.models.place.PlaceBaseInfo;
+import com.zhiqiyun.open.core.models.place.PlaceCategory;
+import com.zhiqiyun.open.core.service.PlaceBaseInfoService;
+import com.zhiqiyun.open.core.service.PlaceCategoryService;
+import com.zhiqiyun.open.router.request.category.CategoryOccupationRequest;
+import com.zhiqiyun.open.router.request.place.CategoryRequest;
+import com.zhiqiyun.open.router.request.place.PlaceInfoRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+@Slf4j
+@ServiceMethodBean
 public class PlaceApi {
+
+	@Autowired
+	private PlaceCategoryService placeCategoryService;
+
+
+	@Autowired
+	private PlaceBaseInfoService placeBaseInfoService;
+
+	@ServiceMethod(method = "list.place.category", title = "查询文旅场所分类")
+	public OapResponse listPlaceCategory(CategoryRequest request) {
+		QueryWrapper<PlaceCategory> wrapper = new QueryWrapper<>();
+
+
+		if (StringUtils.isNotBlank(request.getName())) {
+			wrapper.like("name", request.getName());
+		}
+
+		wrapper.orderByDesc("sort_number");
+		wrapper.orderByDesc("id");
+
+		List<PlaceCategory> listData = this.placeCategoryService.list(wrapper);
+
+		return OapResponse.success().setBody(listData);
+	}
+
+	@ServiceMethod(method = "list.place.info.page", title = "查询文旅场所")
+	public OapResponse listPlaceInfoPage(PlaceInfoRequest request) {
+		QueryWrapper<PlaceBaseInfo> wrapper = new QueryWrapper<>();
+
+		if (StringUtils.isNotBlank(request.getName())) {
+			wrapper.like("name", request.getName());
+		}
+		Page<PlaceBaseInfo> page = new Page<>(request.getCurrent(), request.getPageSize());
+
+		page.addOrder(OrderItem.desc("id"));
+
+		Page<PlaceBaseInfo> resultData = this.placeBaseInfoService.page(page, wrapper);
+
+		for (PlaceBaseInfo baseInfo : resultData.getRecords()) {
+			PlaceCategory category = this.placeCategoryService.getById(baseInfo.getCategoryId());
+			baseInfo.setCategory(category);
+		}
+		return OapResponse.success().setBody(resultData);
+	}
 }

src/main/java/com/zhiqiyun/open/router/request/place/CategoryRequest.java

@@ -0,0 +1,13 @@
+package com.zhiqiyun.open.router.request.place;
+
+import com.dliyun.oap.framework.annotation.ServiceParamField;
+import com.dliyun.oap.framework.request.AbstractOapRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CategoryRequest extends AbstractOapRequest {
+    @ServiceParamField(describe = "文旅场所分类名称(模糊查询)")
+    private String name;
+}

src/main/java/com/zhiqiyun/open/router/request/place/PlaceInfoRequest.java

@@ -0,0 +1,23 @@
+package com.zhiqiyun.open.router.request.place;
+
+import com.dliyun.oap.framework.annotation.ServiceParamField;
+import com.dliyun.oap.framework.request.AbstractOapRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class PlaceInfoRequest extends AbstractOapRequest {
+	@ServiceParamField(describe = "文旅场所名称(模糊查询)")
+	private String name;
+
+	@NotNull
+	@ServiceParamField(describe = "页数")
+	private Integer current = 1;
+
+	@NotNull
+	@ServiceParamField(describe = "每页条数")
+	private Integer pageSize = 10;
+}