|
@@ -6,22 +6,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.dliyun.oap.framework.annotation.ServiceMethod;
|
|
import com.dliyun.oap.framework.annotation.ServiceMethod;
|
|
|
import com.dliyun.oap.framework.annotation.ServiceMethodBean;
|
|
import com.dliyun.oap.framework.annotation.ServiceMethodBean;
|
|
|
import com.dliyun.oap.framework.response.OapResponse;
|
|
import com.dliyun.oap.framework.response.OapResponse;
|
|
|
-import com.zhiqiyun.open.annotation.Permission;
|
|
|
|
|
-import com.zhiqiyun.open.core.models.category.CategoryOccupation;
|
|
|
|
|
import com.zhiqiyun.open.core.models.place.PlaceBaseInfo;
|
|
import com.zhiqiyun.open.core.models.place.PlaceBaseInfo;
|
|
|
import com.zhiqiyun.open.core.models.place.PlaceCategory;
|
|
import com.zhiqiyun.open.core.models.place.PlaceCategory;
|
|
|
import com.zhiqiyun.open.core.service.PlaceBaseInfoService;
|
|
import com.zhiqiyun.open.core.service.PlaceBaseInfoService;
|
|
|
import com.zhiqiyun.open.core.service.PlaceCategoryService;
|
|
import com.zhiqiyun.open.core.service.PlaceCategoryService;
|
|
|
-import com.zhiqiyun.open.mvc.Result;
|
|
|
|
|
-import com.zhiqiyun.open.mvc.params.place.QueryPlaceCategoryParam;
|
|
|
|
|
-import com.zhiqiyun.open.router.request.category.CategoryOccupationRequest;
|
|
|
|
|
import com.zhiqiyun.open.router.request.place.CategoryPageRequest;
|
|
import com.zhiqiyun.open.router.request.place.CategoryPageRequest;
|
|
|
import com.zhiqiyun.open.router.request.place.CategoryRequest;
|
|
import com.zhiqiyun.open.router.request.place.CategoryRequest;
|
|
|
import com.zhiqiyun.open.router.request.place.PlaceInfoRequest;
|
|
import com.zhiqiyun.open.router.request.place.PlaceInfoRequest;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -40,6 +34,9 @@ public class PlaceApi {
|
|
|
@ServiceMethod(method = "list.place.category", title = "查询文旅场所分类")
|
|
@ServiceMethod(method = "list.place.category", title = "查询文旅场所分类")
|
|
|
public OapResponse listPlaceCategory(CategoryRequest request) {
|
|
public OapResponse listPlaceCategory(CategoryRequest request) {
|
|
|
QueryWrapper<PlaceCategory> wrapper = new QueryWrapper<>();
|
|
QueryWrapper<PlaceCategory> wrapper = new QueryWrapper<>();
|
|
|
|
|
+ if (StringUtils.isNotBlank(request.getId())) {
|
|
|
|
|
+ wrapper.eq("id", request.getId());
|
|
|
|
|
+ }
|
|
|
if (StringUtils.isNotBlank(request.getName())) {
|
|
if (StringUtils.isNotBlank(request.getName())) {
|
|
|
wrapper.like("name", request.getName());
|
|
wrapper.like("name", request.getName());
|
|
|
}
|
|
}
|
|
@@ -47,7 +44,7 @@ public class PlaceApi {
|
|
|
wrapper.eq("is_show", request.getIsShow());
|
|
wrapper.eq("is_show", request.getIsShow());
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNotBlank(request.getCode())) {
|
|
if (StringUtils.isNotBlank(request.getCode())) {
|
|
|
- wrapper.like("category_id", request.getCode());
|
|
|
|
|
|
|
+ wrapper.eq("category_id", request.getCode());
|
|
|
}
|
|
}
|
|
|
wrapper.orderByDesc("sort_number");
|
|
wrapper.orderByDesc("sort_number");
|
|
|
wrapper.orderByDesc("id");
|
|
wrapper.orderByDesc("id");
|
|
@@ -65,7 +62,7 @@ public class PlaceApi {
|
|
|
wrapper.eq("is_show", request.getIsShow());
|
|
wrapper.eq("is_show", request.getIsShow());
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNotBlank(request.getCode())) {
|
|
if (StringUtils.isNotBlank(request.getCode())) {
|
|
|
- wrapper.like("category_id", request.getCode());
|
|
|
|
|
|
|
+ wrapper.eq("category_id", request.getCode());
|
|
|
}
|
|
}
|
|
|
Page<PlaceCategory> page = new Page<>(request.getCurrent(), request.getPageSize());
|
|
Page<PlaceCategory> page = new Page<>(request.getCurrent(), request.getPageSize());
|
|
|
page.addOrder(OrderItem.asc("sort_number"));
|
|
page.addOrder(OrderItem.asc("sort_number"));
|