Browse Source

fix:空间 返回结果添加空间类型

lvxianyun 3 years ago
parent
commit
59d1b33532

+ 22 - 6
src/main/java/com/persagy/proxy/adm/controller/AdmSpaceController.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.basic.utils.JsonNodeUtils;
 import com.persagy.proxy.adm.model.*;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
@@ -122,8 +123,13 @@ public class AdmSpaceController {
      * @throws Exception
      */
     @PostMapping("/query")
-    public AdmResponse query(@RequestBody AdmDCSQueryRequest request) throws Exception {
-        return 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;
     }
 
     /**
@@ -270,7 +276,7 @@ public class AdmSpaceController {
      * @throws Exception
      */
     @PostMapping("/query-outline")
-    public AdmResponse queryOutline(@RequestBody AdmDCSQueryRequest request) throws Exception {
+    public ObjectNode queryOutline(@RequestBody AdmDCSQueryRequest request) throws Exception {
         request.setName(AdmSpace.OBJ_TYPE);
         request.setProjection(null);
         List<String> list = new ArrayList<>();
@@ -284,7 +290,12 @@ public class AdmSpaceController {
         list.add("infos");
         list.add("properties");
         request.setProjection(list);
-        return service.doQuerySpaces( AdmContextUtil.toDmpContext(), request);
+        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;
     }
 
 
@@ -307,8 +318,13 @@ public class AdmSpaceController {
      * @throws Exception
      */
     @PostMapping("/type")
-    public AdmResponse queryType(@RequestBody AdmDCSQueryRequest request) throws Exception {
-        return service.doQueryType( AdmContextUtil.toDmpContext(), request);
+    public ObjectNode queryType(@RequestBody AdmDCSQueryRequest request) throws Exception {
+        AdmResponse response = service.doQueryType( AdmContextUtil.toDmpContext(), request);
+        ObjectNode objectNode = JsonNodeUtils.toObjectNode(response, null, null);
+        if(StrUtil.isNotEmpty(request.getZoneType())){
+            objectNode.put("zoneType", request.getZoneType());
+        }
+        return objectNode;
     }