|
@@ -139,16 +139,16 @@ public class AdmSpaceController {
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
@PostMapping("/query")
|
|
|
- public JSONObject query(@RequestBody AdmDCSQueryRequest request) throws Exception {
|
|
|
- /*AdmResponse response = service.doQuerySpaces( AdmContextUtil.toDmpContext(), request);
|
|
|
+ public ObjectNode query(@RequestBody AdmDCSQueryRequest request) throws Exception {
|
|
|
+ AdmResponse response = service.doQuerySpaces( AdmContextUtil.toDmpContext(), request);
|
|
|
ObjectNode objectNode = JsonNodeUtils.toObjectNode(response, null, null);
|
|
|
if(StrUtil.isNotEmpty(request.getZoneType())){
|
|
|
objectNode.put("zoneType", request.getZoneType());
|
|
|
}
|
|
|
- return objectNode;*/
|
|
|
- ObjectNode criteria = AdmQueryCriteriaHelper.toCriteria(null, request.getFilters());
|
|
|
+ return objectNode;
|
|
|
+ /*ObjectNode criteria = AdmQueryCriteriaHelper.toCriteria(null, request.getFilters());
|
|
|
List<OrderItem> orderItem = AdmQueryCriteriaHelper.toOrderItem(request.getOrders());
|
|
|
- return this.spaceRelationInfoHandler.querySpaceInfo(request, criteria, orderItem);
|
|
|
+ return this.spaceRelationInfoHandler.querySpaceInfo(request, criteria, orderItem);*/
|
|
|
}
|
|
|
|
|
|
/**
|