Browse Source

fix bug:/object/zone/query-outline未返回建筑id,楼层id

lijie 3 years ago
parent
commit
f344be6d87

+ 3 - 0
src/main/java/com/persagy/proxy/adm/request/AdmResponse.java

@@ -51,6 +51,9 @@ public class AdmResponse {
     public static AdmResponse success(List<?> content) {
         return new AdmResponse(SUCCESS, "", CollUtil.isEmpty(content) ? 0L :content.size()*1L,null, 1, 500, CollUtil.isEmpty(content) ? new ArrayList<>(1): content,null,null);
     }
+    public static AdmResponse success(String message) {
+        return new AdmResponse(SUCCESS, message, null,null, null,null,null,null,null);
+    }
 
     /**
      * 从数据中台结果转换

+ 4 - 0
src/main/java/com/persagy/proxy/object/controller/AdmSpaceController.java

@@ -383,6 +383,10 @@ public class AdmSpaceController {
         list.add("localId");
         list.add("localName");
         list.add("outline");
+        list.add("classCode");
+        list.add("buildingId");
+        list.add("floorId");
+        list.add("state");
         list.add("floorSequenceId");
         list.add("modelId");
         list.add("infos");

+ 1 - 1
src/main/java/com/persagy/proxy/relation/controller/RelationShContainSpBaseController.java

@@ -142,7 +142,7 @@ public class RelationShContainSpBaseController {
         String shaftId = param.getString("shaftId");
         JSONArray spaceIdList = param.getJSONArray("spaceIdList");
         if(StrUtil.isBlank(shaftId) || CollUtil.isEmpty(spaceIdList)) {
-            return AdmResponse.failure("必填项:SpaceIdList(业务空间id列表)、ShaftID(竖井id),此方法不会覆盖以前的记录");
+            return AdmResponse.success("空间类型和空间列表不能为空");
         }
         // 创建关系对象.先删除,后添加
         InstanceUrlParam context = AdmContextUtil.toDmpContext();

+ 1 - 1
src/main/java/com/persagy/proxy/report/controller/RelationReportController.java

@@ -204,7 +204,7 @@ public class RelationReportController {
 		//String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
 		//String projectId = request.getHeader(AdmCommonConstant.PROJECT_ID_HEADER);
 		//List<ObjectNode> relationProjectCal = this.relationReportService.getAllRelationProjectCal(groupCode, projectId);
-		return AdmResponse.success(null);
+		return AdmResponse.success(new ArrayList<>());
 	}
 	
 	/**