Browse Source

fix : outline 数据格式修改

lvxianyun 3 years ago
parent
commit
45bdb8b5e9

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

@@ -64,7 +64,7 @@ public class AdmSpaceController {
     public AdmResponse count(@RequestBody AdmQueryCriteria request) throws Exception {
         request.setName("space");
         request.setOnlyCount(true);
-        return service.doQuery( AdmContextUtil.toDmpContext(), request, AdmSpace.class);
+        return service.doQuery(AdmContextUtil.toDmpContext(), request, AdmSpace.class);
     }
     /**
      * 创建

+ 3 - 5
src/main/java/com/persagy/proxy/object/model/AdmISpace.java

@@ -1,11 +1,9 @@
 package com.persagy.proxy.object.model;
 
-import com.persagy.proxy.adm.model.AdmPoint;
+import com.fasterxml.jackson.databind.node.ArrayNode;
 import lombok.Data;
 
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -55,7 +53,7 @@ public class AdmISpace {
     private Float height;
 
     /** 图片 */
-    private ArrayList<AdmTaskPic> pic;
+    private ArrayNode pic;
     /** 空间是否受影响 */
     private String state;
     /** 空间常驻人数 */
@@ -74,7 +72,7 @@ public class AdmISpace {
     private String objectType = OBJ_TYPE;
 
     /** 轮廓线 */
-    private List<List<AdmPoint>> outline;
+    private ArrayNode outline;
 
     /** 对象类型code */
     private String classCode;

+ 2 - 2
src/main/java/com/persagy/proxy/object/model/AdmShaft.java

@@ -1,8 +1,8 @@
 package com.persagy.proxy.object.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.persagy.proxy.adm.annotations.CascadeColumn;
-import com.persagy.proxy.adm.model.AdmPoint;
 import com.persagy.proxy.adm.model.AdmBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -44,7 +44,7 @@ public class AdmShaft extends AdmBaseEntity<AdmShaft> {
 
 
     /** BIM模型中轮廓坐标 */
-    private List<AdmPoint> outline;
+    private ArrayNode outline;
     /** 对象类型 */
     private String objectType = OBJ_TYPE;
     /** 级联-竖井内的设备 */

+ 2 - 4
src/main/java/com/persagy/proxy/object/model/AdmSpace.java

@@ -2,12 +2,10 @@ package com.persagy.proxy.object.model;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.persagy.proxy.adm.annotations.CascadeColumn;
-import com.persagy.proxy.adm.model.AdmPoint;
 import com.persagy.proxy.adm.model.AdmBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
@@ -40,9 +38,9 @@ public class AdmSpace extends AdmBaseEntity<AdmSpace> {
     private String bimId;
 
     /** 楼层选定区域轮廓线 */
-    private ArrayList<ArrayList<ArrayList<AdmPoint>>> outline;
+    private ArrayNode outline;
     /** 轮廓线2 未使用*/
-    private ArrayList<ArrayList<ArrayList<AdmPoint>>> outline2;
+    private ArrayNode outline2;
     /** 图片 - 信息点里已存在的信息点不应在实体中重复定义为其他格式 */
     private ArrayNode pic;
     /** 空间是否受影响 */